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

5797 Commits

Author SHA1 Message Date
Calen Pennington
9cbc8564a1 Merge pull request #9109 from jazkarta/ccx_course_published_signal 
Changes to a CCX course should emit a course_published event
 2015-08-17 13:14:00 -04:00
Sarina Canelake
5481a6a1a8 Merge pull request #9146 from open-craft/OC-791-course-timeline 
Instructor Dashboard: Display info about course timeline
 2015-08-17 13:10:57 -04:00
muzaffaryousaf
9e7d278dd0 Revert "Accessibility fixings." 
This reverts commit 789732a7c8.
 2015-08-17 16:52:01 +05:00
muzaffaryousaf
e73a855659 Revert "Accessibility fixings for new post button on teams." 
This reverts commit e133a63a5b.
 2015-08-17 16:51:52 +05:00
muzaffaryousaf
e133a63a5b Accessibility fixings for new post button on teams. 
TNL-1930
 2015-08-17 16:27:45 +05:00
muzaffaryousaf
789732a7c8 Accessibility fixings. 
TNL-1930
 2015-08-17 15:56:58 +05:00
Brian Talbot
aa5fed718d Merge pull request #9207 from edx/talbs/remove-mktg-iframe 
Clean Up: Remove edx.org Specific MKTG Iframe Assets
 2015-08-14 17:42:01 -04:00
Brian Talbot
944f51a60b LMS: removing old and not needed edx.org MKTG iframe assets 
* removing templates/styling
* removing test logic and URLs
 2015-08-14 16:17:19 -04:00
cahrens
c929cdb54d Add an additional test case related to re-fetching data. 2015-08-14 14:48:09 -04:00
Andy Armstrong
fb6ec9560f Fix broken test due to two PRs merging 2015-08-14 12:24:46 -04:00
Andy Armstrong
1265d540ad Merge pull request #9302 from edx/andya/team-refresh-handling 
Implement model refreshing for Teams tab
 2015-08-14 11:50:54 -04:00
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab 
TNL-2976
 2015-08-14 11:12:11 -04:00
Carlos de la Guardia
aa647bd87e fix test broken by course_overview changes 2015-08-14 10:00:04 -05:00
Diana Huang
d244368dbf Show correct error when creating a team. 
TNL-3063
 2015-08-14 10:20:02 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration 
Integration of Proctoring into the LMS
 2015-08-14 07:18:14 -04:00
Carlos de la Guardia
066d5ab651 Changes to a CCX course should emit a course_published event 2015-08-14 01:24:11 -05:00
Daniel Friedman
04d3cb982d Merge pull request #9303 from edx/usman/tnl3053-fetch-memberships 
Also pass course_id when fetching memberships for user in team profile view.
 2015-08-13 22:32:59 -04:00
Christina Roberts
4fc2ae7ca8 Merge pull request #9312 from edx/diana/remove-invite-link 
Remove invite link functionality from teams.
 2015-08-13 20:02:53 -04:00
Eric Fischer
ec916a31dd Merge pull request #9289 from edx/efischer/tnl-2962-filter-team-by-course 
TNL-2962 Add course_id filtering to team_membership API endpoint
 2015-08-13 19:20:34 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Diana Huang
afa587cc38 Remove invite link functionality from teams. 
TNL-3062
 2015-08-13 17:53:26 -04:00
Eric Fischer
57d49b0adb Support filtering team membership 
Adds tests and functionality to support filtering the results returned
from team_membership endpoint with optional course_id parameter. Will
return 400 Bad Request in the event that the given course_id does not
match up with the provided team_id (team.course_id does not match), or
if the user is not enrolled in the course given.

Documentation has been added to the relevant API page on the wiki:
https://openedx.atlassian.net/wiki/display/TNL/Team+API
 2015-08-13 16:52:31 -04:00
Diana Huang
2ac1590df4 Merge pull request #9276 from edx/diana/update-status-message 
Make status use ConfigurationModel instead.
 2015-08-13 16:37:23 -04:00
Usman Khalid
08498bc283 Also pass course_id when fetching memberships for user in team profile view. 
TNL-3053
 2015-08-13 23:15:25 +05:00
Usman Khalid
f785ae465f Merge pull request #9228 from edx/muzaffar/tnl1906-team-profile 
Team profile page sidebar.
 2015-08-13 22:07:01 +05:00
muhammad-ammar
5fc612079b Support leaving a team 
TNL-1910
 2015-08-13 20:27:38 +05:00
Matt Drayer
f8f23240da Merge pull request #8996 from edx/ziafazal/SOL-1044 
ziafazal/SOL-1044: Custom Web Certificates
 2015-08-13 10:05:40 -04:00
Zia Fazal
2467d6971f ziafazal/SOL-1044: Database-Driven Certificate Templates 
* added certificate template model
* added certificate template asset model
* added django admin configs and migration
* initial LMS template matching logic
* improved LMS template matching
* improved LMS template matching and rendering logic
* address Django admin form/model load order incongruence
* add missing unique constraint migration.
 2015-08-13 08:01:34 -04:00
muhammad-ammar
853f97afbc support joining a team 
TNL-1909
 2015-08-13 14:41:21 +05:00
muzaffaryousaf
a56e6bf743 Team details page. 
TNL-1906
 2015-08-13 14:20:07 +05:00
Peter Fogg
26bbbb967e Fix various team accessibility issues. 
Authors:
  - Peter Fogg
  - Daniel Friedman

TNL-1953
 2015-08-13 00:34:54 -04:00
Andy Armstrong
8bbf7c57ac Improve Teams tab navigation 2015-08-12 19:20:48 -04:00
Andy Armstrong
8bd1f69821 Govern team creation for non-privileged users 
TNL-2960

Non-privileged users can only be in one team, so don't
allow them to create new teams if they are already
members of another.
 2015-08-12 19:16:02 -04:00
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
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