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

4355 Commits

Author SHA1 Message Date
Asad Iqbal
1a4ef62f15 Merge pull request #18256 from edx/asadiqbal08/ENT-692 
[ENT-692] Change the log level from Warning to Info
 2018-06-04 11:00:52 +05:00
asadiqbal
30db538e3a Change the log level to info 2018-05-31 19:43:11 +05:00
Ahsan Ul Haq
783aca5559 Merge pull request #17042 from raccoongang/dgamanenko/fix_username_missing_field 
Fix "admin/auth/user/add "username" missing field.
 2018-05-31 14:22:36 +05:00
Zia Fazal
b74cbfb85a Merge pull request #18255 from edx/ziafazal/WL-1388 
WL-1388: Added a base MessageType for ace
 2018-05-30 11:14:04 +05:00
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
6c8e0842cc Merge pull request #17509 from cpennington/switch-container-factory-to-webpack 
Switch container factory to webpack
 2018-05-29 14:27:38 -04:00
Calen Pennington
04a5d3c7c6 Wait for specific javascript variables rather than requirejs loading on the unit page 2018-05-29 12:21:47 -04:00
Calen Pennington
5474ec0a8f Wait for the sock to be ready as a proxy for the Studio header being ready 2018-05-29 12:21:47 -04:00
Calen Pennington
79cd02b001 Convert edit_tabs factory to webpack 2018-05-29 12:21:46 -04:00
Calen Pennington
ee6360543b Convert webpackified factories to es6 modules with global exports, and remove the invoke_page_factory pattern 2018-05-29 12:21:46 -04:00
Calen Pennington
f557bad5a3 Wait for MathJax for tests, rather than MathJax.isReady 2018-05-29 12:19:05 -04:00
Amir Qayyum Khan
2f7643f7d8 more reforting 2018-05-25 15:50:05 +05:00
Amir Qayyum Khan
594a7c4ac6 throwing exception when user has conflict with username or email 2018-05-25 15:50:05 +05:00
Amir Qayyum Khan
92e224f002 Fixed code to include special characters in username 2018-05-25 15:50:05 +05:00
Zia Fazal
f2ea2ca360 Added a base MessageType for ace 
added unit tests

updated edx-ace version

fixed quality violations

Fixed quality violations

Changed ACEMessageType to BaseMessageType
 2018-05-25 10:52:33 +05:00
Christopher Lee
ac6ddd8473 Merge pull request #18224 from edx/clee/addthrottletest 
Added enrollment API test for throttle rates
 2018-05-23 09:37:32 -04:00
Albert (AJ) St. Aubin
842afd5056 Merge pull request #18241 from edx/aj/LEARNER-5145 
Added credit as an option to change_enrollment command
 2018-05-22 08:43:40 -04:00
Albert St. Aubin
1b72974fb8 Added credit as an option to change_enrollment command 2018-05-21 13:14:14 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Troy Sankey
6872671436 Merge pull request #18136 from edx/pwnage101/registration-with-half-retired-user-email 
Disallow registration when the proposed email is retired
 2018-05-18 16:53:30 -04:00
christopher lee
2e3534019f Added enrollment API test for throttle rates 
LEARNER-5287
 2018-05-18 15:56:43 -04:00
Troy Sankey
a7ecfe1cd3 Fixup! refactor email_exists, and handle many more cases 2018-05-18 15:34:35 -04:00
Dmitry Gamanenko
7992d43009 Merge branch 'master' of https://github.com/edx/edx-platform into dgamanenko/fix_username_missing_field 2018-05-18 09:46:24 +03:00
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
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
1310e2f132 Clean up enrollment rate limit waffles 
LEARNER-5038
 2018-05-16 12:57:46 -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
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
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
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
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
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
John Eskew
e5ee0fc91f Remove more unneeded 'namespace=' params. 2018-05-07 18:25:36 -04:00