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

11883 Commits

Author SHA1 Message Date
Calen Pennington
584453202f Use the correct attribute when accessing StudentModuleHistory creation dates 2015-08-10 14:56:03 -04:00
Calen Pennington
34892b9680 Add more information when logging data about differing history and score entries 2015-08-10 14:56:03 -04:00
Calen Pennington
93b1b69854 Don't violate the empty-dict vs None semantics of student_module during delete_many 2015-08-10 14:42:18 -04:00
David Baumgold
5953debee1 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:45:09 -04:00
Peter Fogg
42e78463a7 Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment" 
This reverts commit 53db053c18, reversing
changes made to 386a8a27dd.
 2015-08-07 16:59:56 -04:00
Peter Fogg
440c1575e0 Revert "Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model" 
This reverts commit d80e83649a, reversing
changes made to fb5506a6f7.
 2015-08-07 16:59:50 -04:00
Brandon DeRosier
235c45f1fb Add the CcxMembership model back 2015-08-07 15:38:25 -04:00
Renzo Lucioni
3a735591d1 Emit INFO-level messages when a mode does not have a SKU 2015-08-07 14:11:42 -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
fd31c68404 Include coffee dependency files in discussion_js. 2015-08-07 09:14:11 -04:00
cahrens
e95e23faf1 Allow discussion vendor files to be bundled. 
Improve client-side performance.
 2015-08-07 09:14:11 -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
Marco Morales
dd67f8aa72 updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming 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
David Baumgold
df936837ae Merge pull request #9210 from edx/dont-click-here 
Should never just link the word 'here'
 2015-08-06 10:10:43 -04:00
David Baumgold
668c7fdca3 Should never just link the word 'here' 2015-08-05 15:53:51 -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
Vedran Karačić
2e3242eec9 Merge pull request #9165 from edx/vkaracic/TNL-394-confirmation-msg 
TNL-394: Fixed confirmation message display for StaffDebug actions
 2015-08-04 21:39:43 +02: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
Ned Batchelder
8477146ca8 Merge pull request #9189 from edx/ned/fix-django-debug-toolbar-settings 
We should only add the DjDT urls if it is enabled.
 2015-08-04 12:56:29 -04:00
Ned Batchelder
8476baf4dd We should only add the DjDT urls if it is enabled. 2015-08-04 11:01:45 -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
vkaracic
0fb1bf6ff9 Fixed confirmation message display for StaffDebug actions 
This is an addition to TNL-394:
https://openedx.atlassian.net/browse/TNL-394
Fixed the confirmation messages that didn't appear when an escapable character
is in the location name of the problem.
 2015-08-04 07:59:00 +00: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
David Baumgold
386a8a27dd Merge pull request #8936 from edx/db/remove-unneeded-template-block 
Remove unneeded block from courses.html template
 2015-08-03 13:13:58 -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