Commit Graph

40279 Commits

Author SHA1 Message Date
Renzo Lucioni
d4a5ad4818 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-15 16:22:29 -04:00
Clinton Blackburn
7c5cc14a32 Merge pull request #8939 from edx/clintonb/jwt-envs-fix
Pulling JWT settings from envs tokens
2015-07-15 16:07:12 -04:00
Clinton Blackburn
6088bc3401 Pulling JWT settings from envs tokens
XCOM-281
2015-07-15 16:06:17 -04:00
Renzo Lucioni
ea37ada4db Update edx-oauth2-provider to 0.5.3 2015-07-15 15:58:00 -04:00
Kyle McCormick
738146f87c Merge pull request #8935 from edx/mekkz/course-overviews-grading-fix
MA-1036 Make CourseOverviews handle malformed grading policies
2015-07-15 15:29:57 -04:00
Matt Drayer
0f2a36a62a Merge pull request #8908 from edx/asadiqbal08/SOL-1050
asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL
2015-07-15 15:05:53 -04:00
Sylvia Pearce
d2b6ac84d3 Reorganize and update API documentation 2015-07-15 14:31:02 -04:00
Kyle McCormick
e1472080da MA-1036 Make CourseOverviews handle malformed grading policies 2015-07-15 14:16:18 -04:00
asadiqbal
19d9ccbf67 asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL 2015-07-15 12:22:09 -04:00
Zia Fazal
b5c32ec4f1 ziafazal/SOL-980: Fix error while generating certificates 2015-07-15 12:21:50 -04:00
Matt Drayer
3f432d49a8 Merge pull request #8912 from edx/asadiqbal08/SOL-1046
SOL-1046 converted anchor to button for linkedIn
2015-07-15 12:07:57 -04:00
David Baumgold
8c4bb8bf3c Merge pull request #8933 from edx/revert-setuptools
Revert setuptools
2015-07-15 11:13:56 -04:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00
Sarina Canelake
4f2be41a48 Add messaging about Insights to Analytics instructor tab 2015-07-15 11:11:09 -04:00
Sarina Canelake
9b905ae729 Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag 2015-07-15 11:11:09 -04:00
Ben McMorran
d36eb83a03 Add query count tests 2015-07-15 14:56:04 +00:00
asadiqbal
56015fecf3 asadiqbal08/SOL-1046: Convert LinkedIn anchor tag to button
* remove the onclick event
* add mako check to Javascript handler
2015-07-15 10:30:35 -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
2ff0f636ed Revert MySQL-python upgrade 2015-07-15 09:37:04 -04:00
David Baumgold
1a3f0958b9 Revert setuptools upgrade 2015-07-15 09:36:56 -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
David Baumgold
1ef9bfdbbf Merge pull request #8929 from edx/revert-setuptools
Revert setuptools upgrade
2015-07-14 17:30:11 -04:00
David Baumgold
ee8913a547 Revert MySQL-python upgrade 2015-07-14 16:42:08 -04:00
David Baumgold
ffb0a6a07d Revert setuptools upgrade 2015-07-14 16:37:54 -04:00
zubair-arbi
10bfcb83a0 add url link for credit checkout page
ECOM-1524
2015-07-15 00:31:15 +05:00
David Baumgold
e811ac2603 Merge pull request #8926 from edx/db/update-lxml
Update lxml to 3.4.4
2015-07-14 14:33:11 -04:00
David Baumgold
ad14afed15 Update lxml to 3.4.4 2015-07-14 14:31:39 -04: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
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