Adding user data and sorting to deployments CMS
Squashed 'ka-lite/' changes from cbef7d3..fc04602

fc04602 Change facility link to view, not edit.
f00f0ff Merge pull request #1818 from rtibbles/highlight_device
b9a14d9 Merge pull request #1812 from bcipolli/1811
4bf11f6 Add back missing context variable.
e0a3a27 Small style tweaks to register now link.
ba83952 Implemented unregistered device highlighting via template tags. Reverted register now to link.
768e99f Merge branch 'develop' of github.com:learningequality/ka-lite into highlight_device
0e457ff Merge pull request #1797 from bcipolli/1795
9cf3a9d Merge pull request #1805 from bcipolli/1727
1c94fd4 Don't add tag selectors along with identity selectors.
c734df5 Provide a better message for translation.
0862c80 Merge pull request #1787 from bcipolli/1762
9c6f59e Fix for #1727: report all errors, including connection errors.
d2117ad Fix for #1740: fix one-click button colors.
cbff026 Make one-click reg use doRequest, to hook into auto-AJAX handling.
49e23cd Add gettext, indicate which language pack is being deleted, fix indenting.
8cff72b Merge pull request #1833 from anuragkanungo/issue1820
6aa3093  Issue 1820 : Added confirmation box before deleting language
4b16dc9 Speeding up cherrypy by not setting nthreads too low in DEBUG mode.
a11cfbd kaserve takes care of non-installed system, so don't check in OS script.
e5e75d6 Make sure if you call cherrypy that static files are copied to STATIC_ROOT.
aaf56d0 Make settings override CHERRYPY_PORT with PRODUCTION_PORT, and make OS scripts dumber.
abf1d3f Make cherrypy aware of CHERRYPY_THREAD_COUNT and (new) CHERRYPY_PORT setting.
3ee8f74 Uses chronograph settings within app to set default values.
4bd5d4d Move reporting of IP address out of os-specific scripts and into kaserve command.
a02bafc Removing dependence on CENTRAL_SERVER setting.
c375707 Last minor formatting tweak in control_panel/views to make non-post requests come first.
648716e Highlight device when unregistered on zone management. Style buttons ready for bootstrap integration.
01c9840 Making sure object ref is either an object or None (and not False)
626046a Fixing up errors from misconception on how date range was being used.
294df25 Use the generic pagination in fle_utils.
3bc1d6a Add paginate module to django_utils; can be generalized in the future!
9d8f235 Added error messages in facility app to user on form save fail, reordered code for short "if" to precede long "else"
3ef67b5 Added error messages in control_panel app to user on form save fail, reordered code for short "if" to precede long "else"
195cd7c Initialize a facility only during install_fresh, to avoid resetting default facility.
02021fe More robustly create and set default facility.
a81ddd6 Merge pull request #1817 from bcipolli/1312
d6baa1d Added link for home, migrated "watch" to watch root.
1df7778 Added view for "Watch" root.
0c356bc Change constant name for topics file.
e81351b Disable knowledge map building (that API endpoint no longer exists)
5bb238b Be robust in the case that a request fails (404 or non-JSON response)
1d3207d Set a minimum # of points per exercise to 5 (note: some exercises had "seconds_per..." set to 0)

git-subtree-dir: ka-lite
git-subtree-split: fc046020b79c37bb4a699161612bfd551cd314a0
Merge commit 'd71a00c10b1eff5ec472b4babe47ecfd6b5564e0' into nalanda-rct1

Conflicts:
	ka-lite/kalite/control_panel/views.py
	ka-lite/kalite/distributed/views.py
	ka-lite/kalite/facility/views.py
Change wsgi paths, missing registration absolute import.
Readme tweaks.
Squashed 'ka-lite/' changes from cbef7d3..c89e9c4

