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

46247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Uman Shahzad
4f6d9e57d9 Merge pull request #18243 from edx/uman/bump 
[ENT-986] Update edx-enterprise to 0.68.6.
 2018-05-22 15:09:26 +05:00
irfanuddinahmad
2cd1b9d792 Merge pull request #18234 from edx/iahmad/ENT-988-Update-API-Terms-of-Service 
ENT-988 Update API Terms of Service
 2018-05-22 14:08:46 +05:00
Muhammad Ammar
c949b2222e Merge pull request #18232 from edx/ammar/ENT-989-update-api-request-form 
update api request form
 2018-05-22 14:07:46 +05:00
Uman Shahzad
244576bcb3 Update edx-enterprise to 0.68.6. 2018-05-22 13:41:58 +05:00
sanfordstudent
d4a338d4af Merge pull request #18113 from edx/sofiya/ed-2802-2 
EDUCATOR-2802 Different LMS api endpoint to finish GDPR retirement for the user
 2018-05-21 15:26:10 -04:00
J Eskew
572b8a0be4 Merge pull request #17670 from open-craft/MCKIN-7023-xblock-i18n-templates 
[MCKIN-7023] Improve XBlock i18n by allowing template translations
 2018-05-21 13:49:13 -04:00
Albert St. Aubin
1b72974fb8 Added credit as an option to change_enrollment command 2018-05-21 13:14:14 -04:00
Gabe Mulley
959ddaa98d Merge pull request #18181 from edx/mulby/ace-password-reset 
Use edx-ace for password reset emails
 2018-05-21 11:42:56 -04:00
Sofiya Semenova
cd18206167 EDUCATOR-2802: P2 gdpr endpoint 2018-05-21 11:12:54 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Tasawer Nawaz
b8daeb22ba Merge pull request #18239 from edx/tasawer/learner-5369/fix-error-concatenate-str-with-none 
Fix TypeError: cannot concatenate 'str' and 'NoneType' objects
 2018-05-21 18:46:37 +05:00
Tasawer Nawaz
b21fec305a fix TypeError: cannot concatenate 'str' and 'NoneType' objects 
LEARNER-5369
 2018-05-21 17:35:54 +05:00
irfanuddinahmad
741f75d7fe updated TOS 2018-05-21 15:00:57 +05:00
Jeremy Bowman
93809a8497 Merge pull request #18236 from edx/jmbowman/sure_upgrade 
Upgrades to avoid sure install bug
 2018-05-19 10:58:07 -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
Sofiya Semenova
175fbac261 Merge pull request #18235 from edx/sofiya/mgmt-name 
Changed comment in recalculate_learner_grades
 2018-05-18 15:56:05 -04:00
Troy Sankey
a7ecfe1cd3 Fixup! refactor email_exists, and handle many more cases 2018-05-18 15:34:35 -04:00
Jeremy Bowman
8d4a2e2be9 Upgrades to avoid sure install bug 2018-05-18 15:14:29 -04:00
Diana Huang
3b40787628 Merge pull request #18221 from edx/diana/activation-message 
LEARNER-5283: Display error message if account is inactive.
 2018-05-18 14:59:22 -04:00
Sofiya Semenova
1bb134b043 Changed comment in recalculate_learner_grades 2018-05-18 14:46:50 -04:00
Albert (AJ) St. Aubin
bac2ada0ed Merge pull request #18230 from open-craft/jill/empty-dashboard-message-rebase 
Learner Dashboard improvements to assist with the Account Activation process (rebased)
 2018-05-18 12:58:12 -04:00
Attiya Ishaque
a2db851ef2 Merge pull request #18228 from edx/ai/fixed-failing-firefox-tests 
Fixed tests that are flaky on fireFox 59.
 2018-05-18 21:51:53 +05:00
attiyaishaque
8dee3fda76 Fixed tests that are flaky on fireFox 59. 2018-05-18 19:32:11 +05:00
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
muhammad-ammar
ee63a7980b update api request form 
ENT-989
 2018-05-18 12:06:39 +05:00
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