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

32126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
cff41273ea Merge pull request #9314 from edx/release 
Merge Release back into master.
 2015-08-14 09:18:22 -04:00
Mark Sadecki
50240c3e77 Merge pull request #9114 from mitocw/fix/aq/ccx_schedule 
Fixed accessibility issues in Schedule Tab in CCX
 2015-08-14 09:02:42 -04:00
Adam
460b3311b2 Merge pull request #9273 from edx/adam/add-lti-logging 
add more lti logging around oauth (TNL-2980)
 2015-08-14 08:53:21 -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
frances botsford
8da4fcbbcb Merge pull request #9309 from edx/frances/teams-style-fixes 
Teams cards list spacing
 2015-08-13 23:01:32 -04: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
chrisndodge
7d0c9459f2 Merge pull request #9305 from edx/cdodge/fix-broken-styling-ecomm 
fix various style regressions on eComm tab of Instructor dashboard
 2015-08-13 20:30:32 -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
Andy Armstrong
01065b6ae5 Merge pull request #9217 from edx/andya/land-teams 
Enable teams and deprecate the advanced setting
 2015-08-13 17:47:15 -04:00
Chris Dodge
c1a065247e fix various style regressions on eComm tab of Instructor dashboard 2015-08-13 17:16:01 -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
Frances Botsford
70a14ffe91 remove list margin and padding on cards lists 2015-08-13 16:44:31 -04:00
Diana Huang
91ea32603f Merge pull request #9308 from edx/diana/status-message-release 
Make status use ConfigurationModel instead.
 2015-08-13 16:44:26 -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
Amir Qayyum Khan
4c8e45c75d Fixed accessibility related issues on schedule tab inside CCX coach dashboard 2015-08-13 23:09:55 +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
Christina Roberts
d96e1eb2a3 Merge pull request #9298 from edx/christina/lean-modal 
Add toggle_login_modal to list of base_application_js.
 2015-08-13 12:33:14 -04:00
Usman Khalid
b9cf31f444 Merge pull request #9299 from edx/ammar/tnl-1910-support-leaving-a-team 
Support leaving a team.
 2015-08-13 21:21:55 +05:00
cahrens
bb910ca632 Add toggle_login_modal to list of base_application_js. 
TNL-3051
 2015-08-13 11:28:51 -04: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
1319602a62 Merge pull request #9211 from edx/ammar/tnl-1909-support-joining-a-team 
support joining a team
 2015-08-13 15:53:27 +05: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
Daniel Friedman
c197e72599 Merge pull request #9173 from edx/peter-fogg/team-accessibility-fixes 
Fix team accessibility issues.
 2015-08-13 01:05:57 -04: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
00eb18a1f9 Merge pull request #9294 from edx/andya/create-team-disabling 
Govern team creation for non-privileged users
 2015-08-12 20:27:29 -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
Ben Patterson
7734674c68 Merge pull request #9284 from edx/benp/update-nose-aug2015 
Update to latest version of nose.
 2015-08-12 15:04:17 -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
5b9b0a8339 Merge pull request #9240 from edx/will/ecom-1781-rebase 
Support team UI for regenerating certificates
 2015-08-12 09:09:06 -07:00
Diana Huang
66e9819c0f Make status use ConfigurationModel instead. 2015-08-12 11:46:43 -04:00
Peter Fogg
986564c45b Merge pull request #9275 from edx/hotfix/2015-08-11 
Hotfix/2015 08 11
 2015-08-12 11:40:42 -04:00
Adam Palay
c486eadd87 add more lti logging around oauth (TNL-2980) 2015-08-12 10:10:29 -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
Ben Patterson
1c2ad178bf Update to latest version of nose. 
This will allow us to take advantage of bug fixes and other improvements.
 2015-08-12 09:05:36 -04: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
Peter Fogg
f84bc9f1b3 Merge pull request #9280 from edx/waheed/revert-tnl-2686-fix 
Revert "Test library failed to export after import"
 2015-08-11 18:17:41 -04:00
Diana Huang
82eb1f6b74 Make status use ConfigurationModel instead. 2015-08-11 17:51:39 -04:00