c89e9c4 Merge pull request #1860 from bcipolli/397
a703cc4 Fixing broken comments.  So frustrating :)
e2f553c Fix for #1840: we expect 500 server errors to also return JSON messages
a738022 Merge branch 'nalanda-rct1' of github.com:learningequality/ka-lite into develop
cec9a30 Merge commit 'd71a00c10b1eff5ec472b4babe47ecfd6b5564e0' into nalanda-rct1
1bb14f0 Moving resource files to shared static folder.
fc04602 Change facility link to view, not edit.
881e0db Merge pull request #1836 from heidimason/responsive
f00f0ff Merge pull request #1818 from rtibbles/highlight_device
b9a14d9 Merge pull request #1812 from bcipolli/1811
4bf11f6 Add back missing context variable.
e0a3a27 Small style tweaks to register now link.
ba83952 Implemented unregistered device highlighting via template tags. Reverted register now to link.
768e99f Merge branch 'develop' of github.com:learningequality/ka-lite into highlight_device
01f1aa3 Merge branch 'develop' of github.com:learningequality/ka-lite into responsive
0e457ff Merge pull request #1797 from bcipolli/1795
8cc8bf9 Fixed thumbnail bug imposed by Bootstrap
0a3ccfd Fixed box shadows on exercise pg
1144fd8 General changes
8c1898d Fixed thumbnail bug imposed by Bootstrap
4b08611 Fixed pre-existing bug where lang options were being duplicated
fb66078 Initial migration to Bootstrap
1f9192b Moved lang selector to nav bar right
e141601 Deleted unused selectors
d7b7076 Jamie's fix for bouncing nav bar
9cf3a9d Merge pull request #1805 from bcipolli/1727
1c94fd4 Don't add tag selectors along with identity selectors.
c734df5 Provide a better message for translation.
0862c80 Merge pull request #1787 from bcipolli/1762
9c6f59e Fix for #1727: report all errors, including connection errors.
d2117ad Fix for #1740: fix one-click button colors.
cbff026 Make one-click reg use doRequest, to hook into auto-AJAX handling.
49e23cd Add gettext, indicate which language pack is being deleted, fix indenting.
8cff72b Merge pull request #1833 from anuragkanungo/issue1820
6aa3093  Issue 1820 : Added confirmation box before deleting language
848e0b5 Partial fix for #1824: missing import of os
4b16dc9 Speeding up cherrypy by not setting nthreads too low in DEBUG mode.
a11cfbd kaserve takes care of non-installed system, so don't check in OS script.
e5e75d6 Make sure if you call cherrypy that static files are copied to STATIC_ROOT.
aaf56d0 Make settings override CHERRYPY_PORT with PRODUCTION_PORT, and make OS scripts dumber.
abf1d3f Make cherrypy aware of CHERRYPY_THREAD_COUNT and (new) CHERRYPY_PORT setting.
3ee8f74 Uses chronograph settings within app to set default values.
4bd5d4d Move reporting of IP address out of os-specific scripts and into kaserve command.
a02bafc Removing dependence on CENTRAL_SERVER setting.
c375707 Last minor formatting tweak in control_panel/views to make non-post requests come first.
648716e Highlight device when unregistered on zone management. Style buttons ready for bootstrap integration.
01c9840 Making sure object ref is either an object or None (and not False)
626046a Fixing up errors from misconception on how date range was being used.
294df25 Use the generic pagination in fle_utils.
3bc1d6a Add paginate module to django_utils; can be generalized in the future!
9d8f235 Added error messages in facility app to user on form save fail, reordered code for short "if" to precede long "else"
3ef67b5 Added error messages in control_panel app to user on form save fail, reordered code for short "if" to precede long "else"
195cd7c Initialize a facility only during install_fresh, to avoid resetting default facility.
02021fe More robustly create and set default facility.
a81ddd6 Merge pull request #1817 from bcipolli/1312
d6baa1d Added link for home, migrated "watch" to watch root.
1df7778 Added view for "Watch" root.
b5626f6 Reordered nav bar items per Bootstrap
9546d31 Update securesync views to remove org info.
2c6279f Don't require optional distributed server settings.
cc92e7d Stop counting links.
70c3298 Tweak to test assert output message.
ee5af1f Remove org_id parameter from delete_zone
1792b6e Generalize control_panel to work for central server.
31bb89e Moving to new logging setup on ka-lite project.
9827add Removing reference to kalite from within fle_utils, simplify idiom.
f9fc500 Merge commit 'f870bf8208597900d6598f9e90f2bf5cc7a0a93d' into develop
143e045 Initialize a facility only during install_fresh, to avoid resetting default facility.
a3d09dc More robustly create and set default facility.
059b210 Put distributed server-specific installation steps under CENTRAL_SERVER flag.
4edf50e Fixing order of variable combination in settingshelper.
da57596 Simplifying the distributed test runner.
af9f686 Avoid using distributed-only settings in function headers.
30496e5 Set proper package strings by using the __package__ variable.
166d8a8 Set __package__ variable so imported settings files can use it.
b072b0e Fixing i18n references to zone_management.
b17e939 Fixing distributed references to zone_management.
202c600 Referencing generic khan-lite.js, removing old.
bd3ac5e Moving khan-lite to be a generic, shared js (not distributed app).
969c4e8 Fixing two distributed app bugs.
ba4d4c9 Getting generic template tags from fle_utils, deleting from distributed app.
4534c9b Copying generic template tags to fle_utils
2f34320 Merge commit 'd87024cea1a7a0e8e897d951918e1e0c49154513' into develop
0c356bc Change constant name for topics file.
e81351b Disable knowledge map building (that API endpoint no longer exists)
5bb238b Be robust in the case that a request fails (404 or non-JSON response)
1d3207d Set a minimum # of points per exercise to 5 (note: some exercises had "seconds_per..." set to 0)
a1f193c Corrected typo
84986a1 Edited hover colors
109ed9d Edited header/footer colors
7f38c28 Footer was off by one pixel
ee3cccf Hid headline in xs displays
a207574 Polished/refactored footer, polished a few elements relating to responsive des
15f9a90 Re-coded to look more like original version
fdc47d2 Merge commit '502ced7820dc01422792d9e23a4eaee48072d648' into develop
6b57ec8 Slightly decreased height of jumbotron, aligned left footer logo and right footer text
504543d Enabled Bootstrap alerts
0db4e12 Added viewport meta tag
12e47e9 Sticky footer was too high by 1 pixel
9d4f67e Deleted unused sprite image per Jamie
e93d389 Integrated original stylesheets
24760ee Fixed Creative Commons image, Jamie edited background image for pages with tall content
f3d6b82 Refactored
c57c4c6 Polished responsive design on homepage, refactored
08fb4a4 Refactored
95c994c Refactored
7bd7b99 Polishing homepage
129f542 Polished nav bar, footer, and jumbotron responsive design; refactored
51bfa96 Polishing navbar and footer, added background image and jumbotron, moved homepage css to this file
9d8f2a3 Transitioning homepage to responsive design
bb90847 Polished footer markup
6223f51 Removing incorrect settings import that broke the build.
4765439 Merge commit '53eb42c301762ec92956d1e068a1983c1c311e39' into develop
f420085 Started on homepage
dc5fda9 Refactored, polished footer
7b6125a Implemented responsive nav bar and new sticky footer
c2e4d92 Remove requirement of settings so main can be used as a module instead of an app.
5f95310 Remove settings from headers so updates can be used as a module instead of app.
c5741f2 Merge commit 'b994b92c1d81ab98eb1d782aad00a99c3a8313f2' into develop
37e725c Merge pull request #11 from bcipolli/i18n-refactoring
0169089 Merge pull request #12 from bcipolli/templates-refactoring
6a0c7de Merge branch 'kalite-prefix' into i18n-refactoring
1f2bd15 Moving commands to i18n_central, separating __init__ file.
a2d248a Pull management command into central repo, rename imports.
db577c7 Moving feeds out of central into fle_utils.feeds
4a8b62b Moving contact templates.
ab49fc1 Don't require AMARA credentials

