EN picks: More UI, contact, static pages, cleanups, misc fixes #242
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
Pick note: This is a missing bit from the first pick. Conflicts: pootle/apps/pootle_store/views.py pootle/apps/pootle_translationproject/urls.py pootle/apps/pootle_translationproject/views.py pootle/static/js/stats.js pootle/templates/editor/_scripts.html pootle/templates/translation_projects/overview.html
We already picked the commit that did this change, so no idea why it is gone.
Pick notes: Had to adjust the changes because we already picked later changes
and other changes were not necessary.
Conflicts:
pootle/apps/pootle_language/models.py
pootle/apps/pootle_language/views.py
pootle/apps/pootle_misc/browser.py
…ects
Pick notes: This is picking the missing bit that we left behind in the first
picking.
Conflicts:
docs/developers/glossary.rst
pootle/apps/pootle_store/views.py
Pick notes: Had to adjust the changes because our code was different. In this
commit we lose tags in project listing.
Conflicts:
pootle/apps/pootle_misc/browser.py
pootle/apps/pootle_project/models.py
pootle/apps/pootle_project/views.py
Pick notes: The rest of the changes in the original commit were already
picked in the past.
Conflicts:
pootle/apps/pootle_misc/browser.py
Pick notes: Had to do some adjustments because of code divergence. Conflicts: pootle/apps/pootle_misc/browser.py pootle/apps/pootle_project/views.py
If there are no matching languages, the project listing page is displayed.
(The templates haven't been removed since the home page will be reworked
sooner than later)
Pick notes: Just solved the conflicts raised because of code divergence. Now
the code is exactly the same.
Conflicts:
pootle/apps/pootle_app/views/index/index.py
Pick note: Minor conflicts because of the priority column for goals we have. Conflicts: pootle/templates/browser/_table.html
Pick notes: Most of the changes were already performed. get_translate_actions
is kept to allow displaying the translate action for the next goal.
This will eventually be moved to the place where the other translate
actions are created.
Conflicts:
pootle/apps/pootle_language/views.py
pootle/apps/pootle_misc/stats.py
pootle/apps/pootle_misc/util.py
pootle/apps/pootle_project/views.py
Now following the styleguide conventions. Pick notes: Most of the changes were not necessary. Conflicts: pootle/apps/pootle_app/models/directory.py pootle/apps/pootle_language/models.py pootle/apps/pootle_project/models.py pootle/apps/pootle_store/models.py pootle/apps/pootle_translationproject/models.py
Pick notes: Just fixed conflicts because we use the right import order and
respect 80 chars, and the original commit doesn't.
Conflicts:
pootle/apps/pootle_app/management/commands/__init__.py
Pick notes: Just fixed minor conflict because we moved the JavaScript code
to a separate function.
Conflicts:
pootle/static/js/stats.js
Pick notes: Just minor conflicts. Conflicts: pootle/apps/pootle_language/models.py pootle/apps/pootle_project/models.py pootle/apps/pootle_store/models.py
Conflicts: pootle/templates/browser/_table.html
Conflicts: pootle/apps/pootle_language/views.py pootle/apps/pootle_project/views.py pootle/apps/pootle_translationproject/views.py
Pick note: The rest of the changes don't apply. In particular dropping the
staticpages template library load in layout.html since we didn't remove
the code using get_legalpages that Evernote dropped in
evernote/pootle@2f453d22.
Conflicts:
pootle/templates/languages/base.html
pootle/templates/layout.html
pootle/templates/translation_projects/base.html
Conflicts: pootle/templates/editor/main.html
menu, improve styling
(cherry picked from commit evernote/pootle@e09b735e)
Pick notes: The cherry pick notice above is from Evernote. Some of the styles
were not picked because they altered the color scheme, or rendered an
ugly UI. Also had to adjust the template changes because we had the
"contact us" link in the footer. Also we keep checking the CAN_CONTACT
setting. Adjusted the changes in the template to minimize having to
pick minor tweaks as unrelated changes in further commits.
Conflicts:
pootle/static/css/style.css
Pick note: Had to move the changes to our contact app. Conflicts: pootle/apps/evernote_contact/forms.py
Pick notes: Just had to drop two removed templates. This changes will be
applied to several other templates in a followup commit.
Conflicts:
pootle/templates/auth/link_with_evernote.html
pootle/templates/login.html
Minor readability improvement.
Since the changes in Evernote don't apply at all (we are using completely different apps to handle authentication) it is better to do the changes in our own. Kept the same title for the commit.
Conflicts: pootle/templates/auth/link_with_evernote.html pootle/templates/editor/main.html pootle/templates/login.html
Pick note: Just picked this to align with Evernote as much as possible. Conflicts: pootle/apps/pootle_profile/models.py
Conflicts: pootle/apps/pootle_translationproject/models.py
Fixes evernote/pootle#31
Fixes evernote/pootle#32
Pick notes: Had to adjust to keep code that is still used.
Conflicts:
pootle/apps/pootle_autonotices/__init__.py
pootle/apps/pootle_autonotices/signals.py
pootle/apps/pootle_misc/stats.py
(their quality is questionable at the moment, and they need rework before being exposed again) Conflicts: pootle/static/css/style.css
This commit does two things:
- Synchronizes existing submission information so that denormalized fields
in the unit will have the expected submitter data.
- Prevents inconsistencies to occur again by setting the denormalized data
within a `post_save` signal handler for `Unit` objects.
Fixes evernote/pootle#33.
Pick notes: Moved the code in the migration to upgrade.
Conflicts:
pootle/apps/pootle_store/models.py
Fixes evernote/pootle#40
…created during update_stores Pick note: Just fixed minor conflicts because of code divergence. Conflicts: pootle/apps/pootle_store/models.py
Having multiple downloadable fonts is a bit too much Conflicts: pootle/static/css/style.css
I know it is fixed later, but want to fix it here since the commit that fixes this introduces other bugs and don't need this to be around when debugging.
Fixes evernote/pootle#42.
julen
pushed a commit
to julen/pootle
that referenced
this pull request
Jun 20, 2014
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.
No description provided.