emanchado · emanchado · Dec 5, 2014 · Aug 12, 2014 · Aug 12, 2014 · Aug 12, 2014
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@
 /env/
 local-lighttpd/etc
 local-lighttpd/port-*-etc
+/.vagrant
+/.cache
+/dist
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ NODEJS=$(if $(shell which nodejs),nodejs,node)
 PIP_USER_SWITCH=$(if $(VIRTUAL_ENV),,--user)
 
 TEMPLATES_JS=app/js/templates.js
-HANDLEBARS_FILES=app/templates/*.handlebars  # Used to generate templates.js
+HANDLEBARS_FILES=$(wildcard app/templates/*.handlebars) # Used to generate templates.js
 IMAGE=cerowrt/releases/openwireless-openwrt-squashfs-sysupgrade.bin
 
 .PHONY: all
@@ -52,7 +52,7 @@ deps:
 # This should depend on "all" instead. See note below for assert_templates_js_up_to_date
 .PHONY: test
 test: assert_templates_js_up_to_date deps
-	/usr/bin/env python2.7 -m unittest discover -s test/ -p '*_test.py'
+	scripts/unit
 	$(NODEJS) -e "require('grunt').tasks(['test']);"
 
 .PHONY: test-selenium

diff --git a/OWrt/config-OWrt b/OWrt/config-OWrt
@@ -1103,11 +1103,11 @@ CONFIG_BUSYBOX_DEFAULT_FEATURE_NTPD_SERVER=y
 CONFIG_BUSYBOX_DEFAULT_ROUTE=y
 # CONFIG_BUSYBOX_DEFAULT_SLATTACH is not set
 # CONFIG_BUSYBOX_DEFAULT_TCPSVD is not set
-CONFIG_BUSYBOX_DEFAULT_TELNET=y
-CONFIG_BUSYBOX_DEFAULT_FEATURE_TELNET_TTYPE=y
+# CONFIG_BUSYBOX_DEFAULT_TELNET is not set
+# CONFIG_BUSYBOX_DEFAULT_FEATURE_TELNET_TTYPE is not set
 # CONFIG_BUSYBOX_DEFAULT_FEATURE_TELNET_AUTOLOGIN is not set
-CONFIG_BUSYBOX_DEFAULT_TELNETD=y
-CONFIG_BUSYBOX_DEFAULT_FEATURE_TELNETD_STANDALONE=y
+# CONFIG_BUSYBOX_DEFAULT_TELNETD is not set
+# CONFIG_BUSYBOX_DEFAULT_FEATURE_TELNETD_STANDALONE is not set
 # CONFIG_BUSYBOX_DEFAULT_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_BUSYBOX_DEFAULT_TFTP is not set
 # CONFIG_BUSYBOX_DEFAULT_TFTPD is not set
@@ -1911,11 +1911,11 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER=y
 CONFIG_BUSYBOX_CONFIG_ROUTE=y
 # CONFIG_BUSYBOX_CONFIG_SLATTACH is not set
 # CONFIG_BUSYBOX_CONFIG_TCPSVD is not set
-CONFIG_BUSYBOX_CONFIG_TELNET=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE=y
+# CONFIG_BUSYBOX_CONFIG_TELNET is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-CONFIG_BUSYBOX_CONFIG_TELNETD=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_TELNETD_STANDALONE=y
+# CONFIG_BUSYBOX_CONFIG_TELNETD is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_TELNETD_STANDALONE is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_BUSYBOX_CONFIG_TFTP is not set
 # CONFIG_BUSYBOX_CONFIG_TFTPD is not set
@@ -2047,6 +2047,27 @@ CONFIG_BUSYBOX_CONFIG_SH_MATH_SUPPORT_64=y
 # CONFIG_BUSYBOX_CONFIG_SYSLOGD is not set
 # CONFIG_BUSYBOX_CONFIG_KLOGD is not set
 CONFIG_BUSYBOX_CONFIG_LOGGER=y
+
+#
+#zoneinfo
+#
+
+CONFIG_PACKAGE_zoneinfo-africa=y
+CONFIG_PACKAGE_zoneinfo-asia=y
+CONFIG_PACKAGE_zoneinfo-atlantic=y
+CONFIG_PACKAGE_zoneinfo-australia-nz=y
+CONFIG_PACKAGE_zoneinfo-core=y
+CONFIG_PACKAGE_zoneinfo-europe=y
+CONFIG_PACKAGE_zoneinfo-india=y
+CONFIG_PACKAGE_zoneinfo-middleeast=y
+CONFIG_PACKAGE_zoneinfo-northamerica=y
+CONFIG_PACKAGE_zoneinfo-pacific=y
+CONFIG_PACKAGE_zoneinfo-poles=y
+CONFIG_PACKAGE_zoneinfo-simple=y
+CONFIG_PACKAGE_zoneinfo-southamerica=y
+
+
+
 CONFIG_PACKAGE_ca-certificates=y
 # CONFIG_PACKAGE_dnsmasq is not set
 # CONFIG_PACKAGE_dnsmasq-dhcpv6 is not set
@@ -3157,7 +3178,7 @@ CONFIG_PACKAGE_in-jabberd=m
 # CONFIG_PACKAGE_ncat-ssl is not set
 # CONFIG_PACKAGE_ndiff is not set
 # CONFIG_PACKAGE_nmap is not set
-CONFIG_PACKAGE_nmap-ssl=m
+# CONFIG_PACKAGE_nmap-ssl is not set
 # CONFIG_PACKAGE_nping is not set
 
 #
@@ -3523,7 +3544,7 @@ CONFIG_PACKAGE_authsae=m
 CONFIG_PACKAGE_bing=m
 # CONFIG_PACKAGE_bismark-ditg is not set
 CONFIG_PACKAGE_bwping=m
-CONFIG_PACKAGE_ccnx=m
+# CONFIG_PACKAGE_ccnx is not set
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_debloat=y
 CONFIG_PACKAGE_ds-lite=y
@@ -3628,8 +3649,8 @@ CONFIG_PACKAGE_tor=y
 # CONFIG_PACKAGE_tor-alpha is not set
 # CONFIG_PACKAGE_tor-alpha-fw-helper is not set
 # CONFIG_PACKAGE_tor-alpha-geoip is not set
-CONFIG_PACKAGE_tor-fw-helper=m
-CONFIG_PACKAGE_tor-geoip=m
+# CONFIG_PACKAGE_tor-fw-helper is not set
+# CONFIG_PACKAGE_tor-geoip is not set
 # CONFIG_PACKAGE_uclient-fetch is not set
 # CONFIG_PACKAGE_uqmi is not set
 CONFIG_PACKAGE_vnstat=m
@@ -3741,7 +3762,7 @@ CONFIG_PACKAGE_bash=m
 # CONFIG_PACKAGE_bismark-netexp is not set
 # CONFIG_PACKAGE_bzip2 is not set
 # CONFIG_PACKAGE_cal is not set
-CONFIG_PACKAGE_cerowrt-chrome=y
+# CONFIG_PACKAGE_cerowrt-chrome is not set
 CONFIG_PACKAGE_cerowrt-interfaces=y
 CONFIG_PACKAGE_cerowrt-scripts=y
 CONFIG_PACKAGE_collectd=m
@@ -3807,7 +3828,7 @@ CONFIG_PACKAGE_dbus=y
 CONFIG_PACKAGE_fconfig=m
 # CONFIG_PACKAGE_flock is not set
 # CONFIG_PACKAGE_getopt is not set
-CONFIG_PACKAGE_gnugol=m
+# CONFIG_PACKAGE_gnugol is not set
 CONFIG_PACKAGE_gnupg=y
 CONFIG_PACKAGE_haserl=m
 # CONFIG_HASERL_with_lua is not set
@@ -3845,9 +3866,9 @@ CONFIG_PACKAGE_libjson-script=y
 CONFIG_PACKAGE_mount-utils=y
 # CONFIG_PACKAGE_mountd is not set
 # CONFIG_PACKAGE_namei is not set
-CONFIG_PACKAGE_nut=m
-CONFIG_PACKAGE_nut-client=m
-CONFIG_PACKAGE_nut-driver-apcsmart=m
+# CONFIG_PACKAGE_nut is not set
+# CONFIG_PACKAGE_nut-client is not set
+# CONFIG_PACKAGE_nut-driver-apcsmart is not set
 # CONFIG_PACKAGE_nut-driver-apcsmart-old is not set
 # CONFIG_PACKAGE_nut-driver-bcmxcp is not set
 # CONFIG_PACKAGE_nut-driver-bcmxcp_usb is not set
@@ -3859,10 +3880,10 @@ CONFIG_PACKAGE_nut-driver-apcsmart=m
 # CONFIG_PACKAGE_nut-driver-richcomm_usb is not set
 # CONFIG_PACKAGE_nut-driver-snmp-ups is not set
 # CONFIG_PACKAGE_nut-driver-tripplite_usb is not set
-CONFIG_PACKAGE_nut-driver-usbhid-ups=m
-CONFIG_PACKAGE_nut-logger=m
-CONFIG_PACKAGE_nut-monitor=m
-CONFIG_PACKAGE_nut-server=m
+# CONFIG_PACKAGE_nut-driver-usbhid-ups is not set
+# CONFIG_PACKAGE_nut-logger is not set
+# CONFIG_PACKAGE_nut-monitor is not set
+# CONFIG_PACKAGE_nut-server is not set
 # CONFIG_PACKAGE_nut-driver-bestfcom is not set
 # CONFIG_PACKAGE_nut-driver-bestfortress is not set
 # CONFIG_PACKAGE_nut-driver-bestuferrups is not set
@@ -3872,7 +3893,7 @@ CONFIG_PACKAGE_nut-server=m
 # CONFIG_PACKAGE_nut-driver-etapro is not set
 # CONFIG_PACKAGE_nut-driver-everups is not set
 # CONFIG_PACKAGE_nut-driver-gamatronic is not set
-CONFIG_PACKAGE_nut-driver-genericups=m
+# CONFIG_PACKAGE_nut-driver-genericups is not set
 # CONFIG_PACKAGE_nut-driver-isbmex is not set
 # CONFIG_PACKAGE_nut-driver-liebert is not set
 # CONFIG_PACKAGE_nut-driver-liebert-esp2 is not set
@@ -3885,7 +3906,7 @@ CONFIG_PACKAGE_nut-driver-genericups=m
 # CONFIG_PACKAGE_nut-driver-oneac is not set
 # CONFIG_PACKAGE_nut-driver-optiups is not set
 # CONFIG_PACKAGE_nut-driver-powercom is not set
-CONFIG_PACKAGE_nut-driver-powerpanel=m
+# CONFIG_PACKAGE_nut-driver-powerpanel is not set
 # CONFIG_PACKAGE_nut-driver-rhino is not set
 # CONFIG_PACKAGE_nut-driver-safenet is not set
 # CONFIG_PACKAGE_nut-driver-solis is not set

diff --git a/README.md b/README.md
@@ -8,51 +8,52 @@ OpenWireless router firmware, which is based off of Cerowrt and OpenWRT.
 More details about the OpenWireless project can be found at
 https://openwireless.org/.
 
-# Quick Look
-
-If you'd just like to take a quick look at the web UI, we have set up
-several instances of the web UI to be publicly accessible. Please try out one of
-these instances and report to us any vulnerabilities you find. Feel free to set
-an admin password: These instances will reset at the top of each hour.
-
-[0](http://ow.crud.net:8000)
-[1](http://ow.crud.net:8001)
-[2](http://ow.crud.net:8002)
-[3](http://ow.crud.net:8003)
-[4](http://ow.crud.net:8004)
-[5](http://ow.crud.net:8005)
-[6](http://ow.crud.net:8006)
-[7](http://ow.crud.net:8007)
-[8](http://ow.crud.net:8008)
-[9](http://ow.crud.net:8009)
-[10](http://ow.crud.net:8010)
-[11](http://ow.crud.net:8011)
-[12](http://ow.crud.net:8012)
-[13](http://ow.crud.net:8013)
-[14](http://ow.crud.net:8014)
-[15](http://ow.crud.net:8015)
-[16](http://ow.crud.net:8016)
-[17](http://ow.crud.net:8017)
-[18](http://ow.crud.net:8018)
-[19](http://ow.crud.net:8019)
-
 # Getting Started
 
+## Ubuntu/Debian users:
+
 Get the packages you need and install a git hook to run tests before push:
 
-    ./install-dev-dependencies.sh
+```
+./install-dev-dependencies.sh
+```
+
+## Vagrant users:
+
+Requirements:
+
+* [vagrant 1.5+](https://www.vagrantup.com/)
+* [virtualbox 4.3.12+](https://www.virtualbox.org/)
+
+Getting started with vagrant is done with:
+
+```
+vagrant up
+```
+
+You can then connect with the virtual machine with:
+
+```
+vagrant ssh
+```
+
+**NOTE: the project root is mounted at ```/vagrant```**
+
+Further instructions assume you are connected to the VM in the /vagrant directory.
 
+## Boot frontend
 Try out the web UI locally:
 
     ./local-lighttpd/run-local-lighttpd.sh
     firefox http://localhost:8000/
 
+## Deploy changes to router
 Sync the web UI to your router:
 
     ./sendAppToRouter --continuous
     firefox http://gw.home.lan/
 
-# Running tests
+## Running tests
 
     ./run-tests.sh
 

diff --git a/Vagrantfile b/Vagrantfile
@@ -0,0 +1,27 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 4048
+    v.cpus = 4
+  end
+
+  config.vm.provision "shell", inline: <<EOS
+sudo apt-get update
+
+/vagrant/install-dev-dependencies.sh -xa
+EOS
+
+  config.vm.network "private_network", type: "dhcp"
+
+  config.vm.synced_folder ".", "/vagrant"
+
+  config.vm.network "forwarded_port", guest: 8000, host: 8000
+  config.vm.network "forwarded_port", guest: 9000, host: 9000
+end
diff --git a/app/changePassword.html b/app/changePassword.html
@@ -5,6 +5,7 @@
     <link rel="stylesheet" type="text/css" href="css/style.css" media="screen" />
     <link rel="shortcut icon" href="images/favicon.png" media="screen" />
     <script type="text/javascript" src="lib/jquery-2.1.0.min.js"></script>
+    <script type="text/javascript" src="lib/jstz-1.0.4.min.js"></script>
     <script type="text/javascript" src="js/helper.js"></script>
     <script type="text/javascript" src="js/request.js"></script>
     <script type="text/javascript" src="js/errorCallback.js"></script>

diff --git a/app/css/admin-style.css b/app/css/admin-style.css
@@ -1,5 +1,5 @@
 @import url(oswald-font.css);
-header, .network, footer {
+header, .network, #check-for-updates div {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -312,7 +312,7 @@ h2 small {
  display: none;
 }
 
-footer {
+#check-for-updates div {
   -ms-flex-preferred-size: 44px;
   -webkit-flex-basis: 44px;
           flex-basis: 44px;
@@ -336,13 +336,18 @@ footer img {
 #enterSshKey {
   display: none;
   padding: 1em;
+  padding-bottom: 0;
+}
+#enterSshKey .controls {
+  margin: 0;
+  padding: 0;
+  text-align: right;
 }
 #input-SSH {
   width: 100%;
   height: 11em;
 }
 #cancel-SSH, #submit-SSH {
-  float: right;
   outline: medium none;
   background: none repeat scroll 0% 0% #00ADEE;
   border: 2px solid #00ADEE;
@@ -356,3 +361,19 @@ label {
   padding-left: 1em;
   padding-bottom: 1em;
 }
+
+#check-for-updates .loading-message {
+    display: none;
+}
+
+#check-for-updates .message {
+    display: flex;
+}
+
+#check-for-updates.loading .loading-message {
+    display: flex;
+}
+
+#check-for-updates.loading .message {
+    display: none;
+}
diff --git a/app/css/style.css b/app/css/style.css
@@ -147,4 +147,4 @@ p {
 
 .changePassword {
   display: none;
-}
+}
diff --git a/app/dashboard.html b/app/dashboard.html
@@ -43,8 +43,16 @@ <h1>Dashboard</h1>
            <section id="main"></section>
 
            <footer>
-             <p>Update <span id="avail">......</span> : last checked <span id="date">......</span></p>
-               <img id="checkForUpdate" src="images/update.png" alt="update" />
+
+             <div id="check-for-updates">
+               <div class="message">
+                 <p>Update <span id="avail">......</span> : last checked <span id="date">......</span></p>
+                 <img id="checkForUpdate" src="images/update.png" alt="update"/>
+               </div>
+
+               <div class="loading-message"><p>Loading...</p></div>
+             </div>
+
            </footer>
            <div class="ips">
              <span class="ip">WAN IP: <span id="wan-ip">Loading</span></span><span class="ip">LAN IP: <span id="lan-ip">Loading</span></span>
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,4 +147,4 @@ p { @@
     .changePassword {
       display: none;
-    }
+    }