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
rabia23
955c64470e reset self-generation of certs according to course pacing 2017-06-11 09:48:29 +00:00
Ibrahim Ahmed
07dc1e6b20 Merge pull request #15248 from edx/ibrahimahmed443/LEARNER-1127 
Exclude hidden programs from white label course page and home page
 2017-06-10 03:41:09 +05:00
Brandon Baker
f4c9044d2e EDUCATOR-344 
Removed instances of track function
 2017-06-09 18:51:10 +00:00
Ibrahim
9995716899 Exclude hidden programs from white label course and homepage 
LEARNER-1126, LEARNER-1127
 2017-06-09 21:42:21 +05:00
Simon Chen
e31590e528 Merge pull request #13850 from proversity-org/proversity/fix-valid-signature 
Fix valid signature
 2017-06-09 08:53:17 -04:00
Marko Jevtic
2422728671 LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products 2017-06-09 12:29:29 +02:00
attiyaishaque
383d61e08a EDUCATOR-496 Display date in correct UTC format. 2017-06-09 14:23:01 +05:00
jagonzalr
e58e295ca0 fix valid signature 2017-06-09 09:31:07 +02:00
Calen Pennington
14fed7a73e Merge pull request #15265 from edx/ret/upsell-cookie 
Upgrade course experiment
 2017-06-08 16:04:29 -04: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
Calen Pennington
975f1e709c Make the upgrade snippet template safe 2017-06-08 14:29:42 -04:00
Nimisha Asthagiri
fdafd53a66 Upsell Courses in Courseware, CourseOutline, Discussions, Progress 2017-06-08 14:29:42 -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
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 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
Eric Fischer
992a6ed066 unified_course_view flag exists as fixture now 2017-06-07 14:10:56 -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
mrey
c0b9603074 Fix sysadmin csv download as unicode 2017-06-07 15:41:37 +02: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
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
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
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
cahrens
3abc7dc07e isort updates 2017-06-05 13:47:48 -04:00
cahrens
36c51450c2 Adds in radio button patch request and text for page 
EDUCATOR-229
 2017-06-05 13:00:31 -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
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
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