Commits · 274e6de22bcbbf8cd4d6eeb346622037761d6e5b · edx / edx-platform

21 Jul, 2015 1 commit
- PLAT-734 Fix slow transaction due to multiple calls to unpickling · 274e6de2
  utkjad committed Jul 21, 2015
  
  274e6de2 Browse Files
17 Jul, 2015 2 commits
- Merge pull request #8967 from edx/max/release-merge-conflicts · 72ab1fbc
```
Max/release merge conflicts
```
  Max Rothman committed Jul 17, 2015
  72ab1fbc Browse Files
- Merge branch 'rc/2015-07-14' into release · 9d344f67
```
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	lms/djangoapps/commerce/urls.py
	lms/templates/courseware/progress.html
```
  Max Rothman committed Jul 17, 2015
  9d344f67 Browse Files
16 Jul, 2015 1 commit
- Merge pull request #8947 from edx/renzo/resolve-failures · 035aa497
```
Import missing settings module in tests of commerce views
```
  Renzo Lucioni committed Jul 16, 2015
  035aa497 Browse Files
15 Jul, 2015 8 commits
- Import missing settings module in tests of commerce views · 60c818f0
  Renzo Lucioni committed Jul 15, 2015
  
  60c818f0 Browse Files
- Merge pull request #8941 from edx/jsa/commerce-api-rc · 7673bde8
```
Jsa/commerce api rc
```
  Max Rothman committed Jul 15, 2015
  7673bde8 Browse Files
- Support setting email opt-in in calls to the Otto shim · 7449f685
```
XCOM-499
```
  jsa committed Jul 15, 2015
  7449f685 Browse Files
- Mark basket creation and order retrieval endpoints as v0 · d4a5ad48
```
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.
```
  Renzo Lucioni committed Jul 15, 2015
  d4a5ad48 Browse Files
- Merge pull request #8939 from edx/clintonb/jwt-envs-fix · 7c5cc14a
```
Pulling JWT settings from envs tokens
```
  Clinton Blackburn committed Jul 15, 2015
  7c5cc14a Browse Files
- Pulling JWT settings from envs tokens · 6088bc34
```
XCOM-281
```
  Clinton Blackburn committed Jul 15, 2015
  6088bc34 Browse Files
- Merge pull request #8935 from edx/mekkz/course-overviews-grading-fix · 738146f8
```
MA-1036 Make CourseOverviews handle malformed grading policies
```
  Kyle McCormick committed Jul 15, 2015
  738146f8 Browse Files
- MA-1036 Make CourseOverviews handle malformed grading policies · e1472080
  Kyle McCormick committed Jul 15, 2015
  
  e1472080 Browse Files
14 Jul, 2015 8 commits
- Merge pull request #8929 from edx/revert-setuptools · 1ef9bfdb
```
Revert setuptools upgrade
```
  David Baumgold committed Jul 14, 2015
  1ef9bfdb Browse Files
- Revert MySQL-python upgrade · ee8913a5
  David Baumgold committed Jul 14, 2015
  
  ee8913a5 Browse Files
- Revert setuptools upgrade · ffb0a6a0
  David Baumgold committed Jul 14, 2015
  
  ffb0a6a0 Browse Files
- Merge pull request #8926 from edx/db/update-lxml · e811ac26
```
Update lxml to 3.4.4
```
  David Baumgold committed Jul 14, 2015
  e811ac26 Browse Files
- Update lxml to 3.4.4 · ad14afed
  David Baumgold committed Jul 14, 2015
  
  ad14afed Browse Files
- Merge pull request #8923 from edx/db/update-lxml · df65ed60
```
Update edx-ora2 and ease for lxml version compatibility
```
  David Baumgold committed Jul 14, 2015
  df65ed60 Browse Files
- Update edx-ora2 and ease for lxml version compatibility · 4482f837
  David Baumgold committed Jul 14, 2015
  
  4482f837 Browse Files
- Merge pull request #8902 from edx/things-to-tack-on-rc · 95dbec60
```
Things to tack on rc
```
  Adam committed Jul 14, 2015
  95dbec60 Browse Files
