Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,994 Commits 1 Branch 0 Tags
322ac8a468c2d861643efb139db57408872679e7
Commit Graph

39994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dino-cikatic
ccf266e0cc Merge pull request #8760 from edx/dcikatic/SOL-974 
SOL-974 make index and remove calls use ES bulk API [WIP]
 2015-07-14 13:21:32 -04:00
Jim Abramson
0e16aa8cb6 Merge pull request #8924 from edx/jsa/xcom-499 
Support setting email opt-in in calls to the Otto shim
 2015-07-14 12:22:40 -04:00
Fred Smith
088b20863e upgrade to pymongo 2.8 to support updated authenticated method SCRAM-SHA-1 for mongodb-server 3.0 2015-07-14 11:49:45 -04:00
David Baumgold
df65ed605a Merge pull request #8923 from edx/db/update-lxml 
Update edx-ora2 and ease for lxml version compatibility
 2015-07-14 11:49:26 -04:00
Jesse Zoldak
98a8f0e282 Merge pull request #8917 from edx/zoldak/SOL-1053 
Mark delete certificates test as flaky SOL-1053
 2015-07-14 11:47:30 -04:00
Dino Cikatic
862262bd2d SOL-974 make index and remove calls use ES bulk API 2015-07-14 11:47:08 -04:00
jsa
afa77f86bf Support setting email opt-in in calls to the Otto shim 
XCOM-499
 2015-07-14 11:28:59 -04:00
vkaracic
ff6afaf483 Custom error messages for delete course command 
This is a fix for
https://openedx.atlassian.net/browse/PLAT-619
added custom CommandError messages for invalid syntax and
invalid course keys.
 2015-07-14 15:28:01 +00:00
David Baumgold
4482f837a2 Update edx-ora2 and ease for lxml version compatibility 2015-07-14 11:18:01 -04:00
David Baumgold
29df7506c1 Merge pull request #8905 from edx/db/update-lxml 
Update lxml to 3.4.4
 2015-07-14 11:09:43 -04:00
David Baumgold
b6af608489 Update edx-ora2 and ease for lxml version compatibility 2015-07-14 11:09:18 -04:00
Feanil Patel
ea5b41cd84 Merge pull request #8898 from edx/feanil/fix_student_migrations 
Update migration dependency.
 2015-07-14 10:27:56 -04:00
Adam
95dbec60bb Merge pull request #8902 from edx/things-to-tack-on-rc 
Things to tack on rc
 2015-07-14 09:26:22 -04:00
frances botsford
2e7da1985a Merge pull request #8321 from edx/frances/lms/user-menu-cleanup 
LMS User menu cleanup
 2015-07-14 09:23:36 -04:00
Jesse Zoldak
96b2baba63 Mark delete certificates test as flaky SOL-1053 2015-07-14 09:10:34 -04:00
vkaracic
8f0bb98990 Added New page creation animation 
This is a fix for
https://openedx.atlassian.net/browse/TNL-136
added scroll to new page and remove class 'new' on hover to better
indicate that a new page is created.
 2015-07-14 13:05:47 +00:00
Marco Morales
493200734e Merge pull request #8296 from edx/marco/find-courses-page/styling-changes 
Styling improvements to openedX search through Find Courses page
 2015-07-14 08:14:35 -04:00
Matt Drayer
d57fd0e47c Merge pull request #8847 from edx/ziafazal/SOL-1021 
ziafazal/SOL-1021: Create Analytics events for certificate actions
 2015-07-14 07:58:55 -04:00
Vedran Karačić
59e184a8ca Merge pull request #8854 from edx/vkaracic/TNL-394 
TNL-394: Added sanitization of id names
 2015-07-14 13:11:10 +02:00
vkaracic
3ec3cf64cc Added sanitization of id names 
This is a fix for
https://openedx.atlassian.net/browse/TNL-394
escaped all escapable characters in id name strings.
 2015-07-14 08:31:19 +00:00
Vedran Karačić
253dda90be Added Vedran 2015-07-14 10:02:15 +02:00
Vedran Karačić
f9cb092488 Merge pull request #8852 from edx/vkaracic/PLAT-324 
PLAT-324: Custom error message for export course command
 2015-07-14 09:15:53 +02:00
