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
Andy Armstrong
d98354d05d Merge pull request #9133 from edx/andya/remove-mustache-from-discussions 
Remove Mustache usage from discussions
 2015-08-01 20:48:50 -04:00
Andy Armstrong
540e8464d9 Remove Mustache usage from discussions 2015-08-01 17:13:14 -04:00
Linda Liu
8aa2d67b6d Merge pull request #8946 from edx/lliu/view-course-access 
Add access response information into view_course_access
 2015-08-01 13:55:25 -04:00
Calen Pennington
83c10331fa Add a test of submission history display 2015-08-01 08:13:25 -04:00
Calen Pennington
6ba611cb5f Remove remove_input_state.py, as it was one-time fix code, and is not worth porting to the new interface 2015-08-01 08:13:25 -04:00
Calen Pennington
aa374ca12a Make DjangoXBlockUserStateClient pass semantic tests 
This required the following changes to the DjangoXBlockUserStateClient
semantics:

1) Changes get/get_many to return XBlockUserState tuples, rather
than state dictionaries or (block_key, state) tuples.
2) Raises DoesNotExist if get_history is called on an XBlock that has
had no data saved to it.
3) Returns XBlockUserState tuples as the results of get_history.
 2015-08-01 08:13:25 -04:00
Calen Pennington
53b37e7412 Remove extraneous documentation, contracts, and method definitions 2015-08-01 08:13:25 -04:00
Calen Pennington
704ae7139a Add a subclass-implementation of the UserStateClient tests 2015-08-01 08:12:04 -04:00
Carlos de la Guardia
458ed0a64e Use the standard enrollment table instead of a custom CCX table for CCX 
enrollments.

The goal for this PR is to have a single mechanism for registering users and
reducing the number of places where special-casing for ccx courses is needed. The
migration at this point is purposefully limited to convert ccx memberships into
student enrollments when moving forward. No backward migration is in place at the
moment. The ccx membership tables are not removed at this time. It is possible to go
backwards and forwards multiple times with no errors or data loss.
 2015-08-01 02:59:10 -05:00
Ben McMorran
6530d5e3ec Merge pull request #9160 from edx/benmcmorran/dont-cohort-teams 
TNL-2913 Extend is_commentable_cohorted to support teams
 2015-07-31 21:46:56 -04:00
Ben McMorran
6d48e1360d Extend is_commentable_cohorted to support teams 2015-07-31 20:22:31 +00:00
utkjad
b85b50d11a Removing @contract 2015-07-31 17:44:16 +00:00
Christina Roberts
b06e46c1db Merge pull request #9113 from edx/christina/team-discussion-permissions 
Christina/team discussion permissions
 2015-07-31 12:32:30 -04:00
cahrens
614a92957c Correct email settings URL and rename variable. 
TNL-2677
 2015-07-31 11:39:19 -04:00
Ben McMorran
3a70b87787 Merge pull request #9143 from edx/benmcmorran/move-is-commentable-cohorted 
Move is_commentable_cohorted to django_comment_client
 2015-07-31 10:43:53 -04:00
Diana Huang
bc2892f2d3 Merge pull request #9142 from edx/diana/context-aware-comment-client 
Make context for threads more implicit.
 2015-07-31 10:29:29 -04:00
Sarina Canelake
db2d8f6594 Allow microsites to use logistration page (ECOM-1976) 2015-07-31 09:33:59 -04:00
tlindaliu
3b483d14bc MA-851: Add access response information into view_course_access 2015-07-31 09:30:40 -04:00
Diana Huang
c12c2933a7 Make context for threads more implicit. 2015-07-31 08:58:01 -04:00
Tim Krones
050b747b1d Display start date, end date, and number of sections (weeks) on "Course 
Info" tab of instructor dashboard.
 2015-07-31 09:38:09 +02:00
cahrens
9d3e2c1a08 Ignore team membership for privileged users. 2015-07-30 17:06:40 -04:00
Ben McMorran
4a78271851 Move is_commentable_cohorted to django_comment_client 2015-07-30 20:59:34 +00:00
Peter Fogg
b2545ce8a8 Merge pull request #9137 from edx/peter-fogg/test-team-list-fix 
Revert "Remove unnecessary DB call in team pagination."
 2015-07-30 15:38:07 -04:00
cahrens
01c22531d7 Add team permission check on commentable_id. 
TNL-2864
 2015-07-30 13:56:08 -04:00
Davorin Šego
65eb26b7b4 Merge pull request #9004 from edx/dsego/discovery-ui-improvements 
Improve course discovery filtering and empty search
 2015-07-30 17:34:39 +02:00
Peter Fogg
95b8d72347 Revert "Remove unnecessary DB call in team pagination." 
This reverts commit 948f652cf0.
 2015-07-30 10:52:13 -04:00
Peter Fogg
dfafb03ebc Add New Relic tracing to TeamsListView.get. 2015-07-29 17:38:41 -04:00
Peter Fogg
6473cd9bd8 Add index on CourseTeam name. 2015-07-29 17:38:41 -04:00
Ben McMorran
44d4e28053 Add discussion_topic_id to Team API docstrings 2015-07-29 14:52:58 +00:00
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
Davorin Sego
8d6df18357 Course discovery UI improvements 2015-07-28 11:59:44 +02: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