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

14265 Commits

Author SHA1 Message Date
Bill DeRusha
716c1f74cf Merge pull request #9237 from edx/bderusha/teams-expand-users-api-fix 
Team API include correct info when expanding users
 2015-08-12 15:27:48 -04:00
Christopher Lee
a8d937ce1f Merge pull request #9278 from edx/clee/dapi-update-mark-as-read 
Added optional mark_as_read field to comments in Discussion API
 2015-08-12 14:39:52 -04:00
Bill DeRusha
09acca2de8 Team API include correct info when expanding users TNL-2975 
Create read-only serializer to handle User/UserProfile data
together.

Refactor GET accounts to use the new read-only joint serializer

Fix tests to check for new expanded user info

Update tests in teams/tests/test_views.py to test for both
public and private profiles on expands user

Update serializer to utilize the request object for creating absolute uris
 2015-08-12 14:33:07 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release 
Release
 2015-08-12 13:06:39 -04:00
christopher lee
5b35ab3668 Added optional mark_as_read field to comments in Discussion API 
Currently when GETting comments, the thread of the comment will be
marked as read. This change makes this effect optional as well as
setting the default to not mark the thread as read.
 2015-08-12 12:25:06 -04:00
Diana Huang
66e9819c0f Make status use ConfigurationModel instead. 2015-08-12 11:46:43 -04:00
Will Daly
ad9d9eb04e Support team UI for regenerating certificates 
* Add new role for support staff.
* Move dashboard/support functionality into a new Django app called "support".
* Add support view for searching and regenerating certificates.
* Refactor certificates views into separate files.
 2015-08-12 07:09:46 -07:00
Arbab Nazar
330ef94e1e Merge pull request #9182 from edx/arbab/whitelist-text-change 
updated the help text for cert_whitelist
 2015-08-12 12:28:04 +05:00
Peter Fogg
625781288a Merge pull request #9279 from edx/hotfix/2015-08-11-b 
Revert "Optimize OpenID Course Claims for non-global-staff users."
 2015-08-11 18:17:55 -04:00
Diana Huang
82eb1f6b74 Make status use ConfigurationModel instead. 2015-08-11 17:51:39 -04:00
Dennis Jen
72e6b8aaeb Revert "Optimize OpenID Course Claims for non-global-staff users." 
This reverts commit f0d1772da3.
 2015-08-11 17:06:22 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import" 
This reverts commit 4c1c4619f0.
 2015-08-12 02:06:09 +05:00
Sarina Canelake
71d5180ba1 Add more context to translation strings 2015-08-11 13:11:32 -04:00
Brandon DeRosier
912db9910f Fix CCX 0002 migration 
(cherry picked from commit 558b93fdeaaf72d02e050808698b2015e123a01c)
 2015-08-11 13:04:09 -04:00
Brandon DeRosier
34526ddf6a Revert "Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment"" 
This reverts commit 42e78463a7.
 2015-08-11 13:03:58 -04:00
Peter Fogg
344ff8c1bc Merge pull request #9267 from edx/release 
2015-08-11 release
 2015-08-11 12:07:21 -04:00
Matt Drayer
2b93e246f3 Merge pull request #9266 from edx/asadiqbal08/SOL-1118 
asadiqbal08/SOL-1118: Use correct course number in web certificate
 2015-08-11 11:06:28 -04:00
Akiva Leffert
ba03081320 Merge pull request #9260 from edx/aleffert/start-date-error 
Show vaguer error message if using default start date
 2015-08-11 10:28:44 -04:00
asadiqbal
8269bf5f1f SOL-1118 2015-08-11 19:25:23 +05:00
Usman Khalid
1de9fc6461 Merge pull request #9200 from edx/usman/tnl1911-my-teams 
My teams tab.
 2015-08-11 19:22:50 +05:00
Usman Khalid
b4ed9a28b0 My Teams tab. 
TNL-1911
 2015-08-11 17:27:53 +05:00
Sven Marnach
55ace6baa8 Make new masquerading code compatible to existing session data. 
The new masquerading code introduced in PR #8775 adds a new attribute to
CourseMasquerade objects stored in the user's session.  When users who have
active masquerading configuration access instances with the new code, and
AttributeError occurs when trying to access the attribute user_name.

This fix ensures that CourseMasquerade objects receive all required attributes
when they are unpickled from the session.
 2015-08-11 10:47:25 +02:00
Peter Fogg
a6891609be Test Cale's RC fix. 2015-08-10 19:36:32 -04:00
Akiva Leffert
2632fd7ecd Show vaguer error message if using default start date 2015-08-10 17:26:36 -04:00
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
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application 
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
 2015-08-10 10:29:45 -04:00
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
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
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
arbabnazar
58c9291728 updated the help text for cert_whitelist 
fix the indentation

fix the indentation
 2015-08-06 16:27:56 +05:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00