13 Jul, 2015 15 commits
- add data_dir to bok_choy test settings · 24cd1241
  Adam Palay committed Jul 13, 2015
  
  24cd1241 Browse Files
- Merge pull request #8903 from edx/alasdair/header-light-ECOM-1661 · 4371f746
```
ECOM-1661 removed nav links for logged out states
```
  AlasdairSwan committed Jul 13, 2015
  4371f746 Browse Files
- ECOM-1661 removed nav links for logged out states · 51deec38
```
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
```
  AlasdairSwan committed Jul 13, 2015
  51deec38 Browse Files
- address quality violation · 2c626407
  Adam Palay committed Jul 13, 2015
  
  2c626407 Browse Files
- when removing field from _field_data_cache when rebinding a module to a new… · 5088ae30
```
when removing field from _field_data_cache when rebinding a module to a new user, also remove it from _dirty_fields (TNL-2640)
```
  Adam Palay committed Jul 13, 2015
  5088ae30 Browse Files
- update to course import (TNL-2270) · 213dc70d
  Adam Palay committed Jul 13, 2015
  
  213dc70d Browse Files
- Merge pull request #8777 from edx/asadiqbal08/SOL-767_twitter_sharing · 37a0c19a
```
asadiqbal08/SOL-767: Students can share their certificate view on Twitter
```
  Matt Drayer committed Jul 13, 2015
  37a0c19a Browse Files
- Merge pull request #8861 from edx/jsa/stop-warning-noise · eed3ecad
```
reduce log severity when building marketing links
```
  Jim Abramson committed Jul 13, 2015
  eed3ecad Browse Files
- Merge pull request #8885 from edx/sarina/20150710-update-translations · 0b3631b5
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Jul 13, 2015
  0b3631b5 Browse Files
- Merge pull request #8751 from edx/ammar/tnl2619 · 798aa02f
```
Visual change to new Hints and Feedback problem types
```
  Muhammad Ammar committed Jul 13, 2015
  798aa02f Browse Files
- bokchoy update · 19d60120
  asadiqbal committed Jul 13, 2015
  
  19d60120 Browse Files
- update the code as per suggestions · 68ee36e8
  asadiqbal committed Jul 13, 2015
  
  68ee36e8 Browse Files
- Students can share their certificate view on Twitter · 1782f725
  asadiqbal committed Jul 13, 2015
  
  1782f725 Browse Files
- Visual change to new Hints and Feedback problem types · 5a8b1589
```
TNL-2619
```
  muhammad-ammar committed Jul 13, 2015
  5a8b1589 Browse Files
- Update translations (autogenerated message) · 1a46556a
  Sarina Canelake committed Jul 13, 2015
  
  1a46556a Browse Files
11 Jul, 2015 1 commit
- Merge pull request #8886 from edx/renzo/basket-creation-authentication · 4facd069
```
Commerce baskets API supports cross-domain session and OAuth2 authentication
```
  Renzo Lucioni committed Jul 10, 2015
  4facd069 Browse Files
10 Jul, 2015 3 commits
- reduce log severity when building marketing links · 41b0b793
  jsa committed Jul 10, 2015
  
  41b0b793 Browse Files
- Commerce baskets API supports cross-domain session and OAuth2 authentication · 3db2b5ff
```
Required in order to support requests from Drupal and mobile clients. XCOM-493.
```
  Renzo Lucioni committed Jul 10, 2015
  3db2b5ff Browse Files
- Merge pull request #8841 from edx/clytwynec/TE-745 · bc78baa0
```
Fix for TE-745
```
  Christine Lytwynec committed Jul 10, 2015
  bc78baa0 Browse Files
09 Jul, 2015 1 commit
- Merge pull request #8836 from edx/renzo/edx-oauth2-provider-upgrade · 77e0c049
```
Update edx-oauth2-provider to 0.5.2
```
  Renzo Lucioni committed Jul 09, 2015
  77e0c049 Browse Files