Commits · c1c41a36b5ca724753d0fcab220e7245f8e1d29e · edx / edx-platform · GitLab

04 Apr, 2016 22 commits
- Fix safe template change on dashboard. · c1c41a36
```
MA-2257
```
  Nimisha Asthagiri committed Apr 04, 2016
  c1c41a36 Browse Files
- Merge pull request #11996 from edx/ned/i18n-dummy-compilejs · 82e77049
```
Compile js strings when we make dummy strings.
```
  Ned Batchelder committed Apr 04, 2016
  82e77049 Browse Files
- Merge pull request #12029 from openfun/regisb/fix_broken_french_ugettext_in_tests · 1c9a75b4
```
Fix broken French i18n in CMS tests
```
  Nimisha Asthagiri committed Apr 04, 2016
  1c9a75b4 Browse Files
- Merge pull request #11899 from edx/jeskew/ccx_safe_templating · 35a235b3
```
Safe templating changes for CCX.
```
  John Eskew committed Apr 04, 2016
  35a235b3 Browse Files
- Fix broken French i18n in CMS tests · e850ef2d
```
French ugettext method was being monkey-patched with a "XYZ " prefix in
all tests. This introduces a context manager to guarantee that the
function reverts to its original state after the unit test has ended
(successfuly or not).
```
  Régis Behmo committed Apr 04, 2016
  e850ef2d Browse Files
- Merge pull request #11849 from open-craft/omar/watch-assets · 66ac9b01
```
Fix paver watch_assets
```
  Omar Khan committed Apr 04, 2016
  66ac9b01 Browse Files
- Merge pull request #11963 from edx/andya/upgrade-underscore-string · 9baae2ff
```
Upgrade Underscore.string
```
  Brian Jacobel committed Apr 04, 2016
  9baae2ff Browse Files
- Merge pull request #12027 from edx/vkaracic/update-browser-link · 5fafdbf5
```
Update browser support link
```
  Vedran Karačić committed Apr 04, 2016
  5fafdbf5 Browse Files
- Merge pull request #12022 from edx/cdyer/make-task-of-uninstall · 11e8306a
```
paver uninstall_python_packages
```
  Cliff Dyer committed Apr 04, 2016
  11e8306a Browse Files
- Update browser support link. · 66ff1667
  Vedran Karacic committed Apr 04, 2016
  
  66ff1667 Browse Files
- Merge pull request #12019 from edx/jeskew/upgrade_to_django_1_8_12 · 3e40c9f8
```
Upgrade to Django 1.8.12
```
  John Eskew committed Apr 04, 2016
  3e40c9f8 Browse Files
- Add Brian Jacobel to AUTHORS · 6df9f3d5
  Brian Jacobel committed Apr 04, 2016
  
  6df9f3d5 Browse Files
- Do not set up underscore.string globally. · 24990272
  Brian Jacobel committed Apr 04, 2016
  
  24990272 Browse Files
- Remove usage of Underscore.string in edit-chapter.underscore · 1ed5b4bd
  Brian Jacobel committed Apr 04, 2016
  
  1ed5b4bd Browse Files
- Upgrade Underscore.string · db62db29
```
FEDX-117
```
  Andy Armstrong committed Apr 04, 2016
  db62db29 Browse Files
- Safe templating changes for CCX. · 13ef2b7d
  John Eskew committed Apr 04, 2016
  
  13ef2b7d Browse Files
- Merge pull request #11506 from openfun/openfun/translate_user_languages_in_account_settings · f5ad6aad
```
Translate preferred languages in user account settings
```
  Nimisha Asthagiri committed Apr 04, 2016
  f5ad6aad Browse Files
- Merge pull request #12020 from edx/ned/fix-doc-links · f10a3c96
```
Fix links to moved sections of the developer guide
```
  Ned Batchelder committed Apr 04, 2016
  f10a3c96 Browse Files
- Merge pull request #12001 from edx/mrehan/tnl-4236-nonetype-no-attr-keys · ceecae7b
```
TNL-4236 – Check for video transcripts before using it
```
  M. Rehan committed Apr 04, 2016
  ceecae7b Browse Files
- Translate available preferred languages in user account settings · d2317be6
```
The listed languages in the "preferred languages" input dropdown should
be translated in the user language.
```
  Régis Behmo committed Apr 04, 2016
  d2317be6 Browse Files
- Fix paver watch_assets · 53642579
```
- Update to latest version of watchdog.
- inotify doesn't work on nfs share in devstack. Use polling instead.
- Some editors (vim) do not trigger modify events in their default
  configuration. Rebuild assets on all filesystem changes, and debounce
  when changes happen too quickly.
```
  Omar Khan committed Apr 04, 2016
  53642579 Browse Files
- Merge pull request #12018 from edx/clintonb/ccx-keys-update · ed66a1d2
```
Using edx-ccx-keys from PyPI
```
  Clinton Blackburn committed Apr 03, 2016
  ed66a1d2 Browse Files
03 Apr, 2016 1 commit
- Merge pull request #11920 from edx/bderusha/st-wiki · fb6f3a41
```
Safe Templatize: wiki templates
```
  Bill DeRusha committed Apr 03, 2016
  fb6f3a41 Browse Files
01 Apr, 2016 17 commits
- Merge pull request #10556 from edx/feature/badges-v2 · ab0cbfff
```
Badges V2 Feature Branch
```
  Kelketek committed Apr 01, 2016
  ab0cbfff Browse Files
- Refresh DB caches. · f84f95c7
  Jonathan Piacenti committed Apr 01, 2016
  
  f84f95c7 Browse Files
- Some tests for badges js · 09f5277f
  Jacek Bzdak committed Apr 01, 2016
  
  09f5277f Browse Files
- Address platform final review notes. · 17ec12c6
  Jonathan Piacenti committed Apr 01, 2016
  
  17ec12c6 Browse Files
- Using edx-ccx-keys from PyPI · 320abd7d
```
ECOM-4016
```
  Clinton Blackburn committed Apr 01, 2016
  320abd7d Browse Files
- Allow paver users to uninstall obsolete python packages via a paver command. · f2ea0419
```
MA-2250
```
  J. Cliff Dyer committed Apr 01, 2016
  f2ea0419 Browse Files
- Run compilejsi18n when we make dummy strings · e2109b97
  Ned Batchelder committed Apr 01, 2016
  
  e2109b97 Browse Files
- Stop using roundabout ways of passing strings to cmd() · a368982c
  Ned Batchelder committed Apr 01, 2016
  
  a368982c Browse Files
- Fix links to moved sections of the developer guide · d47f872a
  Ned Batchelder committed Apr 01, 2016
  
  d47f872a Browse Files
- Upgrade to Django 1.8.12 · e29e2f5a
  John Eskew committed Apr 01, 2016
  
  e29e2f5a Browse Files
- Merge pull request #12017 from edx/notes-jwt-issue · 343bb3e9
```
Removing check from edx notes settings for OAUTH token timeout.
```
  Usman Khalid committed Apr 01, 2016
  343bb3e9 Browse Files
- Patch for badge migrations to fix date specificity change. · ca959ab1
  Jonathan Piacenti committed Apr 01, 2016
  
  ca959ab1 Browse Files
- Add share modal to badge listing. · 1a6394b7
  Jonathan Piacenti committed Apr 01, 2016
  
  1a6394b7 Browse Files
- Adjust get_completion_badge usages to handle exceptions. · ccb5b6c7
  Jonathan Piacenti committed Apr 01, 2016
  
  ccb5b6c7 Browse Files
- Address notes. · 4fde73fa
  Jonathan Piacenti committed Apr 01, 2016
  
  4fde73fa Browse Files
- Disable badge issuance for courses where badges are disabled. · cb4ed420
  Jonathan Piacenti committed Apr 01, 2016
  
  cb4ed420 Browse Files
- Change issuing_component for included badge events. · cff93438
  Jonathan Piacenti committed Apr 01, 2016
  
  cff93438 Browse Files