Commits · 69a1a069e998d651f874010b9cafec6f24217a44 · edx / edx-platform

22 Jul, 2015 17 commits
- Merge pull request #9002 from edx/sarina/22072015-translations-update · 69a1a069
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Jul 22, 2015
  69a1a069 Browse Files
- Merge pull request #8266 from edx/talbs/fix-font-face-calls · b75f900b
```
LMS/Studio: Reduce font-face file calls
```
  Brian Talbot committed Jul 22, 2015
  b75f900b Browse Files
- Update translations (autogenerated message) · 7407280e
  Sarina Canelake committed Jul 22, 2015
  
  7407280e Browse Files
- Merge pull request #9000 from edx/andya/fix-discovery-Jasmine-tests · c0eaeb7e
```
Fix broken Jasmine tests for course discovery
```
  Andy Armstrong committed Jul 22, 2015
  c0eaeb7e Browse Files
- Merge pull request #8859 from edx/dan-f/teams-list-view · d61d193d
```
Teams List View
```
  Daniel Friedman committed Jul 22, 2015
  d61d193d Browse Files
- Fix broken Jasmine tests for course discovery · a328770c
  Andy Armstrong committed Jul 22, 2015
  
  a328770c Browse Files
- Add teams-for-topic list view to Teams page. · 21b39ca4
```
TNL-1898

Also adds a generic paginated list view and Teams list view. The
common PaginatedView takes a collection and a view class for its items
and creates a header and footer with correct pagination. The topics
list view is refactored to use this generic view.

Authors:
  - Peter Fogg <pfogg@edx.org>
  - Daniel Friedman <dfriedman58@gmail.com>
```
  Daniel Friedman committed Jul 22, 2015
  21b39ca4 Browse Files
- added incontext option to system message styles for teams · 6d6bfa7f
  Frances Botsford committed Jul 22, 2015
  
  6d6bfa7f Browse Files
- Merge pull request #8973 from edx/dsego/SOL-731 · 6ee90509
```
Update edx-search, fix lms filter generator and courseware index tests
```
  Davorin Šego committed Jul 22, 2015
  6ee90509 Browse Files
- Update edx-search, fix lms filter generator and courseware index tests · a43cf589
  Davorin Sego committed Jul 22, 2015
  
  a43cf589 Browse Files
- Merge pull request #8998 from edx/merge-release-into-master · 845e1d62
```
Merge release into master
```
  Adam committed Jul 22, 2015
  845e1d62 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · e5158423
```
Conflicts:
	requirements/edx/github.txt
```
  Adam Palay committed Jul 22, 2015
  e5158423 Browse Files
- 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
- 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 20 commits
- Fix URL trailing slash bug in teams endpoint · db6755fa
  Daniel Friedman committed Jul 21, 2015
  
  db6755fa Browse Files
- Add Backbone model and collection for teams. · 106e3127
  Daniel Friedman committed Jul 21, 2015
  
  106e3127 Browse Files
- 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
- 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
- Optimize edxnotes files. · 497d76fa
  cahrens committed Jul 21, 2015
  
  497d76fa Browse Files
- PLAT-734 Fix slow transaction due to multiple calls to unpickling · 274e6de2
  utkjad committed Jul 21, 2015
  
  274e6de2 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 3 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