Skipping import tests in Travis until we get them all passing locally.
Set 'RUNNING_IN_TRAVIS' on central server.
Move test-skipping to correct test (the failing one) :P
Merge pull request #154 from jamalex/ignore_import_tests_in_travis

Ignore import tests in travis
Squashed 'ka-lite/' changes from 281816a..e90ca3f

e90ca3f add flake8 style standards for flake8
7db71d6 Merge pull request #2075 from cpauya/feature/1161-staticfiles-after-update
051d8a3 fix #1832: clear other messages before displaying success message
901026d skip test if running on travis
5409f90 email jamie when travis build breaks
ff19868 Merge branch 'master' into release-0.12.0
8626d5f Merge pull request #2081 from dylanjbarth/1974
d1ec361 Fix for final broken test.
06425f2 Update tests for bug fix. No longer showing list of names that match, only a user count.
3d7e69a Warn the user before creating a user if there is already a user with the same first and last name combination.
4798377 use django unittest instead of builtin unittest
171ae55 Check that passwords match and enforce min 6 char length during registration and password change.
059dea4 Added option to use `fle_utils.config.models.Settings` that can be set at the admin site. Options for hash now starts with the `Settings`, then the `BUILD_ID`, then the `SHA256` hash.
2b1208c Use boolean values as second argument to custom `static` template tag, defaults to False.
538a693 Check to make sure that passwords match before creating a new user, or updating an account.
c3a997e make firefox the priority browser again
bc172e8 skip session language switching test for travis
1f11f9f Merge pull request #2077 from aronasorman/fix_set_server_language
3a67975 lint i18n middleware
f71c1df dont create a test admin if one already exists
3fff7c9 Merge branch 'release-0.12.0' of github.com:learningequality/ka-lite into fix_set_server_language
added20 remove creation of admin on i18n browser_tests
527722c lint import in languagepackdownload
0672db6 lint imports
e881304 dont use csrf for switching languages
7bb4c4d convert per-session language switching to use the API endpoint
af0ead6 Add hash to `khan-lite.css`.
5915b2e This is in reference to #1161 - "Static files not properly reloaded by all browsers after update".
fc9515e fix 403 error flash message
2e1cd1d remove duplicate code
7276f6e move set default language url from hardcoded string to its own js var
7f1dba6 use the set_default_language endpoint to change the server language
9597a3f move the setting of the default language from i18n middleware into its own endpoint
3bb8207 Merge pull request #2049 from cpauya/hotfix/2001-cron-on-windows
c0a092f Allow starting `start.command` with number of seconds for `cronserve` as argument.
73291ce Allow starting `cronstart.sh` with number of seconds for `cronserve` as argument.
d3e58b4 Bug fix for python on `counter` "defined before use" exception. Allow starting `cronstart.bat` with number of seconds for `cronserve` as argument.
0a8fea7 Removed extra `)` character at `scripts/cronstart.bat` which may prevent the script to continue running cron jobs in Windows. - Add missing image file on `static` folder which is referenced by `INSTALL.md` - Update `INSTALL.md` with some fixes to point repo from `https://github.com/jamalex/` to `https://github.com//learningequality/`.  Also update the Python and Git urls and download locations.
02c0636 Replace occurrences of `https://github.com/jamalex/*` with `https://github.com/learningequality/*` in some documentation.
a83b241 create a test for switching the server language
e8c6e93 make set default language button more amenable to testing
90ba045 Merge branch 'release-0.12.0' into nalanda
6db56cc Merge pull request #2032 from aronasorman/properly_place_js_catalog_files
9b09bce Merge branch 'release-0.12.0' into nalanda
24a77bf place js catalog files into i18n/static dir
56f7fae Directly check for /etc/init.d before asking whether to start at boot.
8301615 Fix the "unary operator expected" error in setup_linux.sh
e57140c Merge pull request #2037 from jamalex/2030
b189841 Fix to khan-exercises to get button text changing again on error (#2030)
7048c1c Regression test to detect #2030.
854f977 Merge pull request #2027 from aronasorman/2016
fc6f4fe cleanup based on review
8003ea6 place js catalog files onto the toplevel static dir
f168827 simplify the js catalog test
10664d3 call collectstatic once we finish creating the js catalog files for a language
432d968 move uninstalling of a language to i18nTestCase too
4a3ca6e make i18nTestCase a pure mixin class
10c77e7 move uninstalling of a language to i18nTestCase too
45ceb40 make test for checking if we have js catalog files available
d2b0ebd make i18nTestCase a pure mixin class
3d6893e move language installation logic to I18nTestCase
1db1d9e Merge branch 'release-0.12.0' into 2016
8b7aaa6 fix GET_EXERCISE_LOGS_URL
3b3b274 solve #2029: set debug central server host to the staging server
a24d9b8 dont test deutsche for now
ee49b80 silence logs when installing/uninstalling language packs when running tests
abaf189 make updatesframework.display_notes use logging framework instead of directly writing to stdout
3157902 mock the download of language packs to download local test zip files instead
32c90b2 move delete_language command from updates.__init__ to i18n.__init__
04510d8 add test language pack zips and logging statement for langpack download url
cef2cd8 setup a client in I18nTestCase
9117fa8 move i18n testing utility functions to its own mixin subclass
02d36f0 implement hack to update csrf token
39a92d3 remove unneeded html attributes
04f751d solve #2016: convert set_user_language to POST data instead of GET
48640dc remove redundant integration_tests.py
8d8bbd4 create tests for switching languages
2431a49 fail fast on database errors
7cf5713 add integration tests for switching languages
b900e08 Merge pull request #2017 from learningequality/ka-lite-central-merge-release-0.12.0
360fbd2 Merge pull request #148 from bcipolli/paginate_sync_sessions
3dce27b Merge pull request #144 from bcipolli/1957
a12d5b7 Paginate sync sessions.
e278071 Merge commit 'ed5e68d3d3c140a5e420fec616d23acacf8ca7fe' into release-0.12.0
c5fe191 Merge pull request #146 from bcipolli/IDOC-robust
3348066 Check local device's zone (to avoid issues when Zones exist but DeviceZone does not).
2396afd When not on a zone, show the local device only.
30da856 Use consistent idioms, remove unused code.
07a0e8f Fix for #1957: Use unique URL nicknames to avoid confusion.
9cd0a37 Moving remaining code from outer into inner loop.
881734e Merge pull request #1909 from bcipolli/1903
aac4a76 Fix for #1903: metadata check was wrong, outer loop should be model dependencies.
25365f8 Update version; remove .travis.yml in master branch.

git-subtree-dir: ka-lite
git-subtree-split: e90ca3f8ef8ad7987b84e74a89ddda535c5503eb
Merge commit '394c424c350607dd631c2852f260642de53f654b' into develop

Conflicts:
	ka-lite/kalite/control_panel/templates/control_panel/facility_management.html
	ka-lite/kalite/distributed/api_urls.py
	ka-lite/kalite/distributed/templates/distributed/base.html
	ka-lite/kalite/updates/__init__.py
	ka-lite/kalite/updates/api_views.py
email jamie and richard for failing travis tests
Merge branch 'develop' into ecosystem

Conflicts:
	ka-lite/kalite/updates/api_views.py