Commits · b6604a3a70ffc8b9ce7e24046a0990cdad8a91c1 · edx / edx-platform · GitLab

16 Feb, 2016 4 commits
- ECOM-3706: Updated the hard coded datetimes in tests and also added the test for… · b6604a3a
```
ECOM-3706: Updated the hard coded datetimes in tests and also added the test for restricting credit direct sale
```
  aamir-khan committed Feb 16, 2016
  b6604a3a Browse Files
- ECOM-3706: Restricted the enrollment in credit modes directly in upgradeAndVerified flow · f7be42a1
  aamir-khan committed Feb 16, 2016
  
  f7be42a1 Browse Files
- Merge pull request #11554 from edx/revert-old-commits · 52b39ca4
```
Undo inadvertent commits
```
  Nimisha Asthagiri committed Feb 16, 2016
  52b39ca4 Browse Files
- Undo inadvertent commits. · ed197897
  Nimisha Asthagiri committed Feb 16, 2016
  
  ed197897 Browse Files
12 Feb, 2016 4 commits
- Merge pull request #11525 from edx/efischer/fix_global_message · 406066ca
```
Fix config_model admin view
```
  Eric Fischer committed Feb 12, 2016
  406066ca Browse Files
- Exclude Reverse Foreign Keys from list_display · 63942380
```
These types of fields do not need to be included, and attempting
to do so causes everything to break.
```
  Eric Fischer committed Feb 12, 2016
  63942380 Browse Files
- Merge pull request #11500 from edx/raees/chrome-bok-choy-test-stores-speed-for-multiple · 04ca0af5
```
Fixed test_video_component_stores_speed_correctly_for_multiple_videos…
```
  raeeschachar committed Feb 12, 2016
  04ca0af5 Browse Files
- Merge pull request #11521 from edx/andya/fix-afontgarde-loading · 756c8a46
```
Fix bug with loading AFontGarde
```
  Andy Armstrong committed Feb 11, 2016
  756c8a46 Browse Files
11 Feb, 2016 19 commits
- Merge pull request #11524 from edx/ned/merge-dogwood-to-master · 462d0c04
```
Merge Dogwood to master
```
  Ned Batchelder committed Feb 11, 2016
  462d0c04 Browse Files
- Update this command for Django 1.8 · d8b9dec5
  Ned Batchelder committed Feb 11, 2016
  
  d8b9dec5 Browse Files
- Update post_cohort_management_fix to Django 1.8 · 432a40f0
  Ned Batchelder committed Feb 11, 2016
  
  432a40f0 Browse Files
- Merge pull request #11517 from edx/clintonb/package-uninstall-fix · 794cecec
```
Fixed package uninstall for django-oauth2-provider
```
  Jesse Zoldak committed Feb 11, 2016
  794cecec Browse Files
- Merge pull request #11516 from edx/peter-fogg/course-full-logging · 9b5b7837
```
Better error logging for full courses during enrollment.
```
  Peter Fogg committed Feb 11, 2016
  9b5b7837 Browse Files
- Fix bug with loading AFontGarde · 2ec7c17a
```
The code isn't ready to start using AFontGarde from
the Pattern Library yet, so I've reverted the code back
to loading the copies from the vendor library.
```
  Andy Armstrong committed Feb 11, 2016
  2ec7c17a Browse Files
- Merge pull request #11486 from itsbenweeks/info_display_number_fix · 77343a02
```
info page course id -> display_number_with_default
```
  Peter Fogg committed Feb 11, 2016
  77343a02 Browse Files
- Fixed package uninstall for django-oauth2-provider · 8af930d2
```
edx-django-oauth2-provider is being mistaken for django-oauth2-provider. Making the filter less liberal ensures we properly uninstall django-oauth2-provider once.

ECOM-3647
```
  Clinton Blackburn committed Feb 11, 2016
  8af930d2 Browse Files
- Merge pull request #11468 from cpennington/program-cert-retries · 1f9e90ef
```
Program cert retries
```
  Calen Pennington committed Feb 11, 2016
  1f9e90ef Browse Files
- Merge pull request #11458 from edx/hasnain-naveed/PHX-244 · d8084564
```
PHX-244 / Added two extra field in credit API and bump the version up
```
  Douglas Hall committed Feb 11, 2016
  d8084564 Browse Files
