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

16047 Commits

Author SHA1 Message Date
Calen Pennington
a16b8cc4b5 Clean up pylint failures 2018-05-29 12:28:19 -04:00
Calen Pennington
070dab2b81 Convert WordCloudMain to an es6 class 2018-05-29 12:28:19 -04:00
Calen Pennington
667dbf1687 Clean up eslint failures 2018-05-29 12:28:19 -04:00
Calen Pennington
61855b2b30 Extract a new webpack-based suite of cms javascript tests 2018-05-29 12:28:19 -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
2d7fdbcd97 Explicitly wait for the video editor to have opened when editing 2018-05-29 12:21:47 -04:00
Calen Pennington
d4bb203308 Log javascript errors during bok_choy tests 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
Calen Pennington
d08e199f79 Load XBlocks with webpack rather than RequireJS 2018-05-29 12:19:05 -04:00
Calen Pennington
94557900f8 Remove use of 'with' keyword from schematic.js 2018-05-29 12:19:05 -04:00
Calen Pennington
f7da1ba621 Use conditional blocks for webpack specific code edits 2018-05-29 12:19:05 -04:00
Calen Pennington
389f4fcec9 Switch container.js to bundle using webpack 2018-05-29 12:19:05 -04:00
edx-cache-uploader-bot
eff98b7707 Updating migrations 2018-05-29 10:23:28 -04:00
Qubad786
f9476ab4ff Update old transcripts metadata present in video xml with the new transcripts for backward compatibility. 2018-05-25 21:29:26 +05:00
Daniel Clemente Laboreo
6d3f8150db Implement generate_report_data for capa problems 2018-05-24 22:09:58 +03:00
Feanil Patel
8519a867e0 Merge pull request #18264 from edx/feanil/remove_flaky_entrance_exam_test 
Remove this flaky entrance exam test.
 2018-05-23 16:15:10 -04:00
Feanil Patel
8b25553590 Remove two flaky tests for the studio outline. 2018-05-23 15:02:18 -04:00
Feanil Patel
f2554fe15f Remove this flaky entrance exam test. 2018-05-23 15:00:49 -04:00
Michael Youngstrom
5d9431dc0d Remove flaky tests 2018-05-23 13:24:25 -04: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
Attiya Ishaque
5b48921f6d Merge pull request #18238 from edx/ai/fixed-failing-firefox-tests 
Fixed tests that are flaky on fireFox 59
 2018-05-22 22:43:52 +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
attiyaishaque
9039ece7ba Fixed tests that are flaky on fireFox 59 2018-05-22 16:58:49 +05: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
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
edx-cache-uploader-bot
118bc77372 Updating migrations 2018-05-18 09:15:48 -04:00
attiyaishaque
468f9e4212 Fixed tests that are flaky with firefox 59. 2018-05-18 13:27:04 +05: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
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