Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,488 Commits 1 Branch 0 Tags
035aa4976faea1bb4e2fe99f99d0cb5ca78573ca
Commit Graph

31488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
035aa4976f Merge pull request #8947 from edx/renzo/resolve-failures 
Import missing settings module in tests of commerce views
 2015-07-16 16:52:06 -04:00
Renzo Lucioni
60c818f030 Import missing settings module in tests of commerce views 2015-07-15 19:03:26 -04:00
Max Rothman
7673bde898 Merge pull request #8941 from edx/jsa/commerce-api-rc 
Jsa/commerce api rc
 2015-07-15 16:49:12 -04:00
jsa
7449f68522 Support setting email opt-in in calls to the Otto shim 
XCOM-499
 2015-07-15 16:22:36 -04:00
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
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
Kyle McCormick
e1472080da MA-1036 Make CourseOverviews handle malformed grading policies 2015-07-15 14:16:18 -04: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
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
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
David Baumgold
4482f837a2 Update edx-ora2 and ease for lxml version compatibility 2015-07-14 11:18:01 -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
Adam Palay
24cd124195 add data_dir to bok_choy test settings 2015-07-13 17:10:32 -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
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
Adam Palay
2c6264077d address quality violation 2015-07-13 15:09:53 -04:00
Adam Palay
5088ae3091 when removing field from _field_data_cache when rebinding a module to a new user, also remove it from _dirty_fields (TNL-2640) 2015-07-13 14:17:27 -04:00
Adam Palay
213dc70d1e update to course import (TNL-2270) 2015-07-13 14:17:26 -04:00
Matt Drayer
37a0c19ada Merge pull request #8777 from edx/asadiqbal08/SOL-767_twitter_sharing 
asadiqbal08/SOL-767: Students can share their certificate view on Twitter
 2015-07-13 10:10:13 -04:00
Jim Abramson
eed3ecad7f Merge pull request #8861 from edx/jsa/stop-warning-noise 
reduce log severity when building marketing links
 2015-07-13 08:56:28 -04:00
Sarina Canelake
0b3631b5be Merge pull request #8885 from edx/sarina/20150710-update-translations 
Update translations (autogenerated message)
 2015-07-13 08:18:55 -04:00
Muhammad Ammar
798aa02f63 Merge pull request #8751 from edx/ammar/tnl2619 
Visual change to new Hints and Feedback problem types
 2015-07-13 17:03:52 +05:00
asadiqbal
19d6012033 bokchoy update 2015-07-13 15:57:50 +05:00
asadiqbal
68ee36e84e update the code as per suggestions 2015-07-13 13:54:01 +05:00
asadiqbal
1782f72555 Students can share their certificate view on Twitter 2015-07-13 12:40:45 +05:00
muhammad-ammar
5a8b158900 Visual change to new Hints and Feedback problem types 
TNL-2619
 2015-07-13 12:18:25 +05:00
Sarina Canelake
1a46556a03 Update translations (autogenerated message) 2015-07-13 00:50:28 -04:00
Renzo Lucioni
4facd069a5 Merge pull request #8886 from edx/renzo/basket-creation-authentication 
Commerce baskets API supports cross-domain session and OAuth2 authentication
 2015-07-10 20:06:38 -04:00
jsa
41b0b793de reduce log severity when building marketing links 2015-07-10 16:21:12 -04:00
Renzo Lucioni
3db2b5ff88 Commerce baskets API supports cross-domain session and OAuth2 authentication 
Required in order to support requests from Drupal and mobile clients. XCOM-493.
 2015-07-10 15:42:49 -04:00
Christine Lytwynec
bc78baa091 Merge pull request #8841 from edx/clytwynec/TE-745 
Fix for TE-745
 2015-07-10 09:08:52 -04:00
Renzo Lucioni
77e0c049b8 Merge pull request #8836 from edx/renzo/edx-oauth2-provider-upgrade 
Update edx-oauth2-provider to 0.5.2
 2015-07-09 18:23:10 -04:00
Clinton Blackburn
b87c525109 Merge pull request #8866 from edx/clintonb/commerce-api-expiration-date 
Updated Commerce API to return CourseMode expiration date
 2015-07-09 17:00:03 -04:00
Tyler Nickerson
0220baac59 Merge pull request #8868 from edx/nickersoft/update-authors 
Update AUTHORS
 2015-07-09 16:50:39 -04:00
Tyler Nickerson
d0affa1342 Update AUTHORS 2015-07-09 16:46:00 -04:00
Tyler Nickerson
825d99deee Merge pull request #8865 from edx/nickersoft/jwt-security 
XCOM-281: LMS now passes JWT issuer and expiration date to ecommerce API client
 2015-07-09 16:43:07 -04:00
Clinton Blackburn
7d91361f32 Updated Commerce API to return CourseMode expiration date 
XCOM-477
 2015-07-09 15:30:48 -04:00
Jesse Zoldak
2b51029db3 Merge pull request #8834 from edx/zoldak/SOL-449 
Mark a too-flaky Milestones acceptance test for skipping
 2015-07-09 15:12:32 -04:00
Christine Lytwynec
14fdc836c5 Fix for TE-745 2015-07-09 15:09:16 -04:00
Jesse Zoldak
de97e31a25 Merge pull request #8858 from edx/zoldak/TNL-2704 
Mark test as flaky TNL-2704
 2015-07-09 15:09:07 -04:00
Nickersoft
2d13e9e886 LMS now passes JWT issuer and expiration date to ecommerce API client 2015-07-09 15:06:54 -04:00
Christine Lytwynec
45f487caa1 Merge pull request #8857 from edx/clytwynec/bok-choy-v0.4.3 
update bok choy to version 0.4.3
 2015-07-09 15:06:47 -04:00
David Baumgold
da5ad4fe04 Merge pull request #8161 from edx/distribute-to-setuptools 
Distribute to setuptools
 2015-07-09 15:00:20 -04:00
Sarina Canelake
07a3d74999 Merge pull request #8844 from ubc/xcompass/pu/fix-test_course_about_in_cart 
Fix failed test_course_about_in_cart
 2015-07-09 14:01:52 -04:00
David Baumgold
8a6e310d04 don't install ease in editable mode 2015-07-09 13:33:14 -04:00