Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,796 Commits 1 Branch 0 Tags
601f160271f80be3bd52c7e7403e37d0fdf235e4
Commit Graph

5666 Commits

Author SHA1 Message Date
Andy Armstrong
601f160271 Merge pull request #6503 from edx/pull-out-lms-underscore-templates 
Pull discussion underscore templates out into individual files
 2015-07-28 22:33:34 -04:00
Christopher Lee
384fa77ee6 Merge pull request #8585 from edx/clee/discussion-api-order-and-sort-threads 
Thread sort key and direction for discussion api
 2015-07-28 18:50:48 -04:00
christopher lee
ed3bb27df8 Thread sort key and direction for discussion api 
Discussion API for thread sorting now takes the sort_by
parameter for the sort key such as by comment_count or
vote_count. Also takes the sort_direction parameter for
sorting the thread results.
 2015-07-28 14:34:30 -04:00
Ben McMorran
2bad5946e7 Merge pull request #8982 from edx/benmcmorran/team-discussion-context 
TNL-1943 Support thread context for team discussions
 2015-07-28 14:23:11 -04:00
Will Daly
af4a569e89 Merge pull request #9093 from edx/will/ecom-1905 
Allow users to submit initial verification at in-course checkpoints.
 2015-07-28 11:13:32 -07:00
Daniel Friedman
c8e4f2ca7d Merge pull request #9103 from edx/dan-f/fix-team-count 
Fix team count in topic serializers
 2015-07-28 14:10:01 -04:00
Ben Patterson
77d7a38bd5 Merge pull request #9099 from edx/benp/fix-lettuce-flaky-jul2015 
Fix flaky lettuce test.
 2015-07-28 13:40:05 -04:00
Ben McMorran
6b08bb20f8 TNL-1943 Support thread context for team discussions 2015-07-28 17:18:45 +00:00
Daniel Friedman
db6add1c59 Fix team count in topic serializers 
TNL-2892
 2015-07-28 13:14:18 -04:00
Ben Patterson
54062801fe Fix flaky test. 
This test failed on master because it saw "Loading" and did not wait.
 2015-07-28 11:52:28 -04:00
Will Daly
945abe72a8 Respond to code review feedback 2015-07-28 08:03:24 -07:00
Zia Fazal
41d9338fcc Merge pull request #9076 from edx/ziafazal/SOL-1062 
SOL-1062: generate verify_uuid for web based certificates also
 2015-07-28 19:57:34 +05:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files 
No need to go through Mako
 2015-07-28 09:36:31 -04:00
Peter Fogg
505b64730a Merge pull request #9082 from edx/peter-fogg/team-list-accessibility 
Give teams view error messages focus.
 2015-07-28 09:03:40 -04:00
Arbab Nazar
84af54b2b1 Merge pull request #8848 from edx/arbab/cert-whitelist-mod 
modify the whitelist cert script to take list of users
 2015-07-28 16:58:21 +05:00
Will Daly
47b81c9274 Allow users to submit initial verification at in-course checkpoints. 
* Combine verification and reverification photo submission end-points.
* Combine verification and reverification Backbone models.
* Allow deletion of verification status in Django admin.
* Initial verification from a checkpoint is associated with the checkpoint.
* Fix critical bug in which an invalid link was sent to Software Secure
  for the photo ID image of reverification attempts.
 2015-07-27 19:32:18 -07:00
Jim Abramson
3a1f9bd816 Merge pull request #9084 from edx/jsa/xcom-497 
commerce/api: Don’t allow setting expiration of prof modes.
 2015-07-27 17:13:03 -04:00
Peter Fogg
becf15e50a Give teams view error messages focus. 2015-07-27 16:22:34 -04:00
jsa
03717f3940 commerce/api: Don’t allow setting expiration of prof modes. 
XCOM-497
 2015-07-27 15:56:53 -04:00
jsa
6c83bff5be commerce/api: pass expiration_datetime when updating modes 2015-07-27 15:56:27 -04:00
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