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

46211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
9d29cd92ce Merge pull request #18233 from edx/testeng/bokchoy_auto_cache_update_918342a50c7f8aed7cff72065c3f26ea0c499e08 
Bokchoy db cache update
 2018-05-18 09:46:36 -04:00
edx-cache-uploader-bot
118bc77372 Updating migrations 2018-05-18 09:15:48 -04:00
Asad Iqbal
2075f52d13 Merge pull request #18220 from edx/asadiqbal08/enterprise-version-bump-0.68.5 
Enterprise version bump to 0.68.5
 2018-05-18 14:42:28 +05:00
asadiqbal
2d037d3dc7 version bump enterprise 2018-05-18 14:06:23 +05:00
Attiya Ishaque
6fa2e462b3 Merge pull request #18218 from edx/ai/fixed-failing-tests 
Fixed tests that are flaky with firefox 59.
 2018-05-18 13:59:35 +05:00
attiyaishaque
468f9e4212 Fixed tests that are flaky with firefox 59. 2018-05-18 13:27:04 +05:00
Michael Youngstrom
1200cfb10c Merge pull request #18227 from edx/revert-15464-jill/empty-dashboard-message 
Revert "Learner Dashboard improvements to assist with the Account Activation process"
 2018-05-17 16:00:39 -04:00
Michael Youngstrom
e8f6d20119 Revert "Learner Dashboard improvements to assist with the Account Activation process" 2018-05-17 14:55:35 -04:00
edx-pipeline-bot
1250f41e85 Merge pull request #18225 from edx/release-mergeback-to-master 
Merge release back to master
 2018-05-17 14:15:25 -04:00
Albert (AJ) St. Aubin
1bb20d2922 Merge pull request #15464 from open-craft/jill/empty-dashboard-message 
Learner Dashboard improvements to assist with the Account Activation process
 2018-05-17 12:45:02 -04:00
Feanil Patel
78e873c29d Merge pull request #18222 from edx/clee/throttlecat1 
Fix throttle rate for 'staff' user
 2018-05-17 11:45:45 -04:00
christopher lee
30c3a39de0 Fix throttle rate for 'staff' user 2018-05-17 11:15:27 -04:00
Christopher Lee
ccd966a53c Merge pull request #18212 from edx/clee/remove-throttle 
Clean up enrollment rate limit waffles
 2018-05-16 16:42:13 -04:00
Feanil Patel
fca9ac10bc Merge pull request #18214 from edx/feanil/make_upgrade 
Upgrade using pip-tools.
 2018-05-16 16:27:31 -04:00
Feanil Patel
e718ab0260 Upgrade using pip-tools. 2018-05-16 14:50:16 -04:00
sanfordstudent
c10c91f95b Merge pull request #18211 from edx/sstudent/upgrade_wiki 
upgrade django-wiki
 2018-05-16 14:03:01 -04:00
Sanford Student
b89eba07e2 upgrade django-wiki 2018-05-16 13:26:03 -04:00
christopher lee
1310e2f132 Clean up enrollment rate limit waffles 
LEARNER-5038
 2018-05-16 12:57:46 -04:00
Diana Huang
e8604ac3bd Merge pull request #18202 from edx/diana/deletion-oauth 
LEARNER-5039: Add a warning message when there are social auth links connected.
 2018-05-16 12:06:27 -04:00
Alex Dusenbery
9bbd424a7d Make recalculate_course_and_subsection_grades_for_user task logged. 2018-05-16 11:34:53 -04:00
Jae Bradley
ce7b0df687 Merge pull request #18210 from edx/LEARNER-5286-delete-user-cookies-when-retiring-user 
LEARNER-5286: Remove cookies when retiring user
 2018-05-16 11:26:23 -04:00
Diana Huang
b2c9b50de1 Add a warning message when there are social auth links connected. 2018-05-16 10:59:33 -04:00
jaebradley
4045eee57d Remove cookies when retiring user 2018-05-16 10:20:32 -04:00
Brian Mesick
48bff77b45 Merge pull request #18206 from edx/bmedx/fix_forum_retirement_404 
Bubble up 404s from the forum service on user retirement
 2018-05-15 21:48:44 -04:00
bmedx
23023203e5 Bubble up 404s from the forum service on user retirement 2018-05-15 17:49:06 -04:00
Tyler Hallada
8cf77f2382 Merge pull request #18205 from edx/thallada/sfe-modal-improvements 
Upgrade SFE, unscrollable body when modal is open.
 2018-05-15 16:40:49 -04:00
