Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,279 Commits 1 Branch 0 Tags
ca1f76cedb030dac503aa7a2d5ccd8dcaf187cfd
Commit Graph

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Davorin Sego
a43cf589e0 Update edx-search, fix lms filter generator and courseware index tests 2015-07-22 16:44:01 +02:00
Adam
845e1d6296 Merge pull request #8998 from edx/merge-release-into-master 
Merge release into master
 2015-07-22 09:49:24 -04:00
Adam Palay
e515842395 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-07-22 08:10:26 -04:00
Adam
5fe01036a4 Merge pull request #8978 from edx/hotfix/2015-07-20 
PLA-749 Fix student dashboard for users enrolled in CCX courses
 2015-07-22 08:04:25 -04:00
Ahsan Ulhaq
9e634a17b1 Merge pull request #8849 from edx/ahsan/ECOM-1525-credit-eligibility-email-notification-updated 
credit eligibility and payment receipt email
 2015-07-22 14:20:16 +05:00
Syed Hassan Raza
7b1bcc3250 start-date-reset-to-DEFAULT_START_DATE 2015-07-22 13:17:48 +05:00
Braden MacDonald
0defc55b84 Allow previewing cohorted content when masquerading 2015-07-22 00:54:15 -07:00
Ahsan Ulhaq
06b085f8b4 credit eligibility and payment receipt email 
ECOM-1796
ECOM-1525
 2015-07-22 12:34:38 +05:00
tlindaliu
cb3140e953 Merge pull request #8782 from edx/lliu/courseware-access 
Add courseware_access field to mobile API
 2015-07-21 23:54:12 -04:00
tlindaliu
5aeccd520b MA-834: Add new fields to course enrollments endpoint in mobile API 
Fields are start_type, start_display, and courseware_access.
 2015-07-21 22:44:50 -04:00
Daniel Friedman
db6755fae8 Fix URL trailing slash bug in teams endpoint 2015-07-21 17:02:47 -04:00
Daniel Friedman
106e3127d8 Add Backbone model and collection for teams. 2015-07-21 17:02:47 -04:00
Alison Hodges
9d574b4e57 Merge pull request #8882 from edx/ahodges/randomize_strings 
Fixes DOC-841 per multiple requests
 2015-07-21 15:25:12 -04:00
Christina Roberts
e5928bacc2 Merge pull request #8894 from edx/andya/lms-requirejs 
Implement RequireJS Optimizer in the LMS
 2015-07-21 15:07:49 -04:00
Renzo Lucioni
fbe0784541 Merge pull request #8990 from edx/renzo/update-edx-oauth2-provider 
Update edx-oauth2-provider to 0.5.5
 2015-07-21 15:05:24 -04:00
Alison Hodges
6f70ed38b4 Fixes DOC-841 per multiple requests 
@stroilova @shnayder please verify that I have updated these files
correctly. @catong complete the thread started in email.
 2015-07-21 13:23:33 -04:00
Will Daly
81e677b713 Merge pull request #8959 from edx/will/separate-verification-and-upgrade-deadline 
Separate verification deadline from upgrade deadline
 2015-07-21 09:50:53 -07:00
Sarina Canelake
081549df85 Merge pull request #8991 from edx/sarina/20150721-translations-update 
Update translations (autogenerated message)
 2015-07-21 12:43:15 -04:00
Christina Roberts
e9e5b5bd6e Merge pull request #8765 from edx/christina/lms-requirejs/notes 
Optimize edxnotes files.
 2015-07-21 11:47:50 -04:00
Sarina Canelake
2cc334eed0 Update translations (autogenerated message) 2015-07-21 11:45:01 -04:00
Will Daly
25fa2ffc2d Separate verification deadline from upgrade deadline 
* 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.
 2015-07-21 08:43:14 -07:00
Renzo Lucioni
527def32e4 Update edx-oauth2-provider to 0.5.5 
0.5.5 includes oauth2-provider's tests module
 2015-07-21 11:37:07 -04:00
Max Rothman
3ede0b0d0a Merge pull request #8988 from edx/max/update-oauth2-provider 
Update edx-oauth2-provider to 0.5.4
 2015-07-21 11:23:48 -04:00
