Squashed 'ka-lite/' changes from d9ac03e..8a7dcef

8a7dcef Merge pull request #1923 from bcipolli/1918
693e06a Fixing scripting nits for @aronasorman.
0bf96b4 Move as much script out of templates as possible, so that jshint can run and gettext strings are reduced.
e7c95d0 Merge pull request #1921 from learningequality/ka-lite-central-merge
7a7a320 Adding code to debug in Travis.
c661af1 Skip tests when running on Travis and internet access is limited.
89cf611 Skipping slow tests.
5ae0d5e Fixing up small language bugs.
79ef9b5 Fixing up strings for running update_po.
05bf157 Fixing up update_po to run with latest refactored paths.
c26e597 Fix for #1868: hide X and Y axes on scatter view.
6785ffc Continued cleanup after show_messages interface change.
94cf0a3 Change for #1509: add documentation about problem that's been fixed already.
ccce7a3 Refactor paginate, increase informativeness of deployments.
fed4cb1 Change facility name in zone_management to link to facility edit view.
d39cbb9 Fix import nit in facility views. Assert zone for facility edit in central server.
3c6ef2b Browser test for moving a user between a group.
89ae39a Couple small fixes
dba7cbe Change imports from require_admin to require_authorized_admin
51fb8a6 Renaming test file, attempting to fix broken selector.
50e314d Fix import issue in test.
070a1f6 Make url nicknames unique, and use the "new facility" shortcut.
7bf5c7c Alert dismissal missing from test.
0b0a535 All remaining instances of @require_admin that are in modules imported by centralserver now changed to @require_authorized_admin
4a62027 Mostly working browser tests for control_panel. TODO: Stop Selenium throwing a wobbly about the Modal.
655d080 Set default zone_fallbacks on: * Facility * FacilityUser * FacilityGroup
0bcd62c Move general JS functions from distributed.js to khan-lite.js: * handleSuccessAPI * handleFailedAPI * show_api_messages
729be34 Move control panel browser tests into distributed tests.
ff361be Next iteration of browser tests for control panel.
f4148e1 Changes to facility decorators and urls to account for removal of add_facility.
6b7afc5 Browser test cruft and first pass at tests (not updated for control panel changes)
0e27371 KA Lite changes only: Require pass zone_id to new facility form. Hide zone_id in facility form display. Delete facility_add view.
395dc14 Fixing language pack deletion test.
890626b Fix up queries--current queries are quicker!
6f41013 Fix error messages and code for tabular view coach report tests.
f76a955 Add TAB in registration to skip language dropdown.
43c9b0d Default username can contain '-', which is illegal in Django.  So have to do some cleansing.
2b6b729 Remove dummy find_owner check.
8e35825 Fix for #1911: don't assume SQLite in setup.
e9d339a Add email address to setup command (rather than simply hard-coding), for central server deployment purposes.
47ae1cd Quick fix to get both file- and directory-based modules to import.
04dc035 Merge pull request #1875 from aronasorman/rct1-232
6fbab42 show dialog box after update success
c5874e6 expand on the --daemonize help section
b0eb59a cd to the tempdir rather than home when refreshing the directory handle
65473a2 add production=True for the serverstart scripts
d553cff remove collectstatic function
9dd75ba add TODO reminder to use git package for detecting if we're a git repo
65cb668 remove assert call in the API view
5ada3b4 extend cache mgmt command to be able to clear the entire web cache
7facc4e confirm through a dialog box is we want the user to update their software
d27361a remove the cancel update button
b944c2a be able to kill processes on windows
044db4a fix and wrap in gettext even more show_message messages
40d06bc remove bootstrap from imported js files
346227b remove the breadcrumb
465db9b Convert in_proc as an optional keyword argument for call_command_async
05a8911 remove some commented out code and fix some comments
abcb8b5 generalize error handling
d280da9 Always check to ensure value exists before trying to reference an attribute!
a009cc6 convert error messages to use sprintf and gettext
a51e3ba remove the collectstatic step
59c4ccf make error catching more specific
d787840 dont raise an error if we dont get the old server PID
71be44a add back the usage of serverstop script of we dont get the old server PID
6e9f61a change the error message to info message saying we'll refresh their page after 15 seconds
5ace244 do proper jsonp
3830d46 Merge pull request #1912 from dylanjbarth/1899
6036627 delete get_setting.sh
4665bc7 inline _get_server_type
a2d3a39 remove "UNKNOWN" string
1fc459a remove cancel_update_kalite (dont stop an update!!)
9dcb8f0 dont wait for server to completely start up in the start_server func
3e097c7 be able to specify in call command outside w/ output if we want to wait for the process to finish
2fc87c3 Fixing syntax issues in JS causing Travis to fail
ff525eb Oops. Cleaned up leftover debug code.
e97bdd1 Fixed basic issue for scatter reports
9d37f07 re-add JOB_THREADS variable
19b33c7 add production option to specify if we want to run the production server
02052f6 remove unused restart_server function
9fb65d8 wrap error in gettext
63bf90c remove outdated comment
1f04ce4 Merge remote-tracking branch 'refs/remotes/upstream/nalanda-rct1' into rct1-232
588ea54 shift back to starting and stopping the server
4022eb3 add the collectstatic stage
0d17bf1 restart the server instead of bringing it down and then up
f6f4df0 change the way we print messages for the server wait to be (up/down) commands
007b5b0 Wrapping new string in 'trans' tag.
56602c1 Merge pull request #1907 from dylanjbarth/1866
4e59a74 Fixed regex and naming issues
4107f55 add utility function that has formatting we want to print out to the user
1c77c91 Rewording title in place of headless zone
aac1fb7 Fix for 1866. Hide headless zone information.
6d85e3a i18n some of the error messages
9e1c755 Redoing DEBUG=>debug
14bff1f Use logging instead of sys.stdout for test output.
7a8bc54 Merge branch 'nalanda-rct1' of github.com:learningequality/ka-lite into nalanda-rct11
0abf23b Fix bugs when editing zone on central server.
2ce1674 Merge commit '628bead0a716c23c3723ee985746bcc811bee1dd' into nalanda-rct1
d410eef Moving more middleware inclusions to be owned by app.
64ac2b3 Feeling sorry for @rtibbles, so debugging some of the many bugs that seem to exist on central server admin :(
80cc77d Fixing import error.
1dc43d1 Fixing json load error that I don't understand, removing old code.
151e8c7 Removing outdated DATA_PATH from kalite/settings.py
e100269 Make an updates data path.
902e979 Fix bug--if dubbed_video_map is missing, English topic tree does not show.
376c8e3 Add I18N_DATA_PATH and directory to select locale/{lang_code}/LC_MESSAGES.
5a88508 Adding main-specific setting for data directory, moving main data there.
628bead Merge pull request #1891 from bcipolli/1890
00d8648 Fixing test error.
265cfb9 Merge commit '9416443534231d77559ffef54323886802371add' into nalanda-rct1
f3023e6 Separate CSV and view code, fix #1890: date-range issue.
cf46718 be able to dictate if we want the output into the terminal or captured
f3263e8 move code that waits for server to be up/down to its own functions
993adba add comment note in start_update_kalite on why we call_command_async that way
ee61481 fix assert call that only allows internet updates
e5b00a3 fix and i18nize error message when something wrong happens in the update software process
a4af3a6 make call_command_async return the process or thread object
8e3716c replace call to serverstart.{sh,bat} to use call_command_async
dfea917 fix path to fileupload js
e094ca6 limit output and only raise an error if the return code of serverstart is not 0
0430831 keep checking if server is still up (by polling its port) rather than sleeping for X number of seconds
9635690 use pure python to kill the old server; pass in the old server's PID to the update command
ac96344 separate out the stop server procedure from move_to_final
f280551 store pid file into a bash variable
51e8ef0 pass in our custom pid file when we want to kill runcherrypyserver
b9d9ead tweaks to get update.py working inside another process
9fdff59 fix path where update.py finds the server start and stop scripts
6ffe41a add CommandProcess command and change call_command_subprocess to use that
77eabee Merge remote-tracking branch 'aronasorman/232' into 232
6b9a2cd put importing of test modules for fle_utils inside __init__ method
1f0e9ae add test for unknown server
1df561f add test for restarting dev server
37d9f85 use relative imports for finding the module to test
ebce781 turn server_restart in fle_utils into a utility function, not a view
60a53b0 make sure we're in the right directory before setting some bash variables
84b8ff5 add mechanism attribute to download button
36f9442 change update.py command from 'download' to 'internet'
f0a0bab cleanup start_update_kalite and make it work
a5283f6 dont put keyword arguments before positional arguments
08045c5 add UPDATE_SOFTWARE_URL
dc6c59d better error message if we get a 404 when fetching the zip
94875d3 linting and updating of zip download url
515056f properly indent some divs in update_software html
26822e9 fix get server info url
115c234 fix typos
14543c5 clean up the argument flow of update.py
7f1bf44 normalize SERVER_RESTART_URL variable name
5aa899d change the way the update command is called
839396d create button for git update and remove other update mechanisms for now
cf8f3a8 move embedded update software js into its own file
a931046 move embedded update software js into its own file
1ab8fdf add mock library
2f05bab fix some invalid template tags

git-subtree-dir: ka-lite
git-subtree-split: 8a7dcef486a46478727787d24527e65fcb2a6d73
Merge commit '8aca8eb88a2d9ba6f8b04d77636e5689a4142e6e' into nalanda-rct1

Conflicts:
	ka-lite/kalite/coachreports/templates/coachreports/base_d3_visualization.html
	ka-lite/kalite/control_panel/views.py
	ka-lite/kalite/distributed/tests/cache_tests.py