- Merge pull request #11515 from edx/ned/update-translations · 588ce639
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Feb 11, 2016
  588ce639 Browse Files
- course id/org/name -> display_stuff_with_default · 52e8db34
  Ben Weeks committed Feb 11, 2016
  
  52e8db34 Browse Files
- Better error logging for full courses during enrollment. · a7b1f79d
```
ECOM-3685
```
  Peter Fogg committed Feb 11, 2016
  a7b1f79d Browse Files
- Merge pull request #11513 from edx/clintonb/package-uninstall-fix · 90e1b626
```
Updated expected version for python_uninstall_version.txt
```
  Clinton Blackburn committed Feb 11, 2016
  90e1b626 Browse Files
- Update translations (autogenerated message) · 4b7dcb2b
  Ned Batchelder committed Feb 11, 2016
  
  4b7dcb2b Browse Files
- Fixed test_video_component_stores_speed_correctly_for_multiple_videos failing on Chrome · c6d23731
  raeeschachar committed Feb 11, 2016
  
  c6d23731 Browse Files
- Added two fields in credit API · d06edc68
  Hasnain committed Feb 11, 2016
  
  d06edc68 Browse Files
- Merge pull request #11499 from mehrozezahid/mehrozezahid/TNL-4096 · a26d5764
```
Added target='_blank' to both cohort external doc links.
```
  Muzaffar yousaf committed Feb 11, 2016
  a26d5764 Browse Files
- Updated expected version for python_uninstall_version.txt · f78945bd
```
Follow up to #11432. This value needs to be incremented to ensure the old package is uninstalled.

ECOM-3647
```
  Clinton Blackburn committed Feb 10, 2016
  f78945bd Browse Files
10 Feb, 2016 13 commits
- Merge pull request #11511 from edx/renzo/programs-warning · 074b83ab
```
Address ProgramsApiConfig deprecation warning
```
  Renzo Lucioni committed Feb 10, 2016
  074b83ab Browse Files
- Merge pull request #11471 from edx/sstudent/MA-1881-null-translation-check · d5cee7b3
```
ma-1881 handling empty translations and testing
```
  sanfordstudent committed Feb 10, 2016
  d5cee7b3 Browse Files
- Merge pull request #11509 from edx/christina/course-global · fb45a6f3
```
Ensure window.course is available before anyone accesses it.
```
  Christina Roberts committed Feb 10, 2016
  fb45a6f3 Browse Files
- Merge pull request #11432 from edx/clintonb/oauth-client-credentials · 219b7f75
```
Updated django-oauth2-provider
```
  Clinton Blackburn committed Feb 10, 2016
  219b7f75 Browse Files
- Ensure that window.course is avaiable before anyone accesses it. · 30c42e72
```
TNL-4106
```
  cahrens committed Feb 10, 2016
  30c42e72 Browse Files
- Address ProgramsApiConfig deprecation warning · 38094227
  Renzo Lucioni committed Feb 10, 2016
  
  38094227 Browse Files
- ma-1881 handling empty translations and testing · 24c4c8ab
```
using lists for json serializability, if that's a word
```
  Sanford Student committed Feb 10, 2016
  24c4c8ab Browse Files
- Merge pull request #11502 from edx/peter-fogg/audit-cert-cutoff-date · 5d0ed333
```
Explicitly cut off cert eligibility.
```
  Peter Fogg committed Feb 10, 2016
  5d0ed333 Browse Files
- Merge pull request #11497 from openfun/openfun/fix_generate_course_structure · 85591696
```
Fix generate_course_structure command.
```
  Clinton Blackburn committed Feb 10, 2016
  85591696 Browse Files
- Split up package imports from single name imports · 1e74cd0c
  Calen Pennington committed Feb 10, 2016
  
  1e74cd0c Browse Files
- Retry the task to grant Programs credentials (which is idempotent) if any constituent program fails · 5c79e250
  Calen Pennington committed Feb 10, 2016
  
  5c79e250 Browse Files
- Retry Programs tasks when connection to the API is disabled · 22e91bcc
  Calen Pennington committed Feb 10, 2016
  
  22e91bcc Browse Files
- Retry failed Programs tasks using exponential backoff and a configurable retry limit · 36b0c593
  Calen Pennington committed Feb 10, 2016
  
  36b0c593 Browse Files