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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Renzo Lucioni
b50c905865 Remove modulestore dependency from Enrollment API 
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.
 2015-07-20 13:41:19 -04:00
Max Rothman
80cf4d6ecb Merge pull request #8969 from edx/release-merge-test 
Release merge test
 2015-07-20 10:38:37 -04:00
Carson Gee
5cebad26e9 Additional configuration options for LTI provider feature. 2015-07-20 10:37:24 -04:00
Matt Drayer
4c0b00f45e Merge pull request #8952 from edx/ziafazal/SOL-1045 
SOL-1045: Enable certificate generation by students for self-paced courses
 2015-07-20 10:22:02 -04:00
Max Rothman
babf2420b3 Fix test failure due to missing settings import 2015-07-20 09:54:00 -04:00
tlindaliu
4fc3ee4773 Merge pull request #8838 from edx/lliu/has-access-rebased 
Changes to has_access
 2015-07-19 22:41:19 -04:00
tlindaliu
0c837adfce Refactor auth.has_access to auth.user_has_role 
Change name of method to clear up confusion with the access.has_access method.
 2015-07-19 20:42:29 -04:00
tlindaliu
e0840d2d43 MA-849: Change has_access return type 
New classes for the return type, and changes to the has_access function and tests to make them compatible.
 2015-07-19 20:42:29 -04:00
Jolyon Bloomfield
24edec35a9 Fixing footer printing (LMS) 2015-07-18 18:25:56 -04:00
Renzo Lucioni
4b4ce5f122 Merge pull request #8965 from edx/renzo/update-edx-oauth2-provider 
Update edx-oauth2-provider to 0.5.4
 2015-07-18 12:13:23 -04:00
Renzo Lucioni
45ff29653b Update edx-oauth2-provider to 0.5.4 2015-07-18 09:35:58 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test 
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
 2015-07-17 17:42:03 -04:00
Max Rothman
72ab1fbc8d Merge pull request #8967 from edx/max/release-merge-conflicts 
Max/release merge conflicts
 2015-07-17 17:23:47 -04:00
Adam
54b97c6065 Merge pull request #8966 from edx/revert-7404-waheed/plat407-decorate-instructor-dashboard-with-sudo-required 
Revert "Decorated instructor dashboard with sudo_required."
 2015-07-17 16:59:51 -04:00
Max Rothman
9d344f6753 Merge branch 'rc/2015-07-14' into release 
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	lms/djangoapps/commerce/urls.py
	lms/templates/courseware/progress.html
 2015-07-17 16:29:55 -04:00
Jolyon Bloomfield
2d0504c453 Fixing spacing within inline 2015-07-17 16:05:10 -04:00
srpearce
b12d3f6303 Merge pull request #8773 from edx/sylvia/docs/DOC-2102 
Sylvia/docs/doc 2102
 2015-07-17 15:42:59 -04:00
Jolyon Bloomfield
0c05f00526 Fixing spans inside inline divs 2015-07-17 15:25:13 -04:00
Max Rothman
2d216fc610 Merge pull request #8960 from edx/release-2015-07-08-conflict 
Release 2015-07-08 conflict
 2015-07-17 14:42:47 -04:00
Jesse Zoldak
626d3fb02d Merge pull request #8964 from edx/zoldak/MA-1038 
Skip test that had a hardcoded date expectation  MA-1038
 2015-07-17 13:57:39 -04:00
Jesse Zoldak
c2b4cf210f Skip test that had a hardcoded date expectation MA-1038 2015-07-17 13:05:58 -04:00
Jesse Zoldak
913a5dfe29 Merge pull request #8943 from edx/zoldak/more-flaky-js 
Disable potentially flaky jasmine tests
 2015-07-17 12:13:38 -04:00
Sylvia Pearce
eea3b31105 Delete white spaces that are causing test failures 2015-07-17 16:12:53 +00:00
Jesse Zoldak
41350002ba Merge pull request #8940 from edx/zoldak/SOL-1053-skip 
Mark too-flaky test for skipping
 2015-07-17 12:12:34 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00