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

22621 Commits

Author SHA1 Message Date
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
Waheed Ahmed
b3fe397f9b Fix webcam not loading in safari. 
LEARNER-3758
 2018-01-09 15:25:36 +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
Nimisha Asthagiri
57f09e987f Delete unneeded Django Settings files 2018-01-05 15:04:10 -05:00
McKenzie Welter
82fb6e7ec0 course title link to course home when enrolled 2018-01-05 12:36:59 -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
Matthew Piatetsky
57c45c6453 Merge pull request #16969 from edx/LEARNER-3058 
LEARNER-3058 Move hero upsell to sidebar
 2018-01-04 14:48:18 -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
Nimisha Asthagiri
faecaf3316 Merge pull request #17088 from edx/arch/delete-dev-files 
Delete old development config files
 2018-01-04 09:23:57 -05:00
Daniel Clemente Laboreo
902f83c12b Add some blocks to course_about.html 2018-01-04 15:17:28 +02:00
Nimisha Asthagiri
ddfeb61b08 Delete old development config files 2018-01-03 17:26:09 -05:00
Matthew Piatetsky
277407f2a6 move course upsell 2018-01-03 13:51:55 -05:00
Michael Terry
66980b53cc Merge pull request #17060 from edx/mikix/ie-login-align 
Fix login box alignment in IE
 2018-01-03 08:51:10 -05:00
Noraiz Anwar
31fb4a1b19 Revert "temporary logs to check if anonymous user is accessing courseware" 2018-01-03 14:51:30 +05:00
noraiz-anwar
9d2fad7144 fix course staff ability to perform operations on instructor dashboard 2018-01-02 14:34:38 +05:00
Saleem Latif
26cc70a7bc Move enterprise specific code in student_account views to enterprise_support 2018-01-01 16:08:41 +05:00
Michael Terry
4e05d43345 Fix login box alignment in IE 
In IE 11, the login page form was being shown right-aligned on the
page. This is because of some IE interaction with margin: auto.
Removing that and relying on flexbox flow fixes it and makes the
form centered again.

LEARNER-3001
 2017-12-29 11:36:49 -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
Ayub khan
872f571baf Merge pull request #17045 from edx/update-translations-26-dec 
updated translations
 2017-12-27 21:53:21 +05:00
Michael Terry
dce5da581c Merge pull request #17032 from edx/mikix/LEARNER-3709 
Fix a11y issues on course dashboard
 2017-12-27 10:51:47 -05:00
rabia23
b22a656c53 EDUCATOR-1930 change log message position in set_score method 2017-12-27 13:28:49 +00:00
ayub-khan
f50af67f15 updated translations 2017-12-27 16:38:58 +05: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