Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
Jeremy Bowman
1a7753d775 PLAT-1881 Fix datetimes lacking timezone information 2018-01-10 14:33:01 -05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Waheed Ahmed
2406812100 Update program detail fragment url for mobile apps. 
LEARNER-3754
 2018-01-10 19:01:04 +05:00
Michael Terry
57ba9b2ac6 Remove deprecated enabled field 
The CertificateGenerationCourseSetting.enabled column is
deprecated. It is no longer referenced anywhere in the code, and
it's time to remove it.

Original code by Michael LoTurco.

LEARNER-2549
 2018-01-09 10:04:26 -05:00
Mushtaq Ali
5750495f86 Merge pull request #17052 from edx/show-transcripts-feature 
Show transcripts feature
 2018-01-09 19:29:47 +05:00
Qubad786
4f422e37d9 Refactor transcript upload handler to add language-overwrite support - EDUCATOR-2022 2018-01-09 17:03:45 +05:00
zubair-arbi
0b13d25b08 ENT-768 Display friendly error message for third party auth error 2018-01-09 16:57:14 +05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
Jeremy Bowman
7a69d2f771 Merge pull request #17116 from edx/jmbowman/PLAT-1873_1 
PLAT-1873 to_deprecated_string() cleanup part 1
 2018-01-08 17:02:44 -05:00
Braden MacDonald
a230cf3b5c Merge pull request #16741 from open-craft/tomaszgy/ignore_old_progress 
Ignore deprecated progress event for blocks with new Completion API.
 2018-01-08 13:10:52 -08:00
Jeremy Bowman
d3d6272d8f PLAT-1873 to_deprecated_string() cleanup part 1 2018-01-08 13:51:42 -05:00
Brian Mesick
e46c7fc516 Merge pull request #17096 from edx/bmedx/django111_lms_unit_1_failures 
Small fixes to LMS unit 1 failures in Django 1.11 tests
 2018-01-08 11:30:21 -05:00
bmedx
95e76dcafe Small fixes to LMS unit 1 failures in Django 1.11 tests 2018-01-08 10:20:30 -05:00
Ahsan Ul Haq
e7c869f87a Merge pull request #16951 from edx/ahsan/LEARNER-3393-rate-limited-access-token-view 
Rate limited /oauth2/access_token/
 2018-01-08 18:52:47 +05:00
Ahsan Ulhaq
1b2fdc058d Rate limited /oauth2/access_token/ 
There has been some reports about attack on /oauth2/access_token/.
This cause LMS to be down. This is being resolved by rate limiting the
endpoint.
LEARNER-3393
 2018-01-08 16:58:16 +05:00
Ammar Naqvi
fde830b73a Updated subsections grade percentage to start rounding 
Changed subsection gating on course outline to consider rounded off grade instead of absolute grade to decide whether to show a subsection which has a prerequisite or not.
EDUCATOR-1676
 2018-01-08 15:29:42 +05:00
Tomasz Gargas
3da19d0ea8 Ignore deprecated progress event for blocks with new Completion API. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-01-08 10:10:02 +01:00
Asad Iqbal
d894850513 Merge pull request #16950 from edx/asadiqbal08/ENT-772-Update-singin-UI 
ENT-772 - UI Updated to Support Ent Data Synchronization message
 2018-01-08 12:55:24 +05:00
asadiqbal
5d92b42fe3 UI Updates to Support Ent Data Synchronization 2018-01-05 17:16:02 +05:00
Albert St. Aubin
06c5d0c1a9 Corrected incorrect refund data in refund logic 
[LEARNER-3629]

This is the refactor logic for refunds. With the addition of
Course Entitlement Refunds shared refund logic was merged and tests were added.
 2018-01-04 15:31:33 -05:00
Albert (AJ) St. Aubin
e53013ec70 Revert "Refactor of the CourseEntitlement Refund API to handle refund failures" 2018-01-04 14:28:12 -05:00
sanfordstudent
d06ef04640 Merge pull request #17092 from edx/sstudent/EDUCATOR-2055 
EDUCATOR-2055: resolving error causing upgrades to verified to fail
 2018-01-04 12:50:41 -05:00
Sanford Student
38db15cbe9 EDUCATOR-2055: resolving error causing upgrades to verified to fail 2018-01-04 11:14:47 -05:00
Albert St. Aubin
417ef0583b Refactor of the CourseEntitlement Refund API to handle refund failures 
[LEARNER-3629]

