Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
53,520 Commits 1 Branch 0 Tags
0c2dfd136eafaae88a71df4eecdcacc3845fca45
Commit Graph

53520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jillian Vogel
35d75daf00 Quality fix 2018-05-18 10:44:46 +09:30
Jillian Vogel
8b9b158adb Fixes test failures 
(cherry picked from commit 4af929fb8b)
 2018-05-18 09:33:23 +09:30
Jillian Vogel
37ed10103c Shows the account activation message in the main content area 
if HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED is enabled.

(cherry picked from commit 761acdfc6d)
 2018-05-18 09:33:16 +09:30
Jillian Vogel
306b49c36d Adds EMPTY_DASHBOARD_MESSAGE Site Configuration flag 
When set, displays the configured text/markup under "You are not enrolled in any courses yet."

Adjusts left/right padding on .empty-dashboard-message to keep our extra message from hitting the sides.

(cherry picked from commit e417c5f8c2)
 2018-05-18 09:33:09 +09:30
Jillian Vogel
d489ffe7ad Adds HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED 
Site Configuration and feature flag

When set, it hides the Courses list on the Learner Dashboard page if the
learner has not yet activated their account.

(cherry picked from commit 22ee400b15)
 2018-05-18 09:33:02 +09:30
Jillian Vogel
d585294f50 Shows the account activation message in the sidebar 
and removes the DISPLAY_ACCOUNT_ACTIVATION_MESSAGE_ON_SIDEBAR flag, since this
feature is now always on.

Marks the top banner as deprecated.

(cherry picked from commit b44114d171)
 2018-05-18 09:32:54 +09:30
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
Diana Huang
44dc169eca Display error message if account is inactive. 2018-05-17 11:47:37 -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
Troy Sankey
232b359258 Fixup! pivot to treating retired emails as banned forever 2018-05-16 16:44:02 -04:00
Troy Sankey
e9276ba246 Disallow registration when the proposed email is half-retired 
Our learner retirement implementation shall allow re-use of email
addresses, but we currently do not disallow re-use of emails for
learners whose retirement is still in-progress (i.e. their retirement
state is between PENDING and LMS_COMPLETE inclusive).

The time between a user initiating retirement, and the jenkins job
actually picking up the user and driving their account retirement might
be as long as 1 hour, so this is a serious concern.

Addresses EDUCATOR-2824.
 2018-05-16 16:44:02 -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
Jolyon Bloomfield
caedf6b444 Allow solutions to be displayed on showanswer=attempted if not attempted but past due 2018-05-16 12:56:42 -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
Jillian Vogel
841a68c808 Improves XBlock i18n by allowing template translations 
Bumps xblock-utils to v1.1.1
Bumps xblock-drag-and-drop-v2 to v2.1.6
 2018-05-15 09:37:53 +09:30
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