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

11823 Commits

Author SHA1 Message Date
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
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
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
Diana Huang
c12c2933a7 Make context for threads more implicit. 2015-07-31 08:58:01 -04: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
Vedran Karačić
c9b65b0c2e Merge pull request #9131 from edx/revert-9037-vkaracic/TNL-394-confirmation-msg 
Revert "TNL-394: Fixed the confirmation message"
 2015-07-30 17:53:22 +02: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
Jim Abramson
bf00fe0ecb Merge pull request #9124 from edx/jsa/no-course-discovery-in-devstack 
disable course discovery feature by default in devstack.
 2015-07-30 10:33:06 -04:00
Peter Fogg
7b01ed6171 Merge pull request #9102 from edx/peter-fogg/indices-teams 
Add index on CourseTeam name.
 2015-07-30 10:32:31 -04:00
Vedran Karačić
9ddf5c2e1e Revert "TNL-394: Fixed the confirmation message" 2015-07-30 16:09:48 +02:00
Ahsan Ulhaq
ab69e0df1c Copy & Styling for Credit messages on Dashboard 
ECOM-1917
 2015-07-30 14:33:40 +05:00
jsa
ba239125f1 disable course discovery feature by default in devstack. 2015-07-29 17:40:57 -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
Ned Batchelder
7a7a867e6a Fix Django Debug Toolbar circular imports 
There's an "explicit" way to configure Django Debug Toolbar that isn't
prone to circular import errors:

http://django-debug-toolbar.readthedocs.org/en/1.0/installation.html#explicit-setup

Do that.
 2015-07-29 16:18:38 -04:00
Mushtaq Ali
6964690097 Merge pull request #9096 from edx/mushtaq/tnl-2609-fix-url-link-issue-markdown-editor 
Fix markdown editor reference link having colon issue
 2015-07-29 22:05:46 +05:00
Ben McMorran
44d4e28053 Add discussion_topic_id to Team API docstrings 2015-07-29 14:52:58 +00:00
frances botsford
f8d1776698 Merge pull request #8972 from jolyonb/jolyonb/discussion 
Small printing fixes (LMS)
 2015-07-29 10:10:47 -04:00
aamir-khan
459ccae028 ECOM-1817: updated the course name and also styling for the provider 2015-07-29 15:12:07 +05: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
mushtaqali
bfd49b2cd0 Fix markdown editor reference link having colon issue 2015-07-28 22:32:57 +05: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
Aamir
1061274b52 Merge pull request #9078 from edx/aamir-khan/ECOM-1916-grade-progress-page 
ECOM-1916: updated the dispaly
 2015-07-28 17:06:10 +05: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
aamir-khan
9f0f081a1f ECOM-1916: updated the dispaly 2015-07-28 14:59:48 +05:00
Davorin Sego
8d6df18357 Course discovery UI improvements 2015-07-28 11:59:44 +02:00