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

16294 Commits

Author SHA1 Message Date
Noraiz Anwar
371c422aaf Revert "EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced." 2017-06-14 15:57:07 +05:00
rabiaiftikhar
2eab85ebf7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-14 13:38:29 +05:00
Andy Armstrong
1592ee2b15 Merge pull request #15173 from edx/andya/course-search-page 
Enable course search for the unified course experience
 2017-06-13 17:41:26 -04:00
Nimisha Asthagiri
764c310c80 Merge pull request #15314 from edx/ret/add-todo-comments-ivp 
Add comments around In-course verification prompt throwaway code
 2017-06-13 17:28:38 -04:00
Andy Armstrong
c0007a11f3 Add new course search results page 
LEARNER-1112
 2017-06-13 16:36:32 -04:00
Andy Armstrong
0096c80a13 Refactor course search into openedx/features 2017-06-13 15:30:09 -04:00
Calen Pennington
39048048da Add comments around In-course verification prompt throwaway code 2017-06-13 15:18:46 -04:00
Sarah Fischmann
eafb79defc Added lang attribute in LMS and Studio; added language col to course_overviews 
Added course level lang attribute for LMS

added lang attribute to Studio

fixed error when trying to get language attribute on course that does not exist

simplified code

added lang attribure to more places in LMS, added migration for language attribute in course_overview

fixing contraints in the database for language attribute

added lang attribute to several more places in LMS and Studio

added lang attribute to discussion and custom pages; cleaned up code

fixed issue that was causing test failures

moved lang attribute higher in tree in two places
 2017-06-13 14:42:29 -04:00
Dmitry Viskov
0272b84fd0 Open Response Assessment tab for Instructor Dashboard - bugfix (prevent loading ORA Block more than one time) 2017-06-13 12:58:19 -04:00
Brandon Baker
7d2d0657fe Merge pull request #15290 from edx/bbaker/educator-344 
Bbaker/educator 344
 2017-06-13 10:42:35 -04:00
rabiaiftikhar
22d3b02807 respond to comments 2017-06-13 16:29:17 +05:00
rabiaiftikhar
b84d4c0209 Review Rehan 2017-06-13 15:43:36 +05:00
rabia23
511e653627 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-13 06:54:38 +00:00
rabia23
a8913f9a66 Review Alex 2017-06-13 06:51:38 +00:00
Giulio Gratta
2b25c9fc78 Enable DEFAULT_MODE to be customized in config 
- Keeps platform set default of "Audit" to be backwards compatible and not break stuff
- get COURSE_MODE_DEFAULTS from config if set
 2017-06-12 14:09:00 -04:00
rabia23
bb219ed4a7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-12 11:24:30 +00:00
rabia23
6484580107 fix coursekey error 2017-06-12 11:19:17 +00:00
Marko Jevtic
bf164ae962 [LEARNER-1183] Prepare program data to be presented on program marketing page 
[LEARNER-1393] Filter program course runs by status
 2017-06-12 10:15:38 +00:00
rabiaiftikhar
b29d1e32a9 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-12 11:47:02 +05:00
rabiaiftikhar
d12e36e24e Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-12 11:46:10 +05:00
Andy Armstrong
79acb5c5be Reorder LMS imports using isort 2017-06-11 21:48:06 -04:00
Clinton Blackburn
8d4db4ac4a Updated Course Structure API views to use JWT authentication 
LEARNER-1375
 2017-06-11 19:30:20 -04:00
Clinton Blackburn
0b07b53e71 Updated Commerce API v1 views to use JWT authentication 
LEARNER-1375
 2017-06-11 19:30:20 -04:00
rabia23
b7b865615c fix unit and bokchoy tests 2017-06-11 11:20:23 +00:00
rabia23
642c3b47e2 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-11 09:53:08 +00:00
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
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
cahrens
32d445e06d Fix radio button layout issues. 
EDUCATOR-557
 2017-06-07 09:11:06 -04:00