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

41377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Palay
899e0f9353 aesthetic changes to command to mark old tasks as failures 2017-06-07 17:11:45 -04:00
Michael Roytman
4e9d41f222 Merge pull request #15259 from edx/mroytman/update-edx-search-version 
update edx-search to version 1.0.1
 2017-06-07 15:27:36 -04:00
Eric Fischer
cb894703ee Merge pull request #15264 from edx/efischer/celeryutils_0.1.5 
edx-celeryutils v0.1.5
 2017-06-07 14:08:13 -04:00
Albert (AJ) St. Aubin
27b0dc9fd1 Merge pull request #15037 from edx/christina/ed11-simplification 
Feature branch: dividing discussions by enrollment tracks
 2017-06-07 13:22:13 -04:00
Albert St. Aubin
99b6c3950e update to correct timing bug with render of Discussions 2017-06-07 12:09:52 -04:00
Eric Fischer
041c94c263 edx-celeryutils v0.1.5 2017-06-07 11:44:07 -04:00
Michael Roytman
fa5b9b7a4a update edx-search to version 1.0.1 2017-06-07 10:31:02 -04:00
cahrens
32d445e06d Fix radio button layout issues. 
EDUCATOR-557
 2017-06-07 09:11:06 -04:00
Ned Batchelder
c8accbc30e Merge pull request #15131 from edx/nedbat/help-tokens-from-pypi 
Install help-tokens from PyPI
 2017-06-06 17:48:39 -04:00
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
edx-pipeline-bot
fd57549c9d Merge pull request #15252 from edx/release-mergeback-to-master 
Merge release back to master
 2017-06-06 14:49:08 -04:00
Shirley He
49074f64a0 Merge pull request #15231 from edx/shrlyhe/ENT-385 
ENT-385: change error msg for confirm email
 2017-06-06 14:27:42 -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
Albert St. Aubin
fd7ac21608 Working publisher/subscriber events for Cohorts and discussions 2017-06-06 13:58:54 -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
Jesse Zoldak
c3a1905a55 Merge pull request #15251 from edx/zoldak/skip-flaky-tests 
Skip and mark tests flaky - top offenders from Provably Flaky Test Methods splunk report
 2017-06-06 13:33:34 -04:00
Robert Raposa
a8d1c2b603 Revert: Course jump tos should go to the main course home page. 
Revert commit: c14f0b14ea
 2017-06-06 12:27:29 -04:00
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
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
Ayub khan
c03cd59908 Merge pull request #15225 from edx/LEARNER-925 
LEARNER-925 -Hot Fix Students unable to get certificates.
 2017-06-06 02:18:01 +05:00
Sanford Student
c288ee7be0 adding model 2017-06-05 16:59:52 -04:00
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