Bug 816080: Upgrade Bedrock to latest Playdoh #558
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…into peterbe-packaging-docs-2
Remove KNOWN_LANGUAGES in favor of DEV_LANGUAGES and PROD_LANGUAGES which are lazily used in LANGUAGES_URL_MAP and LANGUAGES depending on the value of DEV. DEV_LANGUAGES are autogenerated from the contents of the locale/ directory in the root of the project. PROD_LANGUAGES should be maintained manually. In addition, the commit removes the RTL_LANGUAGES setting which wasn't used anywhere. Django's default value for LANGUAGES_BIDI is sufficient and used by django.utils.translation.get_language_bidi.
Refactor KNOWN_LANGUAGES into {DEV,PROD}_LANGUAGES
Catch OSError if locale/ directory doesn't exist
… projects. Playdoh docs now live under gh.com/mozilla/playdoh-docs Closes issue 31.
…re. Default to SHA512 and strongly suggest bcrypt instead. Closes issue mozilla#41.
…es accept only ASCII characters
|
Yay! Make ci server happy finally! |
Conflicts: apps/legal/templates/eula/index.html apps/legal/templates/legal/eula.html bedrock/firefox/templates/firefox/new-b.html bedrock/legal/templates/legal/index.html bedrock/legal/urls.py bedrock/mozorg/urls.py bedrock/mozorg/views.py bedrock/research/templates/research/collaborations.html bedrock/research/templates/research/publications.html lib/l10n_utils/management/commands/l10n_check.py lib/l10n_utils/tests/test_commands.py lib/l10n_utils/tests/test_gettext.py
b9ee4a5 Update to Django 1.4.5
Conflicts: lib/l10n_utils/tests/test_dotlang.py
Conflicts: bedrock/firefox/tests.py bedrock/firefox/views.py bedrock/firefoxos/models.py bedrock/firefoxos/templates/firefoxos/faq.html bedrock/firefoxos/templates/firefoxos/firefoxos-base.html bedrock/firefoxos/templates/firefoxos/firefoxos.html bedrock/firefoxos/urls.py bedrock/settings/base.py bedrock/urls.py
Conflicts: bedrock/mozorg/templates/mozorg/download_buttons/aurora_large.html bedrock/mozorg/templates/mozorg/download_buttons/aurora_small.html bedrock/mozorg/templates/mozorg/download_buttons/base.html bedrock/mozorg/templates/mozorg/download_buttons/beta_large.html bedrock/mozorg/templates/mozorg/download_buttons/beta_small.html bedrock/mozorg/templates/mozorg/download_buttons/channel.html bedrock/mozorg/templates/mozorg/download_buttons/dumb.html bedrock/mozorg/templates/mozorg/download_buttons/large.html bedrock/mozorg/templates/mozorg/download_buttons/large_mobile.html bedrock/mozorg/templates/mozorg/download_buttons/mobile_aurora.html bedrock/mozorg/templates/mozorg/download_buttons/mobile_base.html bedrock/mozorg/templates/mozorg/download_buttons/mobile_small.html bedrock/mozorg/templates/mozorg/download_buttons/small.html bedrock/mozorg/templates/mozorg/download_buttons/upgrade.html media/css/persona/persona.less
Conflicts: bedrock/base/templates/sand.html bedrock/collusion/templates/collusion/demo.html bedrock/mozorg/templates/mozorg/base.html media/css/collusion/collusion.less
Conflicts: bedrock/mozorg/util.py bedrock/mozorg/views.py bedrock/settings/base.py wsgi/bedrock.wsgi
Conflicts: bedrock/settings/base.py
Conflicts: bedrock/base/templates/includes/webtrends-fx.html bedrock/base/templates/includes/webtrends.html media/css/covehead/channel.css media/css/covehead/home.css media/js/base/webtrends.js
|
Oops, didn't meant to update this PR any more, should've close it. New PR with squashed commit will coming soon. |
|
FYI, new PR is #755 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Guess I should call this a WIP
Current status: