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

41484 Commits

This Branch
This Branch
All Branches
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
Rabia Iftikhar
c2c32e7231 Merge pull request #15163 from edx/ri/EDUCATOR-394-disable-self-generation-certificates 
EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced.
 2017-06-14 15:27:10 +05:00
rabiaiftikhar
2eab85ebf7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-14 13:38:29 +05:00
M. Rehan
a42f930614 Merge pull request #15288 from edx/mrehan/fix-studio-header-menu 
EDUCATOR-294 – Fix studio header menu
 2017-06-14 13:35:33 +05:00
Qubad786
afd45996d9 fix studio header menu 2017-06-14 11:49:30 +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
Carol Tong
c8de3af589 Merge pull request #15313 from edx/carol/DOC-3687 
DOC-3687: Change help target for enrollment track groups on Studio Group Configs page
 2017-06-13 16:48:26 -04:00
Andy Armstrong
c0007a11f3 Add new course search results page 
LEARNER-1112
 2017-06-13 16:36:32 -04:00
sarahkf
086b503b51 Merge pull request #15219 from edx/sarahkf/courseware-lang 
Added course level lang attribute for LMS WIP
 2017-06-13 16:06:59 -04:00
Carol Tong
82b8cf40b3 Change help target for enrollment track groups 2017-06-13 15:51:13 -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
Eric Fischer
7721237989 Merge pull request #15310 from edx/sylvia/update_help_tokens 
Update Studio help tokens following doc reorg for Publisher
 2017-06-13 14:43:52 -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
Feanil Patel
3fbe60ef57 Merge pull request #14463 from edx/robrap/edx-search-upgrade 
[DELAY MERGE] TNL-6319: Upgrade edx-search for ES 1.x upgrade.
 2017-06-13 14:32:26 -04:00
Eric Fischer
c60cb6a604 Merge pull request #15299 from edx/efischer/ora_rc 
edx-ora2 1.4.2 release
 2017-06-13 14:03:03 -04:00
Eric Fischer
3ea7a18994 Revert "Merge pull request #15309 from edx/efischer/fix_studio_link_tests" 
This reverts commit 8ca5c11a2b, reversing
changes made to 1acb51559a.
 2017-06-13 13:52:31 -04:00
Sylvia Pearce
fe3105cc38 Update Studio help tokens following doc reorg for Publisher 2017-06-13 13:52:07 -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
Eric Fischer
4af499cdd5 edx-ora2 1.4.2 release 2017-06-13 12:58:19 -04:00
Eric Fischer
8ca5c11a2b Merge pull request #15309 from edx/efischer/fix_studio_link_tests 
Skip failing tests temporarily
 2017-06-13 12:50:45 -04:00
Renzo Lucioni
1acb51559a Prevent footer loaded via branding API from loading unused CSS 
Footer HTML requested from the branding API was including two CSS files, lms-footer.css and lms-footer-edx.css. edx.org pages only require lms-footer-edx.css to render the footer. The template code being removed here appears to have been accidentally left in place during a theming change: c0648ab164\#diff-439477a9ba29f7c208e25b0a535cdabeR80.

ECOM-3655
 2017-06-13 12:43:33 -04:00
Eric Fischer
9e6b449a62 Skip failing tests 2017-06-13 11:59:42 -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
Christina Roberts
54eb9e84b4 Merge pull request #15292 from edx/christina/add-middleware-guid 
Limit courses and libraries returned for global staff.
 2017-06-12 15:18:18 -04:00
Muhammad Ammar
2e675fdc4b Merge pull request #15256 from edx/ammar/edu-292-move-dialog-fix 
move dialog fix
 2017-06-12 23:54:52 +05: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
cahrens
4454458743 Limit courses and libraries returned for global staff. 
EDUCATOR-563
 2017-06-12 13:47:00 -04:00
Brian Beggs
10ec774c4c Merge pull request #15274 from edx/bbeggs/pyyaml-3.12 
Upgrade pyyaml to 3.12
 2017-06-12 12:49:38 -04:00
Brian Beggs
4eba6f0c13 Upgrade pyyaml to 3.12 2017-06-12 11:08:05 -04:00
Brandon Baker
6b62bf9b4b EDUCATOR-344 
Removed extraneous instances of track_function
 2017-06-12 14:45:37 +00:00
Noraiz Anwar
90e73b553a Merge pull request #15257 from edx/noraiz/EDUCATOR-546 
Add keep-instructors option in delete_course management command
 2017-06-12 19:34:27 +05:00
noraiz-anwar
bac223acad Enhance delete_course management command 2017-06-12 17:51:54 +05: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 Jevtić
484ec25629 Merge pull request #15270 from edx/mjevtic/LEARNER-1183 
[LEARNER-1183] Prepare program data to be presented on program marketing page
 2017-06-12 13:14:30 +02:00
muhammad-ammar
090ce1d0e5 move dialog fix 
EDUCATOR-292
 2017-06-12 16:08:55 +05: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
9c4869c1d5 Merge pull request #15206 from edx/andya/clean-imports-lms 
Reorder LMS imports using isort
 2017-06-11 22:54:11 -04: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