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

14739 Commits

Author SHA1 Message Date
Jesse Zoldak
b8ca90eaab Mark test_rescore_nonrescorable bok choy test as flaky 2017-06-06 12:18:28 -04:00
Jesse Zoldak
f843736a5e Mark test_can_reset_attempts test as flaky 2017-06-06 12:15:42 -04:00
Jesse Zoldak
f3498c5de8 Skip test_edit_course_wiki 2017-06-06 12:11:12 -04:00
Andy Armstrong
3cffded2d1 Improve course breadcrumbs 
LEARNER-877
 2017-06-05 18:06:05 -04:00
Clinton Blackburn
ab52966fdb Updated Enrollment API to always store enrollment attributes 
Enrollment attributes are now always stored, regardless of whether an enrollment is being created or updated. This will ensure that learners who purchase paid modes, without first enrolling in a non-paid mode, can request refunds if they choose to un-enroll from a course run within the refund window.

LEARNER-1282
 2017-06-05 11:04:57 -04:00
Uman Shahzad
e7e79c9b24 Correct activation email support link defaults in views.py 2017-06-05 00:34:39 +05:00
Robert Raposa
0f6b920c01 Merge pull request #15236 from edx/robrap/LEARNER-1279-fix-start-course 
LEARNER-1279: Revert: Course jump tos should go to the main course home page.
 2017-06-02 16:48:12 -04:00
Brandon Baker
4536667ac8 Merge pull request #15234 from edx/bbaker/fix-text-wrapping-IE11 
EDUCATOR-62 Fix question text wrapping in IE11
 2017-06-02 15:37:51 -04:00
Kyle McCormick
3c470e6b9d Upgrade MathJax references from 2.7.0 to 2.7.1 2017-06-02 15:29:47 -04:00
Harry Rein
bb23d05c61 Merge pull request #15185 from edx/HarryRein/LEARNER-859 
LEARNER-859: Updating styling on the course updates page
 2017-06-02 11:49:32 -04:00
Robert Raposa
7356054c18 Revert: Course jump tos should go to the main course home page. 
Revert commit: c14f0b14ea
 2017-06-02 10:57:43 -04:00
Christina Roberts
3b39aa49e0 Merge pull request #15230 from edx/christina/ed-511 
Mark test as flaky, and remove flaky from a fixed test.
 2017-06-02 10:32:32 -04:00
Brandon Baker
d2dc2a46c1 EDUCATOR-62 Fix question text wrapping in IE11 2017-06-02 12:36:54 +00:00
Harry Rein
6761a87bfb Fix for LEARNER-859: Updating styling on the course updates page to more clearly differentiate between multiple updates. Specifically: 
- Updated styling on date in the top left corner
- Added horizontal line between updates
- Removed ability to toggle updates on and off
- Cleaned up code to always show all updates:
 2017-06-01 16:43:09 -04:00
cahrens
c3eaaae565 Mark test as flaky, and remove flaky from a fixed test. 
EDUCATOR-511
 2017-06-01 15:19:39 -04:00
Robert Raposa
eaab2cf444 Add course overrides of waffle flags. 2017-06-01 15:12:50 -04:00
Tim Krones
4457856475 Merge pull request #15018 from open-craft/jill/mit-capa-progress-page 
Mask grades on progress page according to show_correctness setting
 2017-06-01 14:25:09 +02:00
Clinton Blackburn
6ff614800c Updated auto_auth endpoint to always return JSON 
Defaulting to a plaintext response makes no sense for an endpoint that is intended to be used by machines for testing. The endpoint now returns JSON only unless a redirect action is triggered.
 2017-05-31 23:18:05 -04:00
Christina Roberts
d2653b4b17 Merge pull request #15148 from edx/christina/ed-427-again 
Christina/ed 427 again
 2017-05-31 15:31:36 -04:00
cahrens
106ac3a136 Change visibility to access. 
EDUCATOR-396
 2017-05-31 14:10:56 -04:00
Jillian Vogel
6ca8a702ae Mask grades on progress page according to "Show Correctness" setting. 2017-05-31 16:57:38 +02:00
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