git-subtree-dir: ka-lite
git-subtree-split: c89e9c49e7f8b83a81aa60169f29ce3d76ee5e0a
Merge commit '1e47f860c01e49e1418adb7b0e088b3498150db7' into develop

Conflicts:
	ka-lite/kalite/control_panel/views.py
	ka-lite/kalite/distributed/views.py
	ka-lite/kalite/facility/settings.py
	ka-lite/kalite/facility/views.py
Enabling jshint and fle_utils regression tests.
Squashed 'ka-lite/' changes from fc04602..d9ac03e

d9ac03e Shut up loggers during testing.
55cf159 Merge pull request #1895 from bcipolli/jshint-ci
6618a49 Fixing up JS based on jshint results.
7a22dde Fixing up Gruntfile paths for the distributed server.
789805f Merge branch 'master' of github.com:mauk81/ka-lite into nalanda-rct1
0b263ed Merge pull request #1888 from bcipolli/1887
33ba6cd Skipping tests needing Python 2.7 when running in Python 2.6
375f204 try to install grunt-cli on travis without sudo
3bfd8c2 Fix for #1887: Enable fle_utils testing through Travis-CI
2e15c15 add jshint to travis-ci
b473cad Merge branch 'master' of github.com:learningequality/ka-lite into nalanda-rct1
a0a3a1e Merge pull request #1873 from bcipolli/1636
00af60f update jshint config
c4bf25f Merge pull request #1889 from bcipolli/1826
7e83aa0 paginate_users is destructive of incoming data, so send a copy.
b025038 Fix incorrect links to facility_management page.
7a790e9 Fix #1826: CSV needs raw data, not pages.  Keep raw & paged data, separate variable names.
9abbeb7 Merge pull request #1874 from bcipolli/1802
f7d7f98 Fix for #1886: missing logger import
26bb48f Merge commit 'b9a8cb9d2c6dbc8f37934aa7abfc1c3a904b98e5' into ecosystem_tests
8bcce34 Fix caching regeneration issues (functionality currently not used, so disable tests)
f7c4909 Fix django test error.  DJANGO!!
9bba61a Fix up error messages (and broken test) in updates.
e26d9f1 Try to fix up caching issues.
15283ba Update # of expected queries.
28f3027 Moving code into base, moving query_tests into browser_tests.
8772a4c Fixes for updates app percent complete computations.
e2d77ed Move coachreports browser tests.
20e0e03 Remove all references to changelocalpassword--this is doable via the GUI now.
25cfd06 Tweak reverse URL references.
54c5ec0 Enough with these warnings, we confirmed with KA that this is fine.
bc3ba3f Tweaks to .travis.yml to run browser tests and to email aron, not me :)
3e67869 Don't reduce # of stages during a cancel... why was that ever there??
ed9765f Fixing up error querying video info from node_cache.
d44d3ce Removing unused imports.
97ba449 Adding default language to user registration test.
51e896c Make travis show stack trace on any fatal error.
1cbb29f Fixed import error on update tests.
e167745 Moving language pack and knowledge map tests into the distributed tests; made registration available to all tests.
8e57795 All browser-based tests should now be inside the distributed app.
a5ed624 Update the test runner to enable all tests (no longer need to filter, due to refactoring).
e69712c Template changes to toggle behavior based on whether a thumbnail is available.
750c131 Fix for #1636: select thumbnail format from a list instead of hard-coding to png.
0ac0c0b Merge pull request #1845 from bcipolli/1481
0266a60 Enhance the subprocess use of manage.py
2330087 Properly prefix the distributed app with 'kalite'
011ba60 Only hard-code settings IF they're not set already.
7151bc0 Fixing broken comments.  So frustrating :)
c731e47 Fix for #1840: we expect 500 server errors to also return JSON messages
cec9a30 Merge commit 'd71a00c10b1eff5ec472b4babe47ecfd6b5564e0' into nalanda-rct1
6e7a82a Fix for #1481: Add Device, DeviceZone, Zone to syncing models.
848e0b5 Partial fix for #1824: missing import of os
9546d31 Update securesync views to remove org info.
2c6279f Don't require optional distributed server settings.
cc92e7d Stop counting links.
70c3298 Tweak to test assert output message.
ee5af1f Remove org_id parameter from delete_zone
1792b6e Generalize control_panel to work for central server.
31bb89e Moving to new logging setup on ka-lite project.
9827add Removing reference to kalite from within fle_utils, simplify idiom.
f9fc500 Merge commit 'f870bf8208597900d6598f9e90f2bf5cc7a0a93d' into develop
c558f47 Update README.md
5ec8a63 Update README.md
059b210 Put distributed server-specific installation steps under CENTRAL_SERVER flag.
4edf50e Fixing order of variable combination in settingshelper.
da57596 Simplifying the distributed test runner.
af9f686 Avoid using distributed-only settings in function headers.
30496e5 Set proper package strings by using the __package__ variable.
166d8a8 Set __package__ variable so imported settings files can use it.
b072b0e Fixing i18n references to zone_management.
b17e939 Fixing distributed references to zone_management.
202c600 Referencing generic khan-lite.js, removing old.
bd3ac5e Moving khan-lite to be a generic, shared js (not distributed app).
969c4e8 Fixing two distributed app bugs.
ba4d4c9 Getting generic template tags from fle_utils, deleting from distributed app.
4534c9b Copying generic template tags to fle_utils
2f34320 Merge commit 'd87024cea1a7a0e8e897d951918e1e0c49154513' into develop
35aceeb Adding Travis CI setup file.
fdc47d2 Merge commit '502ced7820dc01422792d9e23a4eaee48072d648' into develop
6223f51 Removing incorrect settings import that broke the build.
4765439 Merge commit '53eb42c301762ec92956d1e068a1983c1c311e39' into develop
c2e4d92 Remove requirement of settings so main can be used as a module instead of an app.
5f95310 Remove settings from headers so updates can be used as a module instead of app.
c5741f2 Merge commit 'b994b92c1d81ab98eb1d782aad00a99c3a8313f2' into develop
37e725c Merge pull request #11 from bcipolli/i18n-refactoring
0169089 Merge pull request #12 from bcipolli/templates-refactoring
6a0c7de Merge branch 'kalite-prefix' into i18n-refactoring
1f2bd15 Moving commands to i18n_central, separating __init__ file.
a2d248a Pull management command into central repo, rename imports.
db577c7 Moving feeds out of central into fle_utils.feeds
4a8b62b Moving contact templates.
8a5e0a6 Merge pull request #1721 from bcipolli/installer-stats
92b40c4 Default to latest version (not text 'latest'), get from 'downloads'
ab49fc1 Don't require AMARA credentials
d70b7ab Manually remove pyc from manage.py, as our major refactors are really hurting our ability to update without this.