The CourseEntitlement Refund API will not respond with ERROR codes when
the attempted refund call to Ecommerce fails.
 2018-01-04 11:02:13 -05:00
Noraiz Anwar
31fb4a1b19 Revert "temporary logs to check if anonymous user is accessing courseware" 2018-01-03 14:51:30 +05:00
Saleem Latif
26cc70a7bc Move enterprise specific code in student_account views to enterprise_support 2018-01-01 16:08:41 +05:00
Tasawer Nawaz
abf7b26b32 Exclude enterprise learners from the welcome email 
LEARNER-3649
 2017-12-28 15:49:45 +05:00
Uzair Rasheed
2fcd2830a0 Merge pull request #16993 from edx/LEARNER-3352/GA-event 
Send student course goal event to GA
 2017-12-28 13:59:29 +05:00
John Eskew
e67171b880 Merge pull request #16944 from edx/jmbowman/PLAT-1859 
PLAT-1859 Fix LMS shard 1 tests under Django 1.9
 2017-12-27 16:22:36 -05:00
John Eskew
523b46962c Merge pull request #17037 from edx/bmedx/django111_fix_teams_tests 
Fixes to teams tests in Django 1.9+
 2017-12-27 15:03:38 -05:00
Jeremy Bowman
1aebe11afc PLAT-1859 Fix LMS shard 1 tests under Django 1.9 2017-12-27 14:38:55 -05:00
John Eskew
c7671b75e5 Merge pull request #17036 from edx/jmbowman/PLAT-1863 
PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9
 2017-12-27 14:26:50 -05:00
bmedx
da0858bbdf Add fixes for shoppingcart and discussions test failures 2017-12-27 13:42:42 -05:00
bmedx
0f897a7b3f Fixes to teams tests in Django 1.9+ 
- add edx.org to lms tests KNOWN_HOSTS
- Don't check CourseTeamMembership field mutability on creation
 2017-12-27 13:42:42 -05:00
uzairr
72c834ed12 Send student course goal event to GA 
Ensure an event is fired whenever a student updates/creates
its course goal.'edx.course_goal.created' and 'edx.course_goal.updated'
should be sent after creation and updation respectively.

LEARNER-3352
 2017-12-27 23:09:30 +05:00
Sofiya Semenova
edbdb78902 Merge pull request #16943 from edx/sofiya/ora 
Educator-1280 Force grade persist on changed enrollment track
 2017-12-27 12:07:18 -05:00
rabia23
b22a656c53 EDUCATOR-1930 change log message position in set_score method 2017-12-27 13:28:49 +00:00
Gregory Martin
832a1f2e32 Merge pull request #16972 from edx/yro/add_discussions_tracking 
Add Forum Notifications Email Tracking
 2017-12-23 17:21:16 -05:00
Jeremy Bowman
bd9c7a082e PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9 2017-12-22 16:53:01 -05:00
Brian Mesick
4ceba7ad64 Merge branch 'master' into bmedx/django111_httpretty_0814 2017-12-22 16:25:25 -05:00
Jeremy Bowman
e98420dd8d Merge pull request #16979 from edx/jmbowman/PLAT-1861 
PLAT-1861 Upgrade to pyfilesystem2
 2017-12-22 15:48:48 -05:00
bmedx
6ece1708a6 Make sure httpretty usage cleans up after itself 2017-12-22 15:36:46 -05:00
bmedx
23503f5226 Fix test issues with new httpretty 2017-12-22 15:36:45 -05:00
Gregory Martin
455a13d1f5 Add Forum Notifications Email Tracking 2017-12-22 15:21:26 -05:00
Jeremy Bowman
65472399df PLAT-1861 Upgrade to pyfilesystem2 2017-12-22 14:44:24 -05:00
bmedx
b5d6fca44e Update is_authenticated patches to work with Django 1.10+ 2017-12-22 13:22:49 -05:00
Sofiya Semenova
dd93e67b5d Force regrade on enrollment track change. 2017-12-22 12:03:04 -05:00
bmedx
bc72c28a03 Remove unnecessary patches to User::is_authenticated 2017-12-22 11:33:35 -05:00
zubair-arbi
d7502acc5b ENT-768 
display friendly error message for saml rejection
 2017-12-22 15:12:11 +05:00
Muhammad Ammar
b6f45955f5 Merge pull request #15803 from open-craft/replaceafill/OC-2594 
Auto-advance video toggle
 2017-12-22 01:29:24 +05:00