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

16230 Commits

Author SHA1 Message Date
Nimisha Asthagiri
1db7c23b61 Merge pull request #15253 from edx/ret/enable-optimizely-on-courseware 
Enable optimizely in courseware
 2017-06-06 17:36:57 -04:00
Nimisha Asthagiri
4c2bd153ec Enable optimizely on courseware 2017-06-06 16:01:24 -04:00
Adam
5e3d3727c1 Merge pull request #15168 from edx/adam/update-fail-task-command 
update fail old task command to fail in progress as well as queueing …
 2017-06-06 14:23:35 -04:00
Eric Fischer
3b1c842468 Merge pull request #15228 from edx/efischer/revert_temp_logging 
Revert "Merge pull request #15221 from edx/efischer/celery_logging"
 2017-06-06 13:42:29 -04:00
Diana Huang
27b2b0e949 Merge pull request #15143 from edx/andya/breadcrumb-improvements 
Improve course breadcrumbs
 2017-06-06 10:09:31 -04:00
sanfordstudent
62a2290bcf Merge pull request #15244 from edx/sstudent/educator-373 
Add batch size setting to instructor task
 2017-06-06 09:47:00 -04:00
Andy Armstrong
3cffded2d1 Improve course breadcrumbs 
LEARNER-877
 2017-06-05 18:06:05 -04:00
Sanford Student
c288ee7be0 adding model 2017-06-05 16:59:52 -04:00
Douglas Hall
0d9146a209 Merge pull request #15196 from open-craft/uman/OC-2662 
[ENT-370] Update Support Link on Sign In Page
 2017-06-05 11:59:58 -04:00
Uman Shahzad
13ac08a41f Allow configurable password reset support link. 
Defaults to SUPPORT_SITE_LINK intentionally.
Also fixed surrounding quality tests, and overall
quality improvements.
 2017-06-05 19:42:18 +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
Douglas Hall
94c50cbc30 Merge pull request #15177 from replaceafill/ENT-386 
[ENT-386] Styling Issues on new registration page
 2017-06-02 16:04:06 -04:00
Douglas Hall
214ff5c19b Merge pull request #15187 from open-craft/replaceafill/ENT-378 
[ENT-378] Remove code for custom header logo
 2017-06-02 16:03:09 -04:00
Kyle McCormick
3c470e6b9d Upgrade MathJax references from 2.7.0 to 2.7.1 2017-06-02 15:29:47 -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
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
Robert Raposa
b97af89fe8 Merge pull request #15159 from edx/robrap/LEARNER-881-course-waffle 
LEARNER-881: Per-course rollout configuration model
 2017-06-01 16:37:57 -04:00
Robert Raposa
eaab2cf444 Add course overrides of waffle flags. 2017-06-01 15:12:50 -04:00
Eric Fischer
1b9c36be87 Revert "Merge pull request #15229 from edx/efischer/celery_logging" 
This reverts commit e64c3a35ec, reversing
changes made to 867fac315f.
 2017-06-01 12:41:47 -04:00
Eric Fischer
01d7adf1f4 Revert "Merge pull request #15221 from edx/efischer/celery_logging" 
This reverts commit 81ef933d91, reversing
changes made to 4457856475.
 2017-06-01 12:41:40 -04:00
Eric Fischer
e64c3a35ec Merge pull request #15229 from edx/efischer/celery_logging 
More specific grade_course logging
 2017-06-01 12:41:01 -04:00
Eric Fischer
6880fa146b More specific grace_course logging 2017-06-01 11:43:28 -04:00
Douglas Cerna
de4691e35c Removed code associated with ENT-32 2017-06-01 09:34:47 -06:00
sanfordstudent
867fac315f Merge pull request #15198 from edx/sstudent/course-policy-event 
Sstudent/course policy event
 2017-06-01 10:28:32 -04:00
Eric Fischer
81ef933d91 Merge pull request #15221 from edx/efischer/celery_logging 
More celery logging
 2017-06-01 09:47:12 -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
Douglas Hall
02bbccd40d Merge pull request #15220 from edx/douglashall/fix_activation_email_support_link 
Fix the activation email support link in the dashboard sidebar
 2017-06-01 07:41:47 -04:00
Douglas Hall
0bf74f849e Fix the activation email support link in the dashboard sidebar 2017-05-31 20:18:02 -04:00
Braden MacDonald
c285b4f36d Merge pull request #15160 from open-craft/uman/OC-2665 
[ENT-381] Conform to WCAG 2 AA contrast minimums for Google OAuth.
 2017-05-31 15:33:24 -07:00
Eric Fischer
b69adbfcb2 More celery logging 2017-05-31 17:19:21 -04:00
AlasdairSwan
14692ae214 Merge pull request #15217 from edx/alasdair/LEARNER-923-support-tab-css-update-for-pl-pages 
LEARNER-923 Make Pattern Library support tabs transparent
 2017-05-31 16:22:40 -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
AlasdairSwan
c89714400f LEARNER-923 Make Pattern Library support tabs transparent 2017-05-31 15:25:46 -04:00
Alex Dusenbery
1a0e42af5e EDUCATOR-435 | Include enrollment status in in course and problem grade reports. 2017-05-31 15:13:51 -04:00
cahrens
106ac3a136 Change visibility to access. 
EDUCATOR-396
 2017-05-31 14:10:56 -04:00
Gregory Martin
79a2b6e245 Eventing for grading policy change 2017-05-31 14:07:14 -04:00
Jillian Vogel
6ca8a702ae Mask grades on progress page according to "Show Correctness" setting. 2017-05-31 16:57:38 +02:00
Gregory Martin
77b2229210 GradingPolicyChanged Signal Handler 
https://openedx.atlassian.net/browse/EDUCATOR-393
 2017-05-31 10:46:55 -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
Douglas Hall
d71a1d8887 Merge pull request #15038 from replaceafill/replaceafill/ENT-343 
[ENT-343] Add Terms of Service modal
 2017-05-30 10:38:50 -04:00
M. Rehan
b61a28dd75 Merge pull request #15197 from edx/mrehan/transcripts-upload-when-only-vid-id 
Override video url with edx val encodings
 2017-05-30 14:54:16 +05:00
Qubad786
4c074f11cf Override video url with edx val encodings 2017-05-30 12:58:39 +05:00
Uman Shahzad
84e428129a Conform to WCAG 2 AA contrast minimums for Google OAuth. 
Also apply variables for FB/Linkedin OAuth2 rather than
leave color hashes hanging around.
 2017-05-29 22:58:53 -04:00
Douglas Cerna
eaa02db6ae Added Terms of Service modal 2017-05-29 11:57:04 -06:00
attiyaishaque
7f3e4cb810 EDUCATOR-3 Check for course before using it. 2017-05-29 17:43:44 +05: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
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
Andy Armstrong
643d9eda7d Merge pull request #15191 from edx/andya/use-isort 
Add isort to edx-platform
 2017-05-25 14:51:52 -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