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

14704 Commits

Author SHA1 Message Date
Saleem Latif
937f979327 Update account activation message on login page 2017-05-23 17:34:46 +05:00
Saleem Latif
727dd9f90b Success Message for Account Activation for logged out users. 2017-05-22 16:38:47 +05:00
Saleem Latif
30eba50b79 Success Message for Account Activation for logged in users 2017-05-19 20:42:40 +05:00
sanfordstudent
3278fcf1d6 Merge pull request #15045 from edx/neem/handle_unrescorable 
400 for non-rescorable blocks
 2017-05-16 10:36:33 -04:00
Sanford Student
8cfff9a883 400 for non-rescorable blocks 2017-05-16 09:45:37 -04:00
Attiya Ishaque
0b098ef274 Merge pull request #15124 from edx/ai/EDUCATOR-312-remove-flaky 
EDUCATOR-312 Remove flaky decorator from test_timed_exam_flow.
 2017-05-16 17:55:47 +05:00
attiyaishaque
5d3cbc76d1 EDUCATOR-312 Remove flaky decorator from test_timed_exam_flow. 2017-05-16 14:31:57 +05:00
attiyaishaque
6ee2c9543c EDUCATOR-278 Remove flaky decorator from test_can_reset_attempts. 2017-05-15 20:07:08 +05:00
Calen Pennington
fe7c9a1476 Merge pull request #15087 from cpennington/cale/capture-lang-pref-on-login 
Capture the language preference set by an anonymous user when the reg…
 2017-05-15 08:59:44 -04:00
Muzaffar yousaf
067e33e6a6 Merge pull request #14838 from OmarIthawi/omar/video-player-fullscreen-rtl 
Fix RTL video player and subtitles misplacement in full screen
 2017-05-15 16:55:59 +05:00
Calen Pennington
c9f6872be3 Capture the language preference set by an anonymous user when the register or login 
[LEARNER-168]
 2017-05-15 07:36:56 -04:00
asadiqbal
8fc31b42e3 ENT-374 Support ticket is created without enterprise tags for Anonymous users. 2017-05-15 13:24:45 +05:00
J. Cliff Dyer
c61f2ddc69 Update xblock requirement to 1.0.0. 2017-05-12 14:51:02 -04:00
Brian Jacobel
9c6d94ada0 Require and Webpack can eat the same files 2017-05-12 14:40:31 -04:00
Brian Jacobel
480a3ca60b Move course import JS to Webpack 2017-05-12 14:40:31 -04:00
Brittney Exline
69d85dc103 Merge pull request #14985 from open-craft/jill/update-registration-login 
ENT-332/ENT-333 Updates Register and Login as per new design
 2017-05-12 11:07:10 -04:00
Renzo Lucioni
78a9b1f0ae Remove use of read_cached_programs switch 
The read_cached_programs switch was used to control the release of changes for reading programs exclusively from the cache. With those changes stable, the switch is no longer necessary.

LEARNER-382
 2017-05-12 11:06:08 -04:00
Jillian Vogel
71ba54a963 Updates combined Register, Login, and Password Reset views as per new design 
* Reorders form fields, and updates labels, placeholders, and tip text
* Increases clickable area for links and labels.
* Removes "*" markers from required fields, and instead adds
  "(optional)" labels to visible optional fields.
* Updates font colors and sizes, and removes box shadows
* Adds custom drop-down styles
* Improves responsive design scaling for small screens
* Make Terms of Service and Honor Code open in new window to avoid losing form
  field values.
 2017-05-12 09:18:36 -04:00
Alex Dusenbery
b33a9436d6 TNL-6832 | Include inactive enrollees in course and problem grade reports. 2017-05-11 13:10:38 -04:00
attiyaishaque
9188dbdb47 EDUCATOR-283 Old mathjax not load in preview box. 2017-05-11 15:02:17 +05:00
Nimisha Asthagiri
424d3b40bf Merge pull request #15089 from edx/neem/redo_bulk_grades 
Redo Bulk-reads and Request caching in Course Grade Reports
 2017-05-10 18:12:19 -04:00
Andy Armstrong
482f76527e Merge pull request #15064 from edx/andya/welcome-message 
Show a welcome message on the course home page
 2017-05-10 17:40:25 -04:00
Nimisha Asthagiri
adb88e21f3 Bulk-reads and Request caching in Course Grade Report 
This reverts commit 5388d5d1fc.
 2017-05-10 17:14:29 -04:00
Andy Armstrong
64de44321b Show a welcome message on the course home page 
LEARNER-879
 2017-05-10 16:53:15 -04:00
edx-pipeline-bot
544d5d5996 Merge pull request #15085 from edx/release-mergeback-to-master 
Merge release back to master
 2017-05-10 15:19:09 -04:00
Douglas Hall
665ec6c475 Allow override of initial account activation from address. 
In PR #15030, we missed adding the override of the initial account activation from address using the ACTIVATION_EMAIL_FROM_ADDRESS SiteConfiguration setting. We had only added the override when a subsequent activation email was sent.

ENT-318
 2017-05-10 13:44:19 -04:00
attiyaishaque
377283a353 EDUCATOR-293 Remove flaky decorator from test_proctored_exam_flow. 2017-05-10 21:32:18 +05:00
Carol Tong
f3153651d2 Merge pull request #15072 from edx/carol/DOC-3411Help 
DOC-3411 Update lms_config.ini: instructor dashboard Help landing page
 2017-05-10 11:45:22 -04:00
Diana Huang
208cffd64d Merge pull request #15075 from edx/diana/reverse-back-arrow-rtl 
Swap direction of arrow for RTL.
 2017-05-10 11:07:00 -04:00
Carol Tong
9442a2629c DOC-3411 Update lms_config.ini for instr dash landing page 2017-05-10 10:58:41 -04:00
Sanford Student
5388d5d1fc Revert "Bulk-reads and Request caching in Course Grade Report" 
This reverts commit 16e9636513.
 2017-05-09 16:25:46 -04:00
Douglas Hall
0a313da601 Remove edx.org theme override of activation email body. 
We have standardized the activation email in the base activation email body template, so we do not need this override any longer.

ENT-318
 2017-05-09 15:46:10 -04:00
Diana Huang
9cd819808d Swap direction of arrow for RTL. 2017-05-09 14:40:34 -04:00
Nimisha Asthagiri
3491837e9c Merge pull request #15036 from edx/neem/bulk-read-grade-report 
Bulk-reads and Request caching in Course Grade Report
 2017-05-09 10:53:01 -04:00
Nimisha Asthagiri
16e9636513 Bulk-reads and Request caching in Course Grade Report 2017-05-09 08:58:49 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Brandon DeRosier
3d51bd0817 Merge pull request #15022 from open-craft/bdero/ent-361 
ENT-361: Allow hiding of IDP selection page during SSO
 2017-05-05 15:10:35 -04:00
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
Andy Armstrong
97c084514f Merge pull request #15044 from edx/bjacobel/mako-bundle-nonfatal 
Mako should be able to render even if webpack hasn't run
 2017-05-04 17:55:40 -04:00
Andy Armstrong
70f4bcc619 Merge pull request #15040 from edx/andya/feature-test-coverage 
Make tests and coverage work with openedx/features
 2017-05-04 17:52:12 -04:00
Brian Jacobel
69dd20ffed Mako should be able to render even if webpack hasn't run 2017-05-04 12:56:21 -04:00
Matt Drayer
5097bd6e54 mattdrayer/ENT-328: Update account activation message on sign-in form. 2017-05-04 10:58:42 -04:00
Andy Armstrong
2e8c68e609 Make tests and coverage work with openedx/features 2017-05-04 09:28:16 -04:00
Robert Raposa
963519b86f Merge pull request #15032 from edx/robrap/TNL-6906-mark-flaky 
Mark test_proctored_exam_flow as flaky.
 2017-05-04 09:14:34 -04:00
Muzaffar yousaf
2f293ccc68 Merge pull request #14901 from OmarIthawi/omar/commentable-id-unicode 
Unicode fixes for django_comment_client and request_cached decorator
 2017-05-04 15:07:22 +05:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
Robert Raposa
a47e1a84de Mark test_proctored_exam_flow as flaky. 2017-05-03 15:57:23 -04:00
Robert Raposa
3b31270e07 Fix Start Course vs Resume Course using Course Blocks. 2017-05-03 15:02:42 -04:00
Asad Iqbal
4a4f135f47 Merge pull request #14989 from edx/asadiqbal08/ENT-342 
asadiqbal08/Logged in user may not have access rights for catalogs api endpoint
 2017-05-03 23:02:10 +05:00
Albert (AJ) St. Aubin
185bac1837 Merge pull request #15012 from edx/aj/EDUCATOR-60 
Updated the message and style of the status notification when a user …
 2017-05-03 13:29:03 -04:00