Commits · eab0cbdd85c5cd901f2590cc460b652844d923cf · edx / edx-platform

21 Jul, 2015 4 commits
- Better fix for open ended grading. · eab0cbdd
  Jonathan Piacenti committed Jul 21, 2015
  
  eab0cbdd Browse Files
- Addressed notes. · 405b266f
  Jonathan Piacenti committed Jul 21, 2015
  
  405b266f Browse Files
- Add ability to activate a child block via jump_to_id. · a6ae44a0
  Jonathan Piacenti committed Jul 21, 2015
  
  a6ae44a0 Browse Files
- Merge pull request #8573 from edx/sylvia/docs/InstDashHousekeeping · 93e31e61
```
Clean up some e-commerce strings on the Instructor Dashboard
```
  srpearce committed Jul 21, 2015
  93e31e61 Browse Files
20 Jul, 2015 11 commits
- Clean up some e-commerce strings on the Instructor Dashboard · 3ab45fba
  Sylvia Pearce committed Jul 20, 2015
  
  3ab45fba Browse Files
- Merge pull request #8983 from edx/will/ecom-1912-and-1913 · a725e842
```
Credit progress page formatting bugfixes.
```
  Will Daly committed Jul 20, 2015
  a725e842 Browse Files
- Merge pull request #8927 from edx/renzo/enrollment-api-sans-modulestore · 4619e9f4
```
Remove modulestore dependency from Enrollment API
```
  Renzo Lucioni committed Jul 20, 2015
  4619e9f4 Browse Files
- Credit progress page formatting bugfixes. · d3f58b68
```
* Correctly format the student's full name on the progress page.
* Add tests for progress page credit requirements display.
* Display grade percentage for credit requirement on progress page
```
  Will Daly committed Jul 20, 2015
  d3f58b68 Browse Files
- Remove modulestore dependency from Enrollment API · b50c9058
```
Sets the Enrollment API free of the modulestore by replacing modulestore queries with calls to the CourseOverview model. Course deletion invalidates the corresponding CourseOverview. XCOM-462.
```
  Renzo Lucioni committed Jul 20, 2015
  b50c9058 Browse Files
- Merge pull request #8969 from edx/release-merge-test · 80cf4d6e
```
Release merge test
```
  Max Rothman committed Jul 20, 2015
  80cf4d6e Browse Files
- Merge pull request #8952 from edx/ziafazal/SOL-1045 · 4c0b00f4
```
SOL-1045: Enable certificate generation by students for self-paced courses
```
  Matt Drayer committed Jul 20, 2015
  4c0b00f4 Browse Files
- Fix test failure due to missing settings import · babf2420
  Max Rothman committed Jul 20, 2015
  
  babf2420 Browse Files
- Merge pull request #8838 from edx/lliu/has-access-rebased · 4fc3ee47
```
Changes to has_access
```
  tlindaliu committed Jul 19, 2015
  4fc3ee47 Browse Files
- Refactor auth.has_access to auth.user_has_role · 0c837adf
```
Change name of method to clear up confusion with the access.has_access method.
```
  tlindaliu committed Jul 19, 2015
  0c837adf Browse Files
- MA-849: Change has_access return type · e0840d2d
```
New classes for the return type, and changes to the has_access function and tests to make them compatible.
```
  tlindaliu committed Jul 19, 2015
  e0840d2d Browse Files
18 Jul, 2015 2 commits
- Merge pull request #8965 from edx/renzo/update-edx-oauth2-provider · 4b4ce5f1
```
Update edx-oauth2-provider to 0.5.4
```
  Renzo Lucioni committed Jul 18, 2015
  4b4ce5f1 Browse Files
- Update edx-oauth2-provider to 0.5.4 · 45ff2965
  Renzo Lucioni committed Jul 18, 2015
  
  45ff2965 Browse Files
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 5 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