Merge changes and resolve conflicts.#1
Merged
emanchado merged 68 commits intoDec 5, 2014
Merged
Conversation
Prevent whitespace bugs
…better_tz Conflicts: routerapi/set_timezone
Using wildcard command to get all the .handlebar files. TEMPLATES_JS will be generated again when the HANDLEBARS_FILES are newer.
Also using the same code for update.py
Packed main code into methods Moved globals to attribute functions Added exception which is raised instead of calling from inside the class. Added some docstrings. Replaced has_key with .
* Using vagrant greatly reduces the barrier to contribution as it allows folks with different operating systems to get up and running quickly. * Creates a known development environment which can be centrally maintained. * Reduce the getting started documentation.
* This is required to allow install-dev-dependencies.sh idempotent (able to be run multiple times).
* tftp is required in dev for flashing the wndr3800
* Aim of this commit is to reduce build time in development. With this building firmware from clean is about 8min in virtual machine, rather than about 3hrs. * Downloads and caches ImageBuilder from cerowrt/bufferbloat repository. * Larger than a regular release. * Currently has vanilla python rather than python-mini-eff. Building python-mini-eff as a binary and hosting would resolve this issue. * Caches all downloaded packages in .cache
* Also had to upgrade selenium version to support newer version of firefox. * Xvfb is a virtual framebuffer which allows running GUI applications without a real X windows environment.
* pre-commit should aim to do everything to validate developer changes, this may extend beyond just 'run-tests.sh' which runs unit tests. * pre-commit is vagrant aware, so will run the command on the vagrant box if vagrant is detected. * if already on the vagrant box, will run tests locally.
…when you are already up to date and when you successfully download an update.
…when you click it
FIXED EFForg#211 - alignment issue with add ssh key controls and software version
…ded packages to fix build hickups. This commit corresponds to release made today via openwireless.org
…t-adjustment FIXED EFForg#221 - Reenable wireless on limit adjustment
…igurations Consolidate lighttpd configurations
Feature/better tz
…ing-test Fix load path for update_setting_test.
Fixed 219 and 220 - updating the last checked date and disabling the update button
Check password lengths
Update diceware.js
Makefile: Wildcard for HANDLEBARS_FILES
Catch exceptions in update API
…lve-conflicts Conflicts: Makefile - Now calls scripts/unit in rule test and uses wildcard. run-tests.sh - Removed modified content.
emanchado
added a commit
that referenced
this pull request
Dec 5, 2014
Merge changes and resolve conflicts.
Owner
|
Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hi Esteban
I've merged the current master into your branch and resolved the conflicts manually so your branch can be merged faster.
The following files conflicted: