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

19868 Commits

Author SHA1 Message Date
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
 2017-05-30 12:42:54 -04:00
Qubad786
4c074f11cf Override video url with edx val encodings 2017-05-30 12:58:39 +05:00
Clinton Blackburn
74f9858b77 Optimized all imports in common.test.acceptance 
- Removed unused imports
- Ran isort to properly order/style imports
 2017-05-28 00:59:22 -04:00
Uman Shahzad
a41195377c Allow configurable activation email support link. 
This also serves as a slight refactor of ENT-392.
 2017-05-26 14:25:15 -04:00
Matt Drayer
ea195ff28a Merge pull request #15118 from edx/mattdrayer/hide-audit-enterprise 
ENT-405: Hide the audit option from track selection for certain enterprise scenarios
 2017-05-26 09:20:01 -04:00
John Eskew
e30e44cb9a Run isort on files touched in LicenseMixin move. 2017-05-25 16:24:57 -04:00
John Eskew
f1369b912e Move LicenseMixin and accompanying code to openedx/core/lib. 2017-05-25 16:17:31 -04:00
John Eskew
f97f052591 Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance 
Move fields.py, inheritance.py, and partitions to openedx/core.
 2017-05-25 14:21:03 -04:00
John Eskew
76389d8678 Run all files touched in inheritance/partition work through isort. 2017-05-25 13:24:08 -04:00
John Eskew
66f3aa5ccf Move fields.py, inheritance.py, and partitions to openedx/core. 2017-05-25 13:24:08 -04:00
Anthony Mangano
0172ff315a add ability to show footer language selector on LMS 2017-05-24 16:41:45 -04:00
Adam Palay
3b803085db make translated string unicode (EDUCATOR-460) 2017-05-23 13:13:56 -04:00
Saleem Latif
937f979327 Update account activation message on login page 2017-05-23 17:34:46 +05:00
Matt Drayer
5f5a44e062 Hide the audit option from track selection for certain enterprise use cases 2017-05-22 17:14:27 -04: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