Commits · 9e634a17b14835fed2230759eafc9470221d9048 · edx / edx-platform

22 Jul, 2015 4 commits
- Merge pull request #8849 from edx/ahsan/ECOM-1525-credit-eligibility-email-notification-updated · 9e634a17
```
credit eligibility and payment receipt email
```
  Ahsan Ulhaq committed Jul 22, 2015
  9e634a17 Browse Files
- credit eligibility and payment receipt email · 06b085f8
```
ECOM-1796
ECOM-1525
```
  Ahsan Ulhaq committed Jul 22, 2015
  06b085f8 Browse Files
- Merge pull request #8782 from edx/lliu/courseware-access · cb3140e9
```
Add courseware_access field to mobile API
```
  tlindaliu committed Jul 21, 2015
  cb3140e9 Browse Files
- MA-834: Add new fields to course enrollments endpoint in mobile API · 5aeccd52
```
Fields are start_type, start_display, and courseware_access.
```
  tlindaliu committed Jul 21, 2015
  5aeccd52 Browse Files
21 Jul, 2015 12 commits
- Merge pull request #8882 from edx/ahodges/randomize_strings · 9d574b4e
```
Fixes DOC-841 per multiple requests
```
  Alison Hodges committed Jul 21, 2015
  9d574b4e Browse Files
- Merge pull request #8894 from edx/andya/lms-requirejs · e5928bac
```
Implement RequireJS Optimizer in the LMS
```
  Christina Roberts committed Jul 21, 2015
  e5928bac Browse Files
- Merge pull request #8990 from edx/renzo/update-edx-oauth2-provider · fbe07845
```
Update edx-oauth2-provider to 0.5.5
```
  Renzo Lucioni committed Jul 21, 2015
  fbe07845 Browse Files
- Fixes DOC-841 per multiple requests · 6f70ed38
```
@stroilova @shnayder please verify that I have updated these files
correctly. @catong complete the thread started in email.
```
  Alison Hodges committed Jul 21, 2015
  6f70ed38 Browse Files
- Merge pull request #8959 from edx/will/separate-verification-and-upgrade-deadline · 81e677b7
```
Separate verification deadline from upgrade deadline
```
  Will Daly committed Jul 21, 2015
  81e677b7 Browse Files
- Merge pull request #8991 from edx/sarina/20150721-translations-update · 081549df
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Jul 21, 2015
  081549df Browse Files
- Merge pull request #8765 from edx/christina/lms-requirejs/notes · e9e5b5bd
```
Optimize edxnotes files.
```
  Christina Roberts committed Jul 21, 2015
  e9e5b5bd Browse Files
- Update translations (autogenerated message) · 2cc334ee
  Sarina Canelake committed Jul 21, 2015
  
  2cc334ee Browse Files
- Separate verification deadline from upgrade deadline · 25fa2ffc
```
* Add verification deadline model.
* Populate verification deadlines from course modes table.
* Update student dashboard to use verification deadlines.
* Update pay-and-verify view to use verification deadlines.
* Simplify Django admin for course modes and add validation.
* Add verification deadline to Django admin for course modes.
* Add UI for when the upgrade deadline is missed in the pay-and-verify flow.
```
  Will Daly committed Jul 21, 2015
  25fa2ffc Browse Files
- Update edx-oauth2-provider to 0.5.5 · 527def32
```
0.5.5 includes oauth2-provider's tests module
```
  Renzo Lucioni committed Jul 21, 2015
  527def32 Browse Files
- Optimize edxnotes files. · 497d76fa
  cahrens committed Jul 21, 2015
  
  497d76fa 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 16 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
- Optimize search usages. · ad16f9f9
  cahrens committed Jul 20, 2015
  
  ad16f9f9 Browse Files
- Convert cohort JS to use RequireJS. · eff80bae
  Diana Huang committed Jul 20, 2015
  
  eff80bae Browse Files
- Optimize finish_auth_factory. · 1ceb8a0d
```
TNL-2602
```
  Peter Fogg committed Jul 20, 2015
  1ceb8a0d Browse Files
- Optimize account settings and learner profile. · 4f0ab6f9
```
Also remove RequireJS dependency on mustache, and delete extra copy.
```
  cahrens committed Jul 20, 2015
  4f0ab6f9 Browse Files
- Implement RequireJS Optimizer in the LMS · 7b5f9b80
```
TNL-2487
```
  Andy Armstrong committed Jul 20, 2015
  7b5f9b80 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 6 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