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

41449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Stu Young
5dd2c65ca3 Merge pull request #15291 from edx/revert-15005-aws_with_filesystem_storage 
Revert "Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module"
 2017-06-10 18:58:20 -04: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
Stu Young
8870dde933 Revert "Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module" 2017-06-09 16:18:12 -04: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
Brian Beggs
6643e7e1cd Merge pull request #15275 from edx/bbeggs/paramiko-1.18.1 
Remove paramiko requirement
 2017-06-09 11:30:07 -04:00
Kevin Falcone
eb3bbc7c58 Merge pull request #15005 from replaceafill/aws_with_filesystem_storage 
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
 2017-06-09 10:39:45 -04: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 Jevtić
53cd05fb7f Merge pull request #15269 from edx/mjevtic/LEARNER-1366 
LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products
 2017-06-09 14:14:28 +02: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
Attiya Ishaque
58c3366f02 Merge pull request #15224 from edx/ai/EDUCATOR-496-date-format 
EDUCATOR-496 Display date in correct UTC format.
 2017-06-09 15:22:06 +05: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
Douglas Cerna
ca33342ce3 Removed MEDIA_ROOT override in cms.envs.devstack 2017-06-08 22:22:50 -06:00
Christina Roberts
6a244a3fc8 Merge pull request #15284 from edx/christina/add-middleware-guid 
Synchronous celery tasks clear the request cache
 2017-06-08 18:57:35 -04:00
Brian Beggs
9e6e97c0ee remove paramiko 2017-06-08 16:34:32 -04:00
cahrens
d9592fc422 Make the code robust to the request cache being cleared. 2017-06-08 16:31:37 -04:00
Calen Pennington
14fed7a73e Merge pull request #15265 from edx/ret/upsell-cookie 
Upgrade course experiment
 2017-06-08 16:04:29 -04:00
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
Calen Pennington
ede336051b Make test runs less verbose 2017-06-08 14:29:42 -04:00