Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,130 Commits 1 Branch 0 Tags
2d4dd3750bf62d37282524db3aa91d4a4e4ed285
Commit Graph

46130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dusenbery
2d4dd3750b LEARNER-5123 | Hotfix - don't regrade everything for a user in a course with too many visible blocks. 2018-05-10 14:49:15 -04:00
Brian Mesick
4170b5d294 Merge pull request #18175 from edx/bmedx/sailthru_retirement_fixes 
Fix issues with Sailthru retirement
 2018-05-10 14:01:19 -04:00
Gabe Mulley
b97874f74a Merge pull request #18177 from edx/revert-16545-omar/fmo/multipart-email 
Revert "Use edx-ace for the password reset email"
 2018-05-10 13:45:30 -04:00
bmedx
1e6c6fca5c Fix issues with Sailthru retirement 2018-05-10 13:31:34 -04:00
Gabe Mulley
5fa6c51368 Revert "Use edx-ace for the password reset email" 2018-05-10 13:06:52 -04:00
Christopher Lee
55bcb0fa73 Merge pull request #18176 from edx/clee/throttlefix 
Clee/throttlefix
 2018-05-10 13:01:48 -04:00
christopher lee
3d27ff8d66 Fix incorrect rate limit settings 2018-05-10 12:04:34 -04:00
christopher lee
3a15df4e77 Revert "Clean up enrollment rate limit waffles" 
This reverts commit 813d59d091.
 2018-05-10 12:01:04 -04:00
Michael Youngstrom
4bc417dcd0 Merge pull request #18171 from edx/youngstrom/bump-lettuce 
Upgrade lettuce fork
 2018-05-10 11:31:59 -04:00
Gabe Mulley
7a5cecf3e9 Merge pull request #16545 from appsembler/omar/fmo/multipart-email 
Use edx-ace for the password reset email
 2018-05-10 11:31:43 -04:00
Sofiya Semenova
cb767d5bb2 Merge pull request #18169 from edx/sofiya/gdpr-testing 
Create GDPR test user management command fix for optional arguments
 2018-05-10 11:23:42 -04:00
Alex Dusenbery
08a961d60f EDUCATOR-2618 | Add more function_trace() to inline discussion view. 2018-05-10 10:14:38 -04:00
Michael Youngstrom
20d0626cb5 Upgrade lettuce and other dependencies 2018-05-10 09:48:00 -04:00
Nimisha Asthagiri
246ebc14c2 Merge pull request #18139 from edx/arch/update-oauth-scopes-doc 
Update OAuth decision 7: including organizations in tokens
 2018-05-10 09:29:58 -04:00
Albert (AJ) St. Aubin
1c3eee27e4 Merge pull request #18173 from edx/aj/LEARNER-5123_2 
Correction for incorrect conditional error logic and wrong channel
 2018-05-10 08:57:40 -04:00
Albert St. Aubin
fade1fb3f1 Correction for incorrect conditional error logic and wrong channel 
[LEARNER-5123]
 2018-05-10 07:51:48 -04:00
Uman Shahzad
bfe62d4871 Merge pull request #18165 from edx/uman/update-requirements 
[ENT-872] Update requirements.
 2018-05-10 14:27:32 +05:00
Uman Shahzad
251454d846 Update requirements. 2018-05-10 13:52:46 +05:00
Nimisha Asthagiri
e43f6370f7 Update OAuth decision 7: including organizations in tokens 2018-05-09 21:03:26 -04:00
Sofiya Semenova
5dcd77ff93 Create GDPR test user management command fix for optional arguments 2018-05-09 16:53:05 -04:00
Alex Dusenbery
ea4d43e175 Remove flaky test_progress_page_has_view_certificate_button test. 2018-05-09 16:00:37 -04:00
Christopher Lee
b272a2b588 Merge pull request #18163 from edx/clee/LEARNER-5038-cleanup 
Clean up enrollment rate limit waffles
 2018-05-09 15:47:51 -04:00
Feanil Patel
1cfbf353e9 Merge pull request #18167 from edx/feanil/remove_flaky 
Remove flaky tests.
 2018-05-09 15:21:14 -04:00
Brian Mesick
091cf1cdc8 Merge pull request #18162 from edx/bmedx/retirement_bugfixes 
Fix issues with retirement state population and unenrollment
 2018-05-09 14:41:25 -04:00
Feanil Patel
b1fda7ebdb Remove flaky tests. 2018-05-09 14:29:46 -04:00
Eric Fischer
64cd496fd7 Merge pull request #18164 from edx/efischer/revert_it_again_sam 
Revert "Merge pull request #18150 from edx/efischer/last_one_i_swear"
 2018-05-09 12:31:20 -04:00
