Commits · 13e80befe13f2b3024634d4e876e95bae26cad56 · edx / edx-platform

23 Jul, 2015 2 commits
- Merge pull request #9018 from edx/hotfix/2015-07-23 · 13e80bef
```
Hotfix 2015-07-23: Allow course staff to bypass embargo rules.
```
  Will Daly committed Jul 23, 2015
  13e80bef Browse Files
- Allow course staff to bypass embargo rules. · eefbf77e
  Will Daly committed Jul 23, 2015
  
  eefbf77e Browse Files
22 Jul, 2015 1 commit
- Merge pull request #8978 from edx/hotfix/2015-07-20 · 5fe01036
```
PLA-749 Fix student dashboard for users enrolled in CCX courses
```
  Adam committed Jul 22, 2015
  5fe01036 Browse Files
21 Jul, 2015 6 commits
- Merge pull request #8988 from edx/max/update-oauth2-provider · 3ede0b0d
```
Update edx-oauth2-provider to 0.5.4
```
  Max Rothman committed Jul 21, 2015
  3ede0b0d Browse Files
- Merge pull request #8989 from edx/utkjad/fixtemp · 231059c2
```
PLAT-734 Fix slow transaction due to multiple calls to unpickling
```
  Utkarsh committed Jul 21, 2015
  231059c2 Browse Files
- Merge pull request #8980 from cpennington/cache-ccx-lookups · 8e1686c8
```
Cache ccx lookups
```
  Calen Pennington committed Jul 21, 2015
  8e1686c8 Browse Files
- Merge pull request #8987 from edx/ormsbee/inline_discussion_ccx_perf_hotfix · 22e4fb30
```
Ormsbee/inline discussion ccx perf hotfix
```
  Calen Pennington committed Jul 21, 2015
  22e4fb30 Browse Files
- Update edx-oauth2-provider to 0.5.4 · f50f045b
```
Conflicts:
	requirements/edx/github.txt
```
  Renzo Lucioni committed Jul 21, 2015
  f50f045b Browse Files
- PLAT-734 Fix slow transaction due to multiple calls to unpickling · 274e6de2
  utkjad committed Jul 21, 2015
  
  274e6de2 Browse Files
20 Jul, 2015 7 commits
- Instead of calculating the course's usage key, just follow the parent chain. · 69390152
  David Ormsbee committed Jul 20, 2015
  
  69390152 Browse Files
- Return just the CourseDescriptor in discussions get_course() · abcdc05a
```
Instead of calling the modulestore's get_course(), return the
descriptor via self.runtime.get_block(). Doing this means that bulk
ops caching works within CCX courses.

Note: The long term fix for this is to have some course-level scope
so that we're not peeking at the top of the tree just for some basic
discussion-specific configuration information (in this case the
blackout dates).

TNL-2697
```
  David Ormsbee committed Jul 20, 2015
  abcdc05a Browse Files
- Cache CcxFieldOverrides on a per-request basis · 0e8b303d
  Calen Pennington committed Jul 20, 2015
  
  0e8b303d Browse Files
- Cache CustomCourseForEdX object lookup per-request · 63ddbd9b
  Calen Pennington committed Jul 20, 2015
  
  63ddbd9b Browse Files
- Make CcxFactory fill in a coach if one isn't supplied · 1e84ad99
  Calen Pennington committed Jul 20, 2015
  
  1e84ad99 Browse Files
- Make request_cache easier to use · 7b0c22af
  Calen Pennington committed Jul 20, 2015
  
  7b0c22af Browse Files
- PLA-749 Fix student dashboard for users enrolled in CCX courses · a9c4774f
  Kyle McCormick committed Jul 20, 2015
  
  a9c4774f 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 5 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