git-subtree-dir: ka-lite
git-subtree-split: d9ac03e7f24f061fdb9d842392ad0157cc2e3686
Merge commit '9416443534231d77559ffef54323886802371add' into nalanda-rct1

Conflicts:
	ka-lite/kalite/distributed/tests/browser_tests/base.py
	ka-lite/kalite/distributed/tests/browser_tests/browser_tests.py
	ka-lite/kalite/testing/testrunner.py
	ka-lite/kalite/updates/tests/unicode_tests.py
	ka-lite/kalite/updates/videos.py
Updating gruntfile with latest central server js files.
Fixing test error.
Squashed 'ka-lite/' changes from c89e9c4..e5d1291

e5d1291 Merge pull request #1842 from bcipolli/1312
fe92bb1 Show username & points (optional) in sitepoints element; change navbar.
8251662 Change 'change password' button to 'edit account preferences.'

git-subtree-dir: ka-lite
git-subtree-split: e5d129131939be86be2e54803f55ddeff4130673
Merge commit '70a2d9924aaa534fb44d42c7fb6dafbb06c8cfc1' into develop
KA Lite changes only:
Require pass zone_id to new facility form.
Hide zone_id in facility form display.
Delete facility_add view.
Adding main-specific setting for data directory, moving main data there.
Add I18N_DATA_PATH and directory to select locale/{lang_code}/LC_MESSAGES.
Fix bug--if dubbed_video_map is missing, English topic tree does not show.
Make an updates data path.
Creating data directory for stats (leaving to root for now; will have to figure migration strategy).