Sofiya Semenova
34129e2464 Merge pull request #18194 from edx/sofiya/ed-2893 
Management command to force enrollment regrade
 2018-05-15 16:03:41 -04:00
Sofiya Semenova
2baadff28c Management command to force enrollment regrade 2018-05-15 15:11:32 -04:00
Sofiya Semenova
6e55d27248 Merge pull request #18204 from edx/sofiya/management 
Create GDPR test user command fix for password and meta
 2018-05-15 14:56:52 -04:00
Tyler Hallada
e9a04939d9 Upgrade SFE, unscrollable body when modal is open. 2018-05-15 14:49:08 -04:00
J Eskew
55930dce62 Merge pull request #18203 from edx/jeskew/forums_retirement_username_fix 
Pass retired_username to forums retirement endpoint.
 2018-05-15 14:36:11 -04:00
Sofiya Semenova
057122b482 Create GDPR test user command fix for password and meta 2018-05-15 14:04:53 -04:00
John Eskew
e82fe8290d Pass retired_username to forums retirement endpoint instead of original username. 2018-05-15 11:55:31 -04:00
AlasdairSwan
f045cddd61 Merge pull request #18193 from edx/alasdair/LEARNER-5273-cookie-banner-mobile-layout-fix 
LEARNER-5273 Update how the mobile menu interacts with the cookie pol…
 2018-05-15 11:38:59 -04:00
Matt Tuchfarber
c5541eb548 Merge pull request #18201 from edx/tuchfarber/program_marketing_newest_course_run 
Fix program marketing to use newest course run
 2018-05-15 11:16:17 -04:00
AlasdairSwan
5f821ef6d7 LEARNER-5273 Update how the mobile menu interacts with the cookie policy banner 2018-05-15 11:11:44 -04:00
Matt Tuchfarber
20fdcc8d77 Fix program marketing to use newest course run 2018-05-15 10:36:54 -04:00
Asad Iqbal
f040897812 Merge pull request #18198 from edx/asadiqbal08/enterprise-version-bump 
Enterprise version bump to 0.68.3
 2018-05-15 19:10:17 +05:00
asadiqbal
b153b9e8f6 enterprise version bump 2018-05-15 18:59:19 +05:00
Ahsan Ul Haq
95b70399e3 Merge pull request #18174 from edx/ahsan/LEARNER-5247-deleted-studio-instance-showing-in-entitlement 
Unpublished course run displaying in entitlements
 2018-05-15 18:54:45 +05:00
Ahsan Ulhaq
795222adbc Unpublished course run displaying in entitlements 
LEARNER-5247
 2018-05-15 17:58:13 +05:00
edx-pipeline-bot
e7439e8d12 Merge pull request #18195 from edx/release-mergeback-to-master 
Merge release back to master
 2018-05-14 18:00:03 -04:00
J Eskew
ed8359b84b Merge pull request #18196 from edx/jeskew/add_model_for_retired_user_requests 
Add migrations missing from previous PR.
 2018-05-14 17:31:52 -04:00
Alex Dusenbery
330fc8ae49 Merge branch 'master' into release-mergeback-to-master 2018-05-14 17:01:50 -04:00
John Eskew
3529e0779f Add migrations missing from previous PR. 2018-05-14 16:40:17 -04:00
Gabe Mulley
dec2dfa0fe Merge pull request #17754 from edx/mulby/email-send-noninteraction 
mark email sent events as non-interactions
 2018-05-14 16:15:37 -04:00
Brittney Exline
5dc13d067d Merge pull request #18191 from edx/bexline/fix_cert_generation 
LEARNER-5185 Fix bug in cert generation for passing users who become approved
 2018-05-14 12:06:06 -06:00
Alex Dusenbery
ef477ee2a4 LEARNER-5123 | Cache VisibleBlocks per course AND user, only fetch the ones the user needs for subsection scoring. 2018-05-14 13:44:56 -04:00
Gabe Mulley
83b24e0453 fix broken test 2018-05-14 13:21:49 -04:00
J Eskew
62865599c7 Merge pull request #18154 from edx/jeskew/add_model_for_retired_users 
Refuse password reset for retired users.
 2018-05-14 13:02:53 -04:00