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

0.14.x to central-develop #4279

Merged
merged 31 commits into from
Aug 24, 2015
Merged

0.14.x to central-develop #4279

merged 31 commits into from
Aug 24, 2015

Conversation

aronasorman
Copy link
Collaborator

Mainly for the i18n fixes.

djallado and others added 30 commits August 18, 2015 19:13
Fix container-inside-container overflow issue.
The cause of the bug here is that messages are already rendered in the
template, but making an API call that's unfiltered (in this case
/securesync/api) causes another reload of the same messages from the
demo server, hence the duplicates.

The change here is simple: we just filter out /securesync/api/.
Fix #4251. filter securesync api calls in the demo middleware.
Use double backticks for code sample; single backtick inappropriate
Docs fixes: Harden Raspberry Pi instructions, move around PPA instructions
This undoes the *huge* js file we had before.
Instead of Django's hacky way of parsing JS files, we just have xgettext
do the heavy lifting for us. It requires a new-ish version though. But
it does the job perfectly, parsing any permutation of gettext and $._.
Much strings -- i18n performance fixes.
@aronasorman aronasorman added this to the 0.14.0 milestone Aug 24, 2015
aronasorman added a commit that referenced this pull request Aug 24, 2015
@aronasorman aronasorman merged commit fbc2912 into central-develop Aug 24, 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.

6 participants