Zia Fazal
57f1dc92b3 ziafazal/SOL-1021: Capture additional certificate configuration events 
* Changed certificate_id to configuration_id
* Fix for acceptance test faiiure
* Add waits to bok choy tests

fix for flaky test
 2015-07-14 11:12:09 +05:00
Braden MacDonald
1091ea868b Merge pull request #8775 from open-craft/smarnach/masquerade 
Allow staff to masquerade as a specific user in the LMS (SOL-816)
 2015-07-13 21:51:58 -07:00
Marco Morales
b30c2f3bd0 updated graded icon indicator to use data-tooltip, font-awesome, plus hides it from screenreaders 2015-07-13 22:31:20 -04:00
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
Sarina Canelake
d494fe22f1 Merge pull request #8876 from edx/sarina/pylint 
Eliminate various Pylint violations
 2015-07-13 18:14:40 -04:00
Andy Armstrong
b604d647f8 Fix indentation 2015-07-13 17:58:16 -04:00
Sarina Canelake
49f78b4742 Remove logging-not-lazy Pylint violations 2015-07-13 17:34:54 -04:00
Sarina Canelake
39d3537410 Pylint logging-format-interpolation: Convert logging calls to use %s formatting 2015-07-13 17:33:29 -04:00
Sarina Canelake
647bc967c0 Set new Pylint threshold 2015-07-13 17:33:28 -04:00
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations 
Skipped 'print' statement violations, as print() is Py3k syntax.
 2015-07-13 17:33:28 -04:00
Sarina Canelake
47b99720fa Clean up old style class definitions 2015-07-13 17:33:27 -04:00
Sarina Canelake
22bbdacee9 Convert Meta classes to new-style classes 2015-07-13 17:33:26 -04:00
Sarina Canelake
b41e70f541 Remove Pylint violations deprecated-pragma, bad-option-value 2015-07-13 17:33:26 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
Renzo Lucioni
4a1e617289 Merge pull request #8901 from edx/renzo/version-baskets-api-url 
Mark basket creation and order retrieval endpoints as v0
 2015-07-13 17:12:40 -04:00
Adam Palay
24cd124195 add data_dir to bok_choy test settings 2015-07-13 17:10:32 -04:00
Ben McMorran
a119b723fd TNL-2389 Use discussion id map cache for thread creation and update 2015-07-13 20:56:50 +00:00
Feanil Patel
4ae4e25f5c Update student migration 0035 to add a dependency. 
This migration instantiates the modulestore which is now dependent
the xblock_django database config settings.  So the initial migration
for that has to run before this migration.
 2015-07-13 16:53:33 -04:00
Ben McMorran
8eb0653a5f Merge pull request #8708 from edx/benmcmorran/discussion-caching-2 
TNL-2458 Cache discussion id mapping on course publish
 2015-07-13 16:52:12 -04:00
Akiva Leffert
99f146dfc8 Merge pull request #8883 from edx/aleffert/xblock-access-result 
Make render_xblock return a 404 if access check fails
 2015-07-13 16:46:06 -04:00
Renzo Lucioni
609e6ca277 Mark basket creation and order retrieval endpoints as v0 
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
 2015-07-13 16:27:58 -04:00
Peter Fogg
e9eefb8bc3 Merge pull request #8904 from edx/peter-fogg/remove-duplicated-teams-app 
Remove duplicated Teams app setting.
 2015-07-13 16:25:30 -04:00
AlasdairSwan
4371f746f4 Merge pull request #8903 from edx/alasdair/header-light-ECOM-1661 
ECOM-1661 removed nav links for logged out states
 2015-07-13 16:18:25 -04:00
David Baumgold
fcf84e68d0 Update lxml to 3.4.4 2015-07-13 16:14:39 -04:00
Ben McMorran
ccf20e52b1 TNL-2458 Cache discussion id mapping on course publish 2015-07-13 20:12:52 +00:00
Akiva Leffert
6084f4df27 Make render_xblock return a 404 if access check fails 
The mobile clients need the request to fail if they don't have
permisssions so that they know to refresh a session token.

JIRA: https://openedx.atlassian.net/browse/MA-1003
 2015-07-13 15:56:58 -04:00
Peter Fogg
7bc333d8c5 Remove duplicated Teams app setting. 2015-07-13 15:49:24 -04:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states 
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
 2015-07-13 15:33:00 -04:00