Commits · c97314413bc046878e08a557e323c02c48a3539c · edx / edx-platform · GitLab

17 Jul, 2015 18 commits
- Merge branch 'release' into release-merge-test · c9731441
```
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
```
  Max Rothman committed Jul 17, 2015
  c9731441 Browse Files
- 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 pull request #8966 from… · 54b97c60
```
Merge pull request #8966 from edx/revert-7404-waheed/plat407-decorate-instructor-dashboard-with-sudo-required

Revert "Decorated instructor dashboard with sudo_required."
```
  Adam committed Jul 17, 2015
  54b97c60 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
- Merge pull request #8773 from edx/sylvia/docs/DOC-2102 · b12d3f63
```
Sylvia/docs/doc 2102
```
  srpearce committed Jul 17, 2015
  b12d3f63 Browse Files
- Merge pull request #8960 from edx/release-2015-07-08-conflict · 2d216fc6
```
Release 2015-07-08 conflict
```
  Max Rothman committed Jul 17, 2015
  2d216fc6 Browse Files
- Merge pull request #8964 from edx/zoldak/MA-1038 · 626d3fb0
```
Skip test that had a hardcoded date expectation  MA-1038
```
  Jesse Zoldak committed Jul 17, 2015
  626d3fb0 Browse Files
- Skip test that had a hardcoded date expectation MA-1038 · c2b4cf21
  Jesse Zoldak committed Jul 17, 2015
  
  c2b4cf21 Browse Files
- Merge pull request #8943 from edx/zoldak/more-flaky-js · 913a5dfe
```
Disable potentially flaky jasmine tests
```
  Jesse Zoldak committed Jul 17, 2015
  913a5dfe Browse Files
- Delete white spaces that are causing test failures · eea3b311
  Sylvia Pearce committed Jul 17, 2015
  
  eea3b311 Browse Files
- Merge pull request #8940 from edx/zoldak/SOL-1053-skip · 41350002
```
Mark too-flaky test for skipping
```
  Jesse Zoldak committed Jul 17, 2015
  41350002 Browse Files
- Revert "Decorated instructor dashboard with sudo_required." · 2735b2b5
  Adam committed Jul 17, 2015
  
  2735b2b5 Browse Files
- Merge pull request #8837 from edx/benmcmorran/discussion-caching-3 · 2cf3390b
```
TNL-2389 Use discussion id map cache for thread creation and update
```
  Ben McMorran committed Jul 17, 2015
  2cf3390b Browse Files
- Merge branch 'release' into release-2015-07-08-conflict · d7b57309
```
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/templates/courseware/progress.html
	openedx/core/djangoapps/credit/tests/test_api.py
```
  Max Rothman committed Jul 17, 2015
  d7b57309 Browse Files
- Mark too-flaky test for skipping · ec6258a7
  Jesse Zoldak committed Jul 17, 2015
  
  ec6258a7 Browse Files
- Disable potentially flaky jasmine tests SOL-1065 · da68af5c
  Jesse Zoldak committed Jul 17, 2015
  
  da68af5c Browse Files
- Merge pull request #8953 from edx/vkaracic/TNL-394-additional-testing · c0de9429
```
TNL-394: Additional testing
```
  Vedran Karačić committed Jul 17, 2015
  c0de9429 Browse Files
- TNL-394: Additional testing · f5234b1a
```
This is an additional test for:
https://openedx.atlassian.net/browse/TNL-394
to test if the get_user function escapes values correctly.
```
  vkaracic committed Jul 17, 2015
  f5234b1a Browse Files
16 Jul, 2015 9 commits
- Merge pull request #8955 from edx/zoldak/cleanup-js-includes · e89d8e14
```
Remove unused includes
```
  Jesse Zoldak committed Jul 16, 2015
  e89d8e14 Browse Files
- 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
- Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required · 2d19eafa
```
Decorated instructor dashboard with sudo_required.
```
  Awais Jibran committed Jul 16, 2015
  2d19eafa Browse Files
- Merge pull request #8867 from edx/aamir-khan/ECOM-1816-credit-info-recept-page · 937ca38f
```
ECOM-1816: added the provider detail on the receipt page.
```
  Awais Qureshi committed Jul 16, 2015
  937ca38f Browse Files
- ECOM-1816: added the provider detail on the receipt page. · d5dda647
  aamir-khan committed Jul 16, 2015
  
  d5dda647 Browse Files
- Merge pull request #8932 from edx/tasawer/story/ecom-1858-provider-and-eligibility-details · ba06ab19
```
ECOM-1858
```
  tasawernawaz committed Jul 16, 2015
  ba06ab19 Browse Files
- Update code of get_eligibility api. · 1ded8b54
```
ECOM-1858
```
  Tasawer committed Jul 16, 2015
  1ded8b54 Browse Files
- Added DjangoSudo functionality for instructor dashboard and course team page · bc052db1
  Waheed Ahmed committed Jul 16, 2015
  
  bc052db1 Browse Files
- Merge pull request #8945 from ubc/wmono/update-authors · ae0e21b3
```
Update AUTHORS
```
  Sarina Canelake committed Jul 15, 2015
  ae0e21b3 Browse Files
15 Jul, 2015 13 commits
- Import missing settings module in tests of commerce views · 60c818f0
  Renzo Lucioni committed Jul 15, 2015
  
  60c818f0 Browse Files
- Final tweaks to API documentation updates · c2420b09
  Sylvia Pearce committed Jul 15, 2015
  
  c2420b09 Browse Files
- Merge pull request #8938 from edx/renzo/update-edx-oauth2-provider · 7f6e61b1
```
Update edx-oauth2-provider to 0.5.3
```
  Renzo Lucioni committed Jul 15, 2015
  7f6e61b1 Browse Files
- Update AUTHORS · 3c489c85
  William Ono committed Jul 15, 2015
  
  3c489c85 Browse Files
- Remove unused includes · 7aebf068
  Jesse Zoldak committed Jul 15, 2015
  
  7aebf068 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
- Merge pull request #7322 from edx/sarina/remove-old-analytics-dashboard · bb7ba752
```
Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag AN-4583
```
  Sarina Canelake committed Jul 15, 2015
  bb7ba752 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
- Update edx-oauth2-provider to 0.5.3 · ea37ada4
  Renzo Lucioni committed Jul 15, 2015
  
  ea37ada4 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