Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
David Ormsbee
8d9e907635 Merge pull request #9070 from edx/ormsbee/test_ms_class_setup_teardown 
Modulestore test base class using setUpClass() and tearDownClass()
 2015-07-27 15:05:46 -04:00
John Eskew
756008aa9b Merge pull request #8768 from open-craft/jump_to_children_ospr 
Jump to children
 2015-07-27 13:42:32 -04:00
David Ormsbee
58f36d3e93 Enable faster ModuleStore tests with SharedModuleStoreTestCase. 
This is a new TestCase base class, intended for situations where
you only want to initialize course content in the setUpClass(),
as opposed to setUp(). This is done for performance reasons, since
many test cases only use courses in a read-only fashion,
particularly in LMS tests.

This commit also converts the following modules to use this new
base class:

  lms/djangoapps/ccx/tests/test_ccx_modulestore.py (38s -> 4s)
  lms/djangoapps/discussion_api/tests/test_api.py (2m45s -> 51s)
  lms/djangoapps/teams/tests/test_views.py (1m17s -> 33s)
 2015-07-27 13:02:16 -04:00
Clinton Blackburn
2dc781005e Merge pull request #9071 from edx/clintonb/mode-names 
Corrected CourseMode Display Name
 2015-07-27 12:49:15 -04:00
Clinton Blackburn
56e9625a8f Corrected CourseMode Display Name 
The Commerce API now sets the correct display name for known course modes, but continues to default to the mode slug for unknown course modes.
 2015-07-27 11:26:08 -04:00
Awais Jibran
d838686c1b Merge pull request #9043 from edx/aj/tnl-2879-xml-course-error 
Grading doesn't work for XML courses
 2015-07-27 18:38:54 +05:00
Zia Fazal
588a4e64ed generate verify_uuid for web based certificates also 2015-07-27 17:09:38 +05:00
Braden MacDonald
5aa127a9bf Merge pull request #8995 from open-craft/masquerade-cohorts 
Allow previewing cohorted content when masquerading (SOL-1064)
 2015-07-26 11:18:23 -07:00
Peter Fogg
454a0adab1 Merge pull request #9061 from edx/peter-fogg/i18n-cleanup 
Convert to named arguments for localized strings.
 2015-07-24 16:08:40 -04:00
Peter Fogg
4b0c3be75c Convert to named arguments for localized strings. 2015-07-24 14:51:17 -04:00
Christina Roberts
a66d4e481a Merge pull request #9054 from edx/christina/tnl-2848 
Sort the grade cutoffs.
 2015-07-24 14:14:50 -04:00
Peter Fogg
8fc5444095 Merge pull request #9020 from edx/peter-fogg/404-not-live 
Redirect to dashboard from non-live courses.
 2015-07-24 13:49:45 -04:00
Peter Fogg
c8ed59ac61 Redirect to dashboard from non-live courses. 
TNL-2693
 2015-07-24 13:05:47 -04:00
cahrens
1b93dd122e Sort the grade cutoffs. 
TNL-2848
 2015-07-24 12:52:56 -04:00
Christina Roberts
b7a74f5790 Merge pull request #9044 from edx/christina/verify-tests-running 
Teams-related JS test cleanup
 2015-07-24 12:14:10 -04:00
cahrens
2eae368136 Fix the teams factory spec so it runs. 2015-07-24 10:25:53 -04:00
Awais Jibran
334005ef2f Grading doesn't work for XML courses 
TNL-2879
 2015-07-24 19:17:46 +05:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration . 
TNL-2413
 2015-07-24 17:03:46 +05:00
Christopher Lee
a76eb7de7a Merge pull request #8571 from edx/clee/discussion-api-view-thread-endorsed 
Added get unanswered/unread threads in discussion api
 2015-07-23 13:12:01 -04:00
christopher lee
5d8d1619a0 Added unanswered/unread query params for thread in discussion api 
Discusion API now takes a view parameter when getting a thread list.
This view parameter only takes "unread" or "unanswered" as possible
values.
 2015-07-23 11:41:08 -04:00
Matt Drayer
31b2be17d6 Merge pull request #9010 from edx/ziafazal/SOL-1045-hide-generate-certs-button 
SOL-1045: hiding generated certificate button in case of self paced courses
 2015-07-23 10:13:23 -04:00
Zia Fazal
5925edbfbc hiding generated certificate button in case of self paced courses 2015-07-23 17:02:34 +05:00
Peter Fogg
948f652cf0 Remove unnecessary DB call in team pagination. 2015-07-22 15:46:09 -04:00
Daniel Friedman
d61d193dab Merge pull request #8859 from edx/dan-f/teams-list-view 
Teams List View
 2015-07-22 13:24:02 -04:00
Daniel Friedman
21b39ca467 Add teams-for-topic list view to Teams page. 
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>
 2015-07-22 12:02:40 -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
Braden MacDonald
0defc55b84 Allow previewing cohorted content when masquerading 2015-07-22 00:54:15 -07: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
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
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
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
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
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
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
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
Kyle McCormick
a9c4774fe7 PLA-749 Fix student dashboard for users enrolled in CCX courses 2015-07-20 14:03:50 -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
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