Utkarsh
231059c24b Merge pull request #8989 from edx/utkjad/fixtemp 
PLAT-734 Fix slow transaction due to multiple calls to unpickling
 2015-07-21 11:07:12 -04:00
Calen Pennington
8e1686c8cf Merge pull request #8980 from cpennington/cache-ccx-lookups 
Cache ccx lookups
 2015-07-21 11:06:43 -04:00
Calen Pennington
22e4fb30f5 Merge pull request #8987 from edx/ormsbee/inline_discussion_ccx_perf_hotfix 
Ormsbee/inline discussion ccx perf hotfix
 2015-07-21 11:06:33 -04:00
Renzo Lucioni
f50f045bcf Update edx-oauth2-provider to 0.5.4 
Conflicts:
	requirements/edx/github.txt
 2015-07-21 11:02:46 -04:00
cahrens
497d76fa54 Optimize edxnotes files. 2015-07-21 10:54:02 -04:00
Jonathan Piacenti
c8339072dd Fixup for tests. 2015-07-21 14:39:19 +00:00
Jonathan Piacenti
eab0cbdd85 Better fix for open ended grading. 2015-07-21 14:39:19 +00:00
Jonathan Piacenti
405b266fa7 Addressed notes. 2015-07-21 14:39:18 +00:00
Jonathan Piacenti
a6ae44a0db Add ability to activate a child block via jump_to_id. 2015-07-21 14:39:18 +00:00
utkjad
274e6de22b PLAT-734 Fix slow transaction due to multiple calls to unpickling 2015-07-21 13:56:38 +00:00
srpearce
93e31e6149 Merge pull request #8573 from edx/sylvia/docs/InstDashHousekeeping 
Clean up some e-commerce strings on the Instructor Dashboard
 2015-07-21 09:27:34 -04:00
Sylvia Pearce
3ab45fba0c Clean up some e-commerce strings on the Instructor Dashboard 2015-07-20 18:29:17 -04:00
Will Daly
a725e84233 Merge pull request #8983 from edx/will/ecom-1912-and-1913 
Credit progress page formatting bugfixes.
 2015-07-20 14:14:53 -07:00
Renzo Lucioni
4619e9f458 Merge pull request #8927 from edx/renzo/enrollment-api-sans-modulestore 
Remove modulestore dependency from Enrollment API
 2015-07-20 17:01:13 -04:00
Will Daly
d3f58b689f Credit progress page formatting bugfixes. 
* 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
 2015-07-20 13:08:13 -07:00
David Ormsbee
693901529c Instead of calculating the course's usage key, just follow the parent chain. 2015-07-20 15:42:01 -04:00
David Ormsbee
abcdc05af4 Return just the CourseDescriptor in discussions get_course() 
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
 2015-07-20 15:42:00 -04:00
Calen Pennington
0e8b303d2e Cache CcxFieldOverrides on a per-request basis 2015-07-20 14:54:27 -04:00
Calen Pennington
63ddbd9b03 Cache CustomCourseForEdX object lookup per-request 2015-07-20 14:53:11 -04:00
Calen Pennington
1e84ad9941 Make CcxFactory fill in a coach if one isn't supplied 2015-07-20 14:53:10 -04:00
Calen Pennington
7b0c22afe9 Make request_cache easier to use 2015-07-20 14:53:10 -04:00
cahrens
ad16f9f968 Optimize search usages. 2015-07-20 14:24:30 -04:00
Kyle McCormick
a9c4774fe7 PLA-749 Fix student dashboard for users enrolled in CCX courses 2015-07-20 14:03:50 -04:00
Diana Huang
eff80baed2 Convert cohort JS to use RequireJS. 2015-07-20 13:59:55 -04:00
Peter Fogg
1ceb8a0d66 Optimize finish_auth_factory. 
TNL-2602
 2015-07-20 13:59:55 -04:00
cahrens
4f0ab6f9c8 Optimize account settings and learner profile. 
Also remove RequireJS dependency on mustache, and delete extra copy.
 2015-07-20 13:59:55 -04:00
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS 
TNL-2487
 2015-07-20 13:59:54 -04:00