Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,854 Commits 1 Branch 0 Tags
5d087bfe73b2dcd683359d1d1cdcaa34bef97c73
Commit Graph

42854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Filler
5d087bfe73 Merge pull request #16163 from edx/bfiller/fix-dsc-banner 
Display banner if user declines data sharing consent
 2017-10-04 12:33:47 -04:00
Bill Filler
5268588980 Display banner if user declines data sharing consent 
Revert changes for getting enterprise customer from enteprise from
Enterprise API and update/add test.
Lookup the enterprise_customer_uuid based on the site and user if not
found through the cookie or request parameter.
 2017-10-04 11:27:16 -04:00
Clinton Blackburn
8a5782eb6e Updated Studio API to expose course run pacing type 
The pacing type can now be read and updated.

EDUCATOR-1464
 2017-10-04 10:16:45 -04:00
Brian Mesick
612c99ba3c Merge pull request #16130 from edx/bmedx/django-oauth-plus_PLAT-1743 
Change django-oauth-plus to use Github repo for Django 1.11 compat
 2017-10-03 16:51:31 -04:00
Nimisha Asthagiri
10171bbfd1 Merge pull request #16149 from edx/naa/grade-report 
Optimize grade reports for ZeroCourseGrades
 2017-10-03 16:39:31 -04:00
Andy Armstrong
ace9a4fc78 Merge pull request #16143 from edx/andya/verification-availability-message 
Display course home message for certificate availability
 2017-10-03 15:08:01 -04:00
Andy Armstrong
c13b531eeb Display course home message for certificate availability 
LEARNER-2182
 2017-10-03 14:06:11 -04:00
Douglas Hall
dafb07a706 Merge pull request #16151 from edx/douglashall/upgrade_enterprise_0_50_0 
Upgrade edx-enterprise to 0.50.0.
 2017-10-03 14:02:31 -04:00
Farhanah Sheets
3f929bdb75 Merge pull request #16141 from edx/fsheets/ora-update 
Version bump edx-ora2 2.1.2
 2017-10-03 13:52:26 -04:00
Troy Sankey
3036013388 Merge pull request #16150 from edx/pwnage101/remove-django.utils.unittest-PLAT-1551 
remove uses of django.util.unittest
 2017-10-03 13:46:21 -04:00
Douglas Hall
5481bbf53f Upgrade edx-enterprise to 0.50.0. 
https://github.com/edx/edx-enterprise/compare/0.48.2...0.50.0
 2017-10-03 12:12:56 -04:00
Troy Sankey
7f394cfce8 remove uses of django.util.unittest 
django.util.unittest was deprecated in django 1.7 and removed in 1.9.

PLAT-1551
 2017-10-03 11:51:28 -04:00
Clinton Blackburn
f4c08bbca1 Fixed Studio API bug with course team updates 
The org field is now set on the CourseAccessRole object, since Studio expects that value to be present.

LEARNER-2469
 2017-10-03 11:38:38 -04:00
Clinton Blackburn
5139b570ee Removed duplicated override of update_team method 
LEARNER-2469
 2017-10-03 11:38:38 -04:00
Nimisha Asthagiri
27229a1f9b Optimize grade reports for ZeroCourseGrades. 
EDUCATOR-558
 2017-10-03 11:35:32 -04:00
Nimisha Asthagiri
0b1d22f0b4 Merge pull request #16084 from edx/naa/grades-test-cleanup 
Grades: Clean up
 2017-10-03 11:33:21 -04:00
Harry Rein
0e6d9acece Merge pull request #16104 from edx/HarryRein/LEARNER-2236-remove-old-wells 
Remove old messaging wells.
 2017-10-03 11:29:13 -04:00
George Song
c18d911c68 Merge pull request #16102 from open-craft/clemente/twitter-url 
Encode share course URLs and use the right protocol
 2017-10-03 07:54:35 -07:00
Andy Armstrong
39671b8ea3 Merge pull request #16098 from edx/andya/course-dates-messaging 
Show course home messages for important course dates
 2017-10-02 19:12:25 -04:00
Nimisha Asthagiri
f8e3a3c461 Grades Cleanup 
EDUCATOR-1405
EDUCATOR-1451
 2017-10-02 19:03:26 -04:00
Nimisha Asthagiri
0de55de2a0 Grades: Clean up tests 
EDUCATOR-1404
 2017-10-02 19:01:38 -04:00
Diana Huang
7f4550387c Add eventing to course home upgrade paths. 2017-10-02 17:27:51 -04:00
Andy Armstrong
7dfe12a1f3 Show course home messages for important course dates 
LEARNER-2073
 2017-10-02 17:27:51 -04:00
