Commit Graph

41399 Commits

Author SHA1 Message Date
Sofiya Semenova
91f1923dbf Merge pull request #15266 from edx/ssemenova/EDUCATOR-367
ED-367 log in production logging when it shouldn't be
2017-06-08 15:51:42 -04:00
Adam
c3a7088a94 Merge pull request #15211 from edx/adam/add-precedes-to-coursegraph-2
add precedes relationship to coursegraph (EDUCATOR-484)
2017-06-08 15:29:32 -04:00
Christina Roberts
7c9e1172a7 Merge pull request #15279 from edx/christina/add-middleware-guid
Add GUID to memory middleware logs.
2017-06-08 14:58:23 -04:00
Sofiya Semenova
6acc6fde95 ED-367 log in production 2017-06-08 18:48:26 +00:00
Shirley He
efae277871 Merge pull request #15245 from edx/shrlyhe/ENT-371
ENT-371: Add platform name to "Create your account" message
2017-06-08 14:34:50 -04:00
Feanil Patel
205de01120 Merge pull request #15278 from edx/mroytman/undo-ES-requirement-change
revert 15259
2017-06-08 14:34:31 -04:00
Ned Batchelder
40f7e75e17 Merge pull request #15277 from edx/nedbat/update-translations
Update translations (autogenerated message)
2017-06-08 13:32:52 -04:00
Adam Palay
e798b2e8a6 add precedes relationship to coursegraph (EDUCATOR-484) 2017-06-08 12:53:27 -04:00
cahrens
be0a5f3c36 Ran isort on file. 2017-06-08 11:50:37 -04:00
Michael Roytman
c7ae718acb revert 15259 2017-06-08 11:41:54 -04:00
cahrens
052492dbe3 Add GUID to memory middleware logs. 2017-06-08 11:36:48 -04:00
Ned Batchelder
b5ed816be1 Update translations (autogenerated message) 2017-06-08 14:55:44 +00:00
Christina Roberts
8df5c94196 Merge pull request #15267 from edx/christina/should-be-groups
Generalize "cohorts" and remove unused imports.
2017-06-08 10:14:52 -04:00
Muhammad Ammar
e748652840 Merge pull request #15199 from edx/ammar/edu-211-html5-player-overlay-play-button
show play button overlay
2017-06-08 11:46:41 +05:00
Douglas Hall
f59dbc9c3c Merge pull request #15095 from replaceafill/ENT-290
[ENT-290] Enable switch in Enterprise setup to hide Audit track
2017-06-07 23:08:19 -04:00
Douglas Cerna
6b64972b51 Added Enterprise setting for filtering audit course modes 2017-06-07 19:36:24 -06:00
cahrens
8e9dd90029 Generalize "cohorts" and remove unused imports. 2017-06-07 20:42:19 -04:00
Robert Raposa
8e8d17014d Merge pull request #15261 from edx/robrap/LEARNER-1316-unit-test
LEARNER-1316: Add unit test for jump_to for course location.
2017-06-07 18:54:08 -04:00
Adam
538da996db Merge pull request #15268 from edx/adam/update-fail-task-command
aesthetic changes to command to mark old tasks as failures
2017-06-07 18:20:59 -04:00
Adam Palay
899e0f9353 aesthetic changes to command to mark old tasks as failures 2017-06-07 17:11:45 -04:00
Robert Raposa
fcf4efc65f Add unit test for jump_to for course location. 2017-06-07 16:39:49 -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
muhammad-ammar
e89c08d84d show play button overley
EDUCATOR-211
2017-06-07 17:04:37 +05: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