Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,023 Commits 1 Branch 0 Tags
4e9b7ea9ec66a1d68566653d77316a2ca5f8339e
Commit Graph

5731 Commits

Author SHA1 Message Date
Christina Roberts
4e9b7ea9ec Merge pull request #9235 from edx/christina/tnl-1776 
Handle case of video in a content library with no transcripts.
 2015-08-10 10:08:52 -04:00
cahrens
2b57603436 Handle case of video in a content library with no transcripts. 
This partially addresses TNL-1776
 2015-08-07 13:19:12 -04:00
Peter Fogg
9c58489b38 Merge pull request #9223 from edx/peter-fogg/discussion-admin-delete 
Ensure that discussion admins can delete team posts.
 2015-08-07 11:03:50 -04:00
Christina Roberts
dbe74ea340 Merge pull request #9221 from edx/christina/less-assets 
Christina/less assets
 2015-08-07 10:34:20 -04:00
Bill DeRusha
69a460fdca Merge pull request #9206 from edx/bderusha/teams-full-country-language-names 
Add Full Country & Language Names to Teams
 2015-08-07 09:49:48 -04:00
Peter Fogg
90d8774745 Test that discussion admins can delete team posts. 2015-08-07 09:46:12 -04:00
cahrens
68645db38b Reduce dependency on courseware_js. 
TNL-2945
 2015-08-07 09:14:06 -04:00
cahrens
a7c06fd296 Allow image files to be cached. 2015-08-06 14:56:28 -04:00
Peter Fogg
e0e895a531 Add Bok Choy tests for teams page URL routing. 2015-08-06 13:32:48 -04:00
Bill DeRusha
2398824bba Add Full Country & Language Names to Teams [TNL-2891] 2015-08-06 13:17:01 -04:00
Ned Batchelder
117bc4a94e Merge pull request #9216 from edx/ned/speed-i18n-extract 
Ignore more directories to speed up extracting i18n strings.
 2015-08-06 12:37:12 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI. 
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
 2015-08-06 11:15:56 -04:00
Daniel Friedman
f5840489a0 Allow editing of own post in team discussion 2015-08-06 11:15:55 -04:00
cahrens
41173fefee Only verify course access for threads with course context. 2015-08-06 11:15:55 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view 
TNL-2515
 2015-08-06 11:15:55 -04:00
Ned Batchelder
2300f382cf Ignore more directories to speed up extracting i18n strings. 
Also, remove the one use of _() in a test feature, since there's no
point.
 2015-08-06 10:39:04 -04:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Nimisha Asthagiri
73810f6a23 Merge pull request #8888 from edx/mobile/MA-977-supports 
MA-977 Use "supports" decorator on XBlocks for multi-device support
 2015-08-05 12:29:25 -04:00
Nimisha Asthagiri
5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support 2015-08-05 11:37:33 -04:00
muhammad-ammar
69450fce47 create a new team 
TNL-1899
 2015-08-05 17:55:26 +05:00
John Eskew
56da28526e Merge pull request #9155 from edx/jeskew/csm_api_events_to_datadog 
Add DataDog histogram events to DjangoXBlockUserStateClient class.
 2015-08-04 18:19:55 -04:00
John Eskew
f3e59acbf1 Add DataDog histogram events to DjangoXBlockUserStateClient class. 2015-08-04 17:14:05 -04:00
Diana Huang
39cccac7e5 Merge pull request #9176 from edx/diana/add-team-creator-automatically 
Add the creator of a team to that team.
 2015-08-04 17:06:54 -04:00
Diana Huang
1c6c1654be Add the creator of a team to that team. 
TNL-1908
 2015-08-04 16:08:40 -04:00
Clinton Blackburn
f273c5a7e6 Merge pull request #9175 from edx/clintonb/commerce-api-course-verification-deadline 
Exposing course verification deadline via Commerce API
 2015-08-04 14:34:01 -04:00
Clinton Blackburn
b2b40e2770 Exposing course verification deadline via Commerce API 
The course now supports reading and writing the verification deadline attribute.

XCOM-536
 2015-08-04 14:04:04 -04:00
Dennis Jen
009e8a1050 Merge pull request #9085 from edx/dsjen/return-courses-via-roles 
Optimize OpenID Course Claims for non-global-staff users.
 2015-08-04 09:37:23 -04:00
Ned Batchelder
ceb5655b2d Merge pull request #9171 from edx/ned/update-pylint 
Update pylint and astroid, reduces pylint count by 400
 2015-08-04 09:28:35 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Dennis Jen
f0d1772da3 Optimize OpenID Course Claims for non-global-staff users. 2015-08-03 16:48:28 -04:00
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Clinton Blackburn
880da5a09d Exposing course name via Commerce API 
The course now includes a read-only name attribute.

XCOM-536
 2015-08-03 15:16:45 -04:00
Peter Pinch
53db053c18 Merge pull request #8986 from jazkarta/remove-ccx-enrollment 
Use the standard enrollment table instead of a custom CCX table for CCX enrollments
 2015-08-03 13:18:41 -04:00
Diana Huang
a9de5c90a4 Merge pull request #9050 from edx/christina/tnl-2677 
Correct email settings URL and rename variable.
 2015-08-03 12:56:35 -04:00
John Eskew
ffc8a11789 Merge pull request #9092 from cpennington/user-state-client-tests 
User state client tests
 2015-08-03 12:25:05 -04:00
Peter Fogg
b47922cea0 Make team chat icon appear. 2015-08-03 10:09:40 -04:00
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