Matthew Piatetsky
1aff33dcdd Merge pull request #16044 from edx/LEARNER-2546 
LEARNER-2546 Take users from track selection to course home instead of dashboard
 2017-10-02 17:03:56 -04:00
Farhanah Sheets
f338fafbe5 Update to latest ora2 release version 2017-10-02 16:18:58 -04:00
Feanil Patel
734d2a7a8b Merge pull request #16069 from open-craft/cliff/pb-v2.7.7 
Bump problem-builder requirement to 2.7.7.
 2017-10-02 15:34:39 -04:00
John Eskew
b3b5a5dbf6 Merge pull request #16140 from edx/jeskew/fix_xunit_pathing_for_common 
Fix saving of common/lib xunit test results.
 2017-10-02 15:34:00 -04:00
Matt Tuchfarber
085566b6e8 Merge pull request #16131 from edx/tuchfarber/bump_enterprise_version_wl_1240 
Bump enterprise to 0.48.2
 2017-10-02 14:48:58 -04:00
George Song
918416f03f Merge pull request #15992 from open-craft/jill/openstack-course-import-export 
Use django file storage URLs for all course export downloads.
 2017-10-02 11:37:52 -07:00
John Eskew
c17524d448 Fix saving of common/lib xunit test results. 2017-10-02 14:27:01 -04:00
bmedx
961c196219 Change django-oauth-plus to use Github repo for Django 1.11 compat 2017-10-02 13:53:26 -04:00
Matt Tuchfarber
9de5cbea12 Bump enterprise to 0.48.2 2017-10-02 13:40:31 -04:00
Brian Mesick
72c5d952db Merge pull request #16132 from edx/bmedx/upgrade_djpyfs_PLAT-1743 
Upgrade django-pyfs to 1.0.7
 2017-10-02 13:23:04 -04:00
Gabe Mulley
d509ae1da1 change verified cert image 2017-10-02 12:21:18 -04:00
Matthew Piatetsky
d394c05236 Take users from track selection to course home instead of dashboard 
LEARNER-2546
 2017-10-02 12:15:12 -04:00
Michael Frey
28575fb3cb Merge pull request #16137 from edx/mjfrey/enrollment-rate-limit 
increase staff user rate limit
 2017-10-02 09:56:56 -04:00
Brian Mesick
6fbea7f191 Merge pull request #16106 from edx/bmedx/raw_sql_dates_PLAT-1531 
Update raw sql that uses datetimes to be Django 1.9 compatible
 2017-10-02 09:29:50 -04:00
Michael Frey
3e24572664 increase staff user rate limit 2017-10-02 09:03:46 -04:00
John Eskew
9987c42022 Merge pull request #16039 from edx/jeskew/paver_calls_tox_to_run_pytest 
Paver changes to run tox testing for system & lib tests.
 2017-10-02 08:39:23 -04:00
Uzair Rasheed
0241081842 Merge pull request #16123 from edx/LEARNER-2620/remove-fb-sdk 
Remove fb-sdk from base.txt requirements
 2017-09-30 13:35:51 +05:00
McKenzie Welter
18d8cd965c Merge pull request #16088 from edx/McKenzieW/learner-1997 
Add 'Hours of Effort' to Spanish certificates template context
 2017-09-29 15:53:35 -04:00
Nimisha Asthagiri
8721dad500 Merge pull request #16083 from edx/naa/grades-remove-read-only 
Grades: remove read_only param and create method
 2017-09-29 14:50:43 -04:00
John Eskew
de887b0dd1 fixup! Remove cache dirs from commonlib testing. 2017-09-29 14:36:58 -04:00
McKenzie Welter
1fe76d7c01 calculated hours of effort for rendering cert template context 2017-09-29 14:26:16 -04:00
bmedx
0f411e9880 Upgrade django-pyfs to 1.0.7 2017-09-29 11:46:58 -04:00
bmedx
cfd77f61f6 Update raw sql that uses datetimes to be Django 1.9 compatible 2017-09-29 11:33:28 -04:00
John Eskew
5d1363b428 fixup! Enable tox testing of system and commonlib via paver. Add support for django_version option to support Django 1.8/1.11. 2017-09-29 10:39:51 -04:00
John Eskew
0ee412831f Include paver in tox env - a few tests use it. 2017-09-29 10:39:51 -04:00
John Eskew
bbae00a480 Enable tox testing of system and commonlib via paver. 
Add support for django_version option to support Django 1.8/1.11.
 2017-09-29 10:39:51 -04:00
John Eskew
dc7bd3dbbf Remove cache dirs from commonlib testing. 2017-09-29 10:39:51 -04:00