Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update central-develop from 0.14.x (plus some incoming fixes) #4207

Merged
merged 19 commits into from
Aug 5, 2015

Conversation

jamalex
Copy link
Member

@jamalex jamalex commented Aug 5, 2015

No description provided.

benjaoming and others added 19 commits July 20, 2015 23:45
…che by DEFAULT, saving it to a persistent dir
en.js.

Or else, we get english catalog files, i.e. it won't get translated.
…i18nzzz

make sure the language-specific i18n js catalog file is loaded before en.js.
…fixes

Move assessment_item syncdb call inside appropriate conditional, to allow central server to run
@jamalex jamalex added the has PR label Aug 5, 2015
jamalex added a commit that referenced this pull request Aug 5, 2015
Update central-develop from 0.14.x (plus some incoming fixes)
@jamalex jamalex merged commit 8adb6f3 into learningequality:central-develop Aug 5, 2015
@jamalex jamalex removed the has PR label Aug 5, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants