Commits · 11e8306a2e2b140085465c3358930bf840e85396 · edx / edx-platform · GitLab

04 Apr, 2016 7 commits
- 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
- 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
- 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
- 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 32 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
- 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
- Add accomplishments to user profile · a04a635e
  Jonathan Piacenti committed Apr 01, 2016
  
  a04a635e Browse Files
- Implement Badging API views. · a2104634
  Jonathan Piacenti committed Apr 01, 2016
  
  a2104634 Browse Files
- Add completion and enrollment badges. · 61c76771
  Jonathan Piacenti committed Apr 01, 2016
  
  61c76771 Browse Files
- Add XBlock Badging Service. · 25958feb
  Jonathan Piacenti committed Apr 01, 2016
  
  25958feb Browse Files
- Refactor badging, move into its own app. · 112a1435
  Jonathan Piacenti committed Apr 01, 2016
  
  112a1435 Browse Files
- Removing check for edx notes for OAUTH token timeout. · ce142eb3
```
TNL-4336
```
  muzaffaryousaf committed Apr 01, 2016
  ce142eb3 Browse Files
- Merge pull request #11990 from edx/mzfr/prvw-masqrd-tnl4291 · cc4349e9
```
Staff should be able to masquerade when previewing content.
```
  Muzaffar yousaf committed Apr 01, 2016
  cc4349e9 Browse Files
- Merge pull request #12011 from edx/clintonb/course-api-image · c921f2ac
```
Exposing absolute/CDN image URLs via Course API
```
  Clinton Blackburn committed Apr 01, 2016
  c921f2ac Browse Files
- check transcripts bfore using it · c1dec40c
  Qubad786 committed Apr 01, 2016
  
  c1dec40c Browse Files
- Exposing absolute/CDN image URLs via Course API · 00b48e54
```
ECOM-4013
```
  Clinton Blackburn committed Apr 01, 2016
  00b48e54 Browse Files
- Merge pull request #12012 from edx/asadiqbal08/updating-ubcpi-version-edxplatform · 9543989e
```
asadiqbal08/WL-389: Update ubcpi XBlock version
```
  Asad Iqbal committed Apr 01, 2016
  9543989e Browse Files
- Merge pull request #12015 from edx/cdyer/broken-master-20160401 · 393e885e
```
Fix broken import due to merging oauth changes to master
```
  Cliff Dyer committed Apr 01, 2016
  393e885e Browse Files
- Merge pull request #12010 from edx/ormsbee/measure_login_page · 8e42e617
```
Add finished() metric for login and registration.
```
  David Ormsbee committed Apr 01, 2016
  8e42e617 Browse Files
- Merge pull request #12002 from edx/sstudent/accordion_ · 6c4037b1
```
making the accordion template escape by default
```
  sanfordstudent committed Apr 01, 2016
  6c4037b1 Browse Files
- Fix broken import due to merging oauth changes to master · 845b0261
  J. Cliff Dyer committed Apr 01, 2016
  
  845b0261 Browse Files
- Merge pull request #12009 from edx/merge-release-into-master · 6917eb03
```
Merge oauth release into master via intermediary branch
```
  Cliff Dyer committed Apr 01, 2016
  6917eb03 Browse Files
- Merge pull request #11973 from edx/aj/ecom-3910-certification-exception-not-loading · 75b8eae9
```
Fix certificate exception view.
```
  Awais Jibran committed Apr 01, 2016
  75b8eae9 Browse Files