Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
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
rabiaiftikhar
3de758f631 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-01 15:07:04 +05:00
rabiaiftikhar
867bc9e316 get the course from CourseOverview table instead of Modulestore in certificates/signals.py. 2017-06-01 15:04:42 +05: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
rabiaiftikhar
755aad04f7 modify doc strings. 2017-05-30 15:52:11 +05: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
rabiaiftikhar
d71be1efcb Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-05-30 14:07:54 +05:00
rabiaiftikhar
59b0d80dce modify doc strings and method names. 2017-05-30 13:58:45 +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
Rabia Iftikhar
bdd5c5631f Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-05-28 20:08:49 +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
rabia23
c4823c5ed6 EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced. 2017-05-26 12:12:26 +05: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
Clinton Blackburn
800bcd8e20 Updated CredentialsApiConfig to pull URLs from settings 
Pulling URLs from settings allows us to rely on site configuration overrides in order to support multi-tenancy.

LEARNER-1103
 2017-05-25 13:30:43 -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
Andy Armstrong
f81c21902e Add isort to edx-platform 
LEARNER-1168
 2017-05-25 11:39:43 -04:00
Anthony Mangano
8bb56fa448 Merge pull request #15133 from edx/LEARNER-842-show-language-selector-in-lms-footer 
Learner 842 Add ability to show language selector in LMS footer
 2017-05-25 10:42:01 -04:00
Douglas Hall
8f95f799ac Allow for SiteConfiguration override of SOCIAL_SHARING_SETTINGS setting. 
WL-1052
 2017-05-24 20:24:14 -04:00
Anthony Mangano
0172ff315a add ability to show footer language selector on LMS 2017-05-24 16:41:45 -04:00
Douglas Cerna
1368091b01 Fixed styling issues on registration page 2017-05-24 01:47:07 -06:00
Renzo Lucioni
2955a6e639 Remove credential listing from program list view 
The new design for the program detail page introduced a sidebar which includes a program-specific listing of credentials. This is an improvement over the old list of credentials found on the program list page and is meant to replace it. The new detail page is stable, so the credential listing on the program list page can be removed.

LEARNER-492
 2017-05-22 16:07:37 -04:00