Eric Fischer
f7a66eab78 Revert "Merge pull request #18150 from edx/efischer/last_one_i_swear" 
This reverts commit fcef6b3f47, reversing
changes made to 0b11634e4c.
 2018-05-09 11:53:56 -04:00
christopher lee
813d59d091 Clean up enrollment rate limit waffles 
LEARNER-5038
 2018-05-09 11:38:50 -04:00
bmedx
01ebe1e26e Fix issues with retirement state population and unenrollment 
- Prevent RetirementState state_execution_order collisions when updating
- Add slash to end of unenroll API endpoint to match other retirement endpoints
 2018-05-09 10:40:00 -04:00
Muhammad Ammar
6b29c6b920 Merge pull request #18161 from edx/ammar/EDUCATOR-2857 
download correct transcript content file
 2018-05-09 19:38:12 +05:00
Albert (AJ) St. Aubin
bfdcc49401 Merge pull request #18159 from edx/aj/LEARNER-5123_2 
Correctly passing course key in the JSON object to async
 2018-05-09 10:28:35 -04:00
Albert St. Aubin
4e0b3d3b2e Correctly passing course key in the JSON object to async 
[LEARNER-5123]
 2018-05-09 09:57:27 -04:00
Diana Huang
d768c77c7a Merge pull request #18123 from edx/diana/button-bokchoy-tests 
Bok choy tests for the account deletion flow
 2018-05-09 09:46:31 -04:00
muhammad-ammar
16e3d11354 download correct transcript content file 
EDUCATOR-2857
 2018-05-09 18:10:09 +05:00
Sofiya Semenova
879ba582cc Merge pull request #18130 from edx/sofiya/gdpr-testing 
EDUCATOR-2822 | Management command to create GDPR test user
 2018-05-08 16:54:10 -04:00
J Eskew
edbdae9fb8 Merge pull request #18124 from edx/jeskew/fix_some_django20_deprecation_warnings 
Fix more Django 2.0 deprecation warnings around URLconfs.
 2018-05-08 16:29:12 -04:00
Sofiya Semenova
403b67198a Management command to create GDPR test user 2018-05-08 16:04:01 -04:00
Douglas Hall
e4f598e99f Merge pull request #18152 from edx/douglashall/django-rest-swagger 
Add API documentation with django-rest-swagger.
 2018-05-08 15:12:46 -04:00
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -04:00
mduboseedx
ab43de112b Merge pull request #18155 from OmarIthawi/patch-1 
Use my personal email instead of QRF's
 2018-05-08 14:10:38 -04:00
Eric Fischer
b1316290dc Merge pull request #17738 from caesar2164/encode-sysadmin-staffing-profile-name-upstream 
Encodes staff profile names as they can be unicode
 2018-05-08 13:59:34 -04:00
Omar Al-Ithawi
3a64dad8cf Upgrade requirements to use edx-ace==0.1.7 2018-05-08 19:18:37 +03:00
Omar Al-Ithawi
556c8b86d0 Use edx-ace for password reset email 2018-05-08 18:53:31 +03:00
Farhanah Sheets
330ca36d16 Merge pull request #18147 from edx/efischer/sfe_198 
updates studio-frontend to 1.9.9
 2018-05-08 11:50:51 -04:00
Attiya Ishaque
494105f12d Merge pull request #18143 from edx/ai/EDUCATOR-2825-course-outline 
Fix inconsistency progress between Unit and Course Outline.
 2018-05-08 20:43:07 +05:00
Eric Fischer
2a2b5181ab updates studio-frontend to 1.9.9 and fix tests 2018-05-08 11:10:31 -04:00
Jeremy Bowman
f32b35427a Merge pull request #18153 from edx/jmbowman/TE-2545 
TE-2545 Restrict AutoAuth for load tests
 2018-05-08 10:10:47 -04:00
Albert St. Aubin
787653e793 Moving the update course and subsection grades to async task 
[LEARNER-5123]

The update course and subsection grades method was causing a DB lock
on other requsets.  This should be performed in the background and given
its own async task.
 2018-05-08 09:43:12 -04:00
attiyaishaque
b8fdc2ce05 Fix inconsistency progress between Unit and Course Outline. 2018-05-08 12:28:39 +05:00
Saleem Latif
2daaea9744 Merge pull request #18141 from edx/saleem-latif/ENT-965 
ENT-965: Upgraded edx-enterprise version from 0.67.7 to 0.67.8
 2018-05-08 11:01:51 +05:00