Commit Graph

31527 Commits

Author SHA1 Message Date
Sarina Canelake
9b905ae729 Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag 2015-07-15 11:11:09 -04:00
Matt Drayer
66e1b11a58 Merge pull request #8931 from edx/ziafazal/fix-SOL-1008
SOL-1008: only edx PM can activate/deactivate or delete certificate configuration
2015-07-15 10:03:17 -04:00
David Baumgold
444cddaaf6 Merge pull request #8820 from edx/db/release-notes-column-in-release-script
Add a column for release notes in the release.py table
2015-07-15 09:16:00 -04:00
Vedran Karačić
4eb4a82ea5 Merge pull request #8851 from edx/vkaracic/PLAT-619-2
PLAT-619: Custom error messages for delete course command
2015-07-15 14:59:25 +02:00
Zia Fazal
0793cc8b5c only ddx PM can activate/deactivate or delete certificate configuration
fix for flaky test

fix for broken test

fixed quality violation
2015-07-15 17:09:01 +05:00
tasawernawaz
d3cb2e9442 Merge pull request #8853 from edx/tasawer/story/ecom-1858-provider-description-on-checkout-page
new view added "get_provider_detail" for get provider info
2015-07-15 13:21:53 +05:00
Tasawer
6e788d95b9 new view added "get_provider_detail" for getting provider info with provider_id
ECOM-1858
2015-07-15 12:25:26 +05:00
Vedran Karačić
c3f96faf1f Merge pull request #8910 from edx/vkaracic/AUTHORS-update
Added Vedran
2015-07-15 09:06:56 +02:00
zubair-arbi
75af7f6aae Merge pull request #8916 from edx/zub/story/ecom-1524-add-credit-checkout-page-link
add url link for credit checkout page
2015-07-15 11:20:11 +05:00
zubair-arbi
10bfcb83a0 add url link for credit checkout page
ECOM-1524
2015-07-15 00:31:15 +05:00
Marco Morales
a930fec852 Merge pull request #8812 from edx/marco/UX-384/reminder-icon-change
UX-384: Improved visual indicator for graded subsections in LMS sidebar
2015-07-14 14:26:31 -04:00
Vedran Karačić
43547bd5c8 Merge pull request #8875 from edx/vkaracic/TNL-136
TNL-136: Added New page creation animation
2015-07-14 20:18:49 +02:00
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
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
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
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
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