Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
44,462 Commits 1 Branch 0 Tags
95e76dcafe945b62dc7bbaebde1a32434002464a
Commit Graph

44462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ayub-khan
761db165b5 LEARNER-925 - Allow user to get program certificate if enrolled as verified in credit course 2017-06-06 01:14:52 +05:00
cahrens
3abc7dc07e isort updates 2017-06-05 13:47:48 -04:00
cahrens
e1916eb973 AutoAuthPage moved. 2017-06-05 13:28:24 -04:00
cahrens
36c51450c2 Adds in radio button patch request and text for page 
EDUCATOR-229
 2017-06-05 13:00:31 -04:00
cahrens
79c5137a68 Bok choy tests for division scheme. 
EDUCATOR-424
 2017-06-05 12:59:51 -04:00
Albert St. Aubin
c23c0b991b EDUCATOR-141: Moved the Discussions Mgt to its own tab and updated tests 2017-06-05 12:59:51 -04:00
cahrens
8951ac8c61 Refactor server-size code to enable enrollment tracks. 
EDUCATOR-11
 2017-06-05 12:59:50 -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
Robert Raposa
c140ef32fa Merge pull request #15240 from edx/robrap/LEARNER-1101-best-practices 
LEARNER-1101: Add best practice doc for course overview/course blocks.
 2017-06-05 11:37:51 -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
Robert Raposa
f95c30af7a Merge pull request #15242 from edx/robrap/lower-thresholds 
Lower safe lint thresholds.
 2017-06-05 10:50:09 -04:00
Robert Raposa
4a1111df8f Add best practice doc for course overview/course blocks. 2017-06-05 10:48:09 -04:00
Eric Fischer
3ddb74540b Merge pull request #15239 from edx/efischer/celery_utils_0.1.4 
Bump edx-celeryutils to 0.1.4
 2017-06-05 10:45:27 -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
Douglas Hall
1c7e435407 Merge pull request #15241 from open-craft/uman/fix_activation_email_default 
Correct activation email support link defaults in views.py
 2017-06-05 10:11:30 -04:00
Robert Raposa
7e0215a13e Lower safe lint thresholds. 2017-06-05 09:11:25 -04:00
M. Rehan
9b18469d54 Merge pull request #15235 from edx/mrehan/bump-lti-consumer-xblock 
bump LTI Consumer XBlock to latest version
 2017-06-05 15:08:33 +05:00
Qubad786
f5e01d4959 bump LTI Consumer XBlock to latest version 2017-06-05 12:55:44 +05: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
Eric Fischer
9b00e43150 Merge pull request #15238 from edx/efischer/ora_update 
update ORA2 to 1.4.1
 2017-06-02 16:12:42 -04:00
Eric Fischer
3acd9674f0 Bump edx-celeryutils to 0.1.4 2017-06-02 16:08:13 -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
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
Eric Fischer
83465e3626 update ORA2 to 1.4.1 2017-06-02 15:26:15 -04:00
Robert Raposa
142e46bd97 Merge pull request #15218 from edx/robrap/development-requirements 
Add instructions.
 2017-06-02 14:34:17 -04:00
Brandon Baker
0e49da8df7 Update AUTHORS 2017-06-02 13:00:35 -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
Shirley He
37a363dab7 implement feedback 2017-06-02 05:46:26 +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
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
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
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
Shirley He
e61f8b62d8 ENT-385 fix confirmation error message 2017-06-01 13:22:36 +00: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