Squashed 'ka-lite/' changes from 35e07ff..a083779

a083779 Merge pull request #1747 from bcipolli/khanload-refactor
3126130 Move the app-settings importer into a module, so it can be used generically (central)
08a796d Moving central-only code to the central server.
010f0a7 Merge pull request #1737 from bcipolli/i18n-refactoring
e70249d Remove outdated parameter is_central_server
ac4f7da Remove central server paths and functions from i18n app.
db4b4ca Remove central server command from distributed app.
9c172b0 Removing bogus imports from languagepackdownload
90b1971 Updating management command params to default properly on distributed server.
794fc3a Moving functions specific to language pack download to languagepackdownload.py
ecd0133 Remove unnecessary functions and api endpoints.
1bbb883 Remove unnecessary management commands (distributed server).
c4b92e2 Removing LanguagePack from models/database.
581271c Merge pull request #1736 from bcipolli/static-refactoring
313af46 Merge branch 'develop' of github.com:learningequality/ka-lite into static-refactoring
f146351 Merge pull request #1730 from bcipolli/securesync-login
e2fc84c Merge pull request #1725 from rtibbles/coach_report_crazy
38081bf Wrap interface text in gettext.
d67e14e Allowing unexpected cross-app dependency of coachreports on distributed app.
882f7a9 re-enable kaserve funnel after removing disable of static file serving.
2b5dd67 Add collectstatic to setup.
2ff9036 Remove static urls from distributed urls, as they're served by runserver directly.
1abce55 Moving static files to root folder, will collect to expected location using collectstatic
02a7add Fixing missed khan-exercises path.
09f0ae5 Moving distributed static files.
82b0171 Move khan-exercises to distributed app.
9b75f18 Move facility static files.
0fa6961 Moving updates static files.
50d3c92 Moving control_panel static files.
4b7427d Move coachreports static files
accf8bd Disable kaserve, set up STATICFILES_DIRS, reset STATIC_ROOT to allow testing
4a2a6f6 Adding LOGIN_URL and LOGOUT_URL; needed for login_required header.
e4f4405 Merge pull request #1729 from bcipolli/templates-refactoring
0d4135f Move chronograph settings to proper place
97b426c Must reset global __file__ for execfile to work as expected.
dcfa845 Merge pull request #1735 from mauk81/develop
9e53dac remove merge conflict marker
5b4b210 No more project-wide "TEMPLATE_DIRS" default.
e88ca7e Moving distributed templates.
4a4743c Moving control_panel templates.
8470264 Moving coachreport templates.
b7a4378 Moving facility templates.
fcdf512 Moving updates templates.
2c06896 Deleting securesync templates from ka-lite.
49c393c Copying securesync templates to securesync app.
d3dfcc2 Added comments.
d5e9a49 Quadrant view for scatter plot coach-report.
fc97394 facility_from_request decorator must always return a HttpResponse
203fd47 Removing central server templates (exist in the ka-lite-central repo)
6e1e7b6 Merge pull request #1306 from bcipolli/new_admin
1967117 Merge branch 'develop' of github.com:learningequality/ka-lite into new_admin
9d88ec5 capitalize USER_FACING_PORT (otherwise removed from settings by Django)
969214f Add a get_locale_path function, for determining locale folder of a given language.
dae5b8f Merge pull request #1709 from ruimalheiro/duplicate_search_results
52b7849 Manually remove pyc from manage.py, as our major refactors are really hurting our ability to update without this.
a7ce67e Updating version and build info
a96cba5 Merge branch 'release-0.11' of github.com:learningequality/ka-lite into develop
5b11181 Updating version and expected release date
fff9eb9 Merge branch 'master' into release-0.11
d1001f9 Updating release date and build #
c8dcf71 Merge pull request #1718 from learningequality/release-0.11.1
2af4b83 Merge branch 'master' into release-0.11.1
ce37cb3 Fix for #1714; lost setting DEFAULT_ENCODING in refactor
cc2e221 Merge pull request #1713 from jamalex/remove_print_in_settings
a26500c Remove print statement from bottom of settings.py, as it breaks things
f98bb5b renaming import to match release-0.11 schema
608da05 fix condition
431ea73 add missing semicolon
2ee1c52 simplify comparison
b5cb29c remove unnecessary semicolon
b8fe561 remove extra comma
38825af use logical OR instead of bitwise OR
f080b2a reset property by assigning null
f5de779 remove empty blocks
a2bde2d removed cross sign from title bar
3aa9011 made User Interface and Internationalization changes
62920f7 Typo Corrected
22b11fb Added a pop-up window to confirm before deleting the videos
492446e updated .gitignore
b506eea  Issue 1476 Don't show Dropdown box if only one language is there
b98b090 Add tests for validating topic and video availability.
75c3308 Fix for #1677: show topics with exercises as available.
8d777d8 Merge pull request #1687 from bcipolli/1677
f16c5c6 Merge branch 'develop' of github.com:learningequality/ka-lite into 1677
6bdb624 Merge pull request #1664 from bcipolli/292
2ba623e Merge branch 'develop' of github.com:learningequality/ka-lite into 292
ffcba27 Merge pull request #1710 from anuragkanungo/issue1476-local
bbdef24  Issue 1476 Don't show Dropdown box if only one language is there
ce78fd0 Fixed.
93faa49 Fixed duplicate results in search.
b36bfac Merge pull request #1703 from bcipolli/1644
0fd1fc9 Merge pull request #1694 from bcipolli/securesync-subtree
8daa61d Fix code based on tests :)
0be4ff3 Adding coach report API tests.
7dfb5a5 Getting tests to run.
7e5d007 Merge branch 'develop' of github.com:learningequality/ka-lite into 292
437731f Merge branch 'develop' of github.com:learningequality/ka-lite into 1644
97d045b Fixing up comments
7cadf0b Eliminate the # of times settings needs to be loaded in different ways.
c8889ac Removing dependency on kalite.testing, smaller dependency on fle_utils.testing.
5c6299b Getting static files to work.
7708110 Initial pass at #1644 and #1701 - break up settings, move validation and loading into __init__
2426462 Clean up old path setting in cherrypy; now, it must be run via management commands.
e4da02d Fixing imports within chronograph
adb460a Breaking dependency of main on CONTENT_ROOT
91c3db2 Move LOCKDOWN check from facility (?) to distributed (of course)
8ed4b66 CENTRAL_SERVER still must be defined (until after things are refactored a bit more)
183205a Merge pull request #1697 from mauk81/jshint
a496f99 Merge pull request #1698 from mauk81/develop
191292c add missing semicolon
719f921 fix condition
6a47801 simplify comparison
5e72b49 remove unnecessary semicolon
5bd631c remove extra comma
04b0856 use logical OR instead of bitwise OR
3eebbc5 reset property by assigning null
9cc22ab remove empty blocks
bbd349c Merge commit '0892f44fad2a5e1578d75c0238b9bf03bf3900a1' as 'python-packages/securesync'
0892f44 Squashed 'python-packages/securesync/' content from commit a479fa6
3cbcdaf Removing securesync to add as a subtree
73f10fc Changing laggard test import
d2af310 Merge branch 'develop' of github.com:learningequality/ka-lite into new_admin
437b9f1 Merge pull request #1684 from bcipolli/central-refactor
3cc45ca Merge pull request #1681 from bcipolli/securesync-refactor
ed0cdca Add tests for validating topic and video availability.
b2d8fbc Fix for #1677: show topics with exercises as available.
b2c827a fix import of chronograph.Job model
68a9c4d Remove broken double-import in updates
37ff928 Merge pull request #1670 from codemania113/issue_1016
d71be4c removed cross sign from title bar
9d9581b made User Interface and Internationalization changes
b19150e Merge branch 'develop' of github.com:learningequality/ka-lite into new_admin
b32f63d Typo Corrected
164f776 Added a pop-up window to confirm before deleting the videos
4ca023a updated .gitignore
6d312f0 Fix for #292: Allow selecting non-math topics with exercises for viewing coaching data.
fe1369a Changing "development wiki" link to github
090ed49 Update README.md
0c401dc Fix for when facility='None' in the url
50f2102 Merge branch 'develop' of github.com:learningequality/ka-lite into new_admin
a5e86a0 Fix for #1614 - make sure to specify a model's zone when it hasn't been signed yet.
da9d9ff Make video interface language aware (back-end commands don't yet obey...)
a2ad754 Fix for #227 - call videoscan on an (async) api request, rather than in a (blocking) view
739d75c Fix for #157, #361 - urlencode "next" get parameter, so querystring args on the "next" url are preserved.
a2906ad Update videos styling tweaks
6469d2f Merge branch 'release-0.11' of github.com:learningequality/ka-lite into new_admin
3375f15 Prevent central server stats timelines getting broken by data with no timestamp.
7f1acf3 Merge pull request #1539 from mauk81/patch-3
065ac8c fix syntax error (python2.6)
221b1ba use blocktrans instead of trans
4bd55cb One more import error, one control panel bug (unrecognized facility causes exception instead of 404)
f804880 3 import bugs from securesync.users => facility refactoring
e2d023c Hide non-documentation links in help
61618bd Merge branch 'develop' of github.com:learningequality/ka-lite into new_admin
28e38b6 Merge pull request #1514 from mauk81/patch-2
11f1b9e Merge pull request #1513 from mauk81/patch-1
7b6b8eb fix text
fddb9e6 fix syntax
a176f9f Default to DEBUG = True iff CENTRAL_SERVER = True.
bc4ef08 Add CSS files generated through grunt to .gitignore
b622b06 Remove CSS files auto-generated by grunt from repo.
dcb4ff9 Some revisionism to allow migration history to be run on InnoDB database.
1dadef3 restore setup_windows.bat
89b0a5d Merge pull request #1386 from learningequality/release-0.10.3
2ca1b56 Merge branch 'develop' of github.com:learningequality/ka-lite into new_admin
3516389 Only append prev if it's available.
6993dbe Fix #1280 and #1362 - issues with blank strings in server start/stop
3eaa10b Fixing 1367 (always showing videos as available) by disabling streaming component (until next release)
16f8dee Solves #1364: metadata filepath on distributed server was referenced incorrectly.
38b697b Merge branch 'release-0.10.3' of github.com:learningequality/ka-lite into release-0.10.3
15a0479 Updating interface to get subtitles showing for 0.10.3
cdf8eef Merge pull request #1358 from bcipolli/registration_fixes
2e93039 Merge branch 'release-0.10.3' of https://github.com/learningequality/ka-lite into release-0.10.3
bb65390 Better URL redirection after successful registration
f6f35e1 Add logging during syncing, to help debugging.
632dc46 Change minversion for new fields from 0.11.1 to 0.10.3
6ae28d6 Merge branch 'ka-lite' into new_admin
12bc80a Lost in merge conflict resolution
5c0986e Merge branch 'ka-lite' into new_admin
bd9f790 Get redirect after facility user creation.
0069c78 Get group summary data working again.
ccc691d Implement facility_delete
b751e4e Remove organization information from the `control_panel` app, migrate to simpler URL structure.
b11659a Styling changes to control panel pages
19d672e Facility selection to work with new zone management.
bc30d20 Make facility edit page work when offline.
d0f4c9d Make zone management more managerial, not just reporting.
efddccd Make users edit page, and active caret, work.
a1c282d Removing facility_admin, in favor of control panel
9194d05 Merge branch 'develop' into new_admin
ad65adc Redo the navbar options for admins
a703ae0 Adding hooks into admin functions from the zone management page, and view/url changes for facility user management page changes.
10efa67 Starting to revamp the facility user management page.
6d43464 Moving handling of errors to base `doRequest` call, instead of requiring each call to add it.
861fd19 Add (very restricted) `is_deletable` function to syncable models
d241086 Move user management api calls to securesync
94865c2 Separating update videos and update languages.
d9350bd Merge with branchlockdown_logins
2211d9e get active indicator working for help pages
6079fb7 Refactor clock_set into css and js, move into proper static file locations.
33d5b03 Officially move to help_admin, create help_student.
178eee2 Move updates and control_panel static files into their own directories
1ed1b54 Merge branch 'develop' into new_admin
8183c10 Fully move user_list to control_panel app
c543540 Add tools from old easy_admin to zone management page, make active caret work.
425c0d7 Reconfigure base options, reducing easy_admin to a help page (remove tools), simplifying options for admins.

git-subtree-dir: ka-lite
git-subtree-split: a083779da5262d712d1031b1b04d34ea62084169
Merge commit 'b994b92c1d81ab98eb1d782aad00a99c3a8313f2' into develop

Conflicts:
	ka-lite/kalite/i18n/__init__.py
	ka-lite/kalite/i18n/management/commands/update_po.py
Remove settings from headers so updates can be used as a module instead of app.
Remove requirement of settings so main can be used as a module instead of an app.
Removing dependence of registration on CENTRAL_SERVER_HOST
Removing dependence of contact on CENTRAL_SERVER_HOST and CENTRAL_WIKI_URL
Migrating central to get host from request.
Merge branch 'develop' into settings-refactor
Add registration settings.
Add i18n_central settings.
Add contact settings.
Add central settings (and __init__ to obey them).
Add controller settings, pulling in settings from indivdiual apps.
Merge pull request #19 from bcipolli/settings-refactor

Settings refactor