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

16009 Commits

Author SHA1 Message Date
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
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
christopher lee
30c3a39de0 Fix throttle rate for 'staff' user 2018-05-17 11:15:27 -04:00
christopher lee
1310e2f132 Clean up enrollment rate limit waffles 
LEARNER-5038
 2018-05-16 12:57:46 -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
Tyler Hallada
e9a04939d9 Upgrade SFE, unscrollable body when modal is open. 2018-05-15 14:49:08 -04:00
Ahsan Ulhaq
795222adbc Unpublished course run displaying in entitlements 
LEARNER-5247
 2018-05-15 17:58:13 +05: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
John Eskew
fee875f2a9 PLAT-2115: Refuse password reset for retired user. 2018-05-14 12:24:36 -04:00
Matthew Piatetsky
b96037f35e Merge pull request #18178 from edx/mark_units_graded 
mark units as graded if subsection is graded
 2018-05-11 16:04:44 -04:00
Matthew Piatetsky
a394f23c12 mark units as graded if subsection is graded 2018-05-10 13:32:53 -04:00
Gabe Mulley
5fa6c51368 Revert "Use edx-ace for the password reset email" 2018-05-10 13:06:52 -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
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
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
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
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
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
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -04:00
Omar Al-Ithawi
556c8b86d0 Use edx-ace for password reset email 2018-05-08 18:53:31 +03: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
John Eskew
e5ee0fc91f Remove more unneeded 'namespace=' params. 2018-05-07 18:25:36 -04:00
Diana Huang
a06072c8d9 Bok Choy tests for account deletion workflow. 2018-05-07 15:37:24 -04:00
Jeremy Bowman
dd0180a33d TE-2545 Restrict AutoAuth for load tests 2018-05-07 15:00:48 -04:00
Alex Dusenbery
0b11634e4c Run make upgrade to get latest version of xblock-lti-consumer (and others). 2018-05-07 13:35:30 -04:00
Mushtaq Ali
f4b1da1f42 Merge pull request #17718 from edx/transcripts-phase-2 
Transcripts phase 2
 2018-05-07 12:42:50 +05:00
Anthony Mangano
07609e7d75 Add password_policy checks to login views 
LEARNER-4869
 2018-05-04 11:55:57 -04:00
attiyaishaque
0c4511b57d Fix that when usage key none is not raise error. 2018-05-04 12:29:25 +05:00
Douglas Hall
554f609ddf Merge pull request #18128 from edx/douglashall/update_course_discussion_settings 
Store Discussions ID Map on CourseDiscussionSettings model when course publish signal is fired.
 2018-05-03 18:09:56 -04:00
Douglas Hall
695b036282 Store Discussions ID Map on CourseDiscussionSettings model when course publish signal is fired. 2018-05-03 17:23:30 -04:00
John Eskew
ffb1f9fe2a Fix more Django 2.0 deprecation warnings around URLconfs. 2018-05-03 13:50:08 -04:00
Kabir Khan
c0f353467e V1 Grades API with added support for bulk read of all user grades in a course. 
URL patterns changed to follow edx API conventions
 2018-05-03 10:23:33 -07:00
Stu Young
7b76ab8a4d Merge pull request #18023 from edx/estute/TE-2427-reshard-lms4 
Reshard python unittests
 2018-05-03 11:53:32 -04:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
Farhanah Sheets
d19ba1b22a Merge pull request #18102 from edx/fsheets/sfe-bump 
Bump studio-frontend to v1.9.4 and fix bokchoy
 2018-05-03 10:12:40 -04:00