Commit Graph

33604 Commits

Author SHA1 Message Date
Andy Armstrong
6e53d9c697 Fix broken test due to two PRs merging 2015-08-14 12:26:33 -04:00
Andy Armstrong
fb6ec9560f Fix broken test due to two PRs merging 2015-08-14 12:24:46 -04:00
Ned Batchelder
346ff84076 Merge pull request #9311 from edx/ned/quiet-devstack-logs
Quiet some devstack log messages
2015-08-14 12:08:19 -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
Chris Rodriguez
1cd73c764e Matching label to inputs 2015-08-14 11:44:35 -04:00
Sarina Canelake
752226df14 Merge pull request #9315 from edx/sarina/20150814-update-translations
Update translations (autogenerated message)
2015-08-14 11:40:34 -04:00
cahrens
c84abfab40 Bok choy tests for dynamic updating after team changes. 2015-08-14 11:12:11 -04:00
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab
TNL-2976
2015-08-14 11:12:11 -04:00
Diana Huang
7e9bba5e19 Merge pull request #9316 from edx/diana/create-teams-error
Show correct error when creating a team.
2015-08-14 11:10:21 -04:00
Carlos de la Guardia
aa647bd87e fix test broken by course_overview changes 2015-08-14 10:00:04 -05:00
Calen Pennington
3f9027d05e Log delete_many calls and metrics 2015-08-14 10:22:24 -04:00
Sarina Canelake
0265ce0af7 Clean i18n directories before validating 2015-08-14 10:20:08 -04:00
Diana Huang
d244368dbf Show correct error when creating a team.
TNL-3063
2015-08-14 10:20:02 -04:00
Sarina Canelake
3a250c13b9 Update translations (autogenerated message) 2015-08-14 10:03:36 -04:00
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
Carlos de la Guardia
066d5ab651 Changes to a CCX course should emit a course_published event 2015-08-14 01:24:11 -05: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
Ned Batchelder
2c8ab7db4b Quiet some devstack log messages 2015-08-13 17:26:47 -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
1091cd36a1 add teams to responsive pages - fix content area padding 2015-08-13 16:45:57 -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
Calen Pennington
448356ed3e Log the size of block state and the number of blocks missing state when retrieved with get_many 2015-08-13 16:32:05 -04:00
Calen Pennington
31f29763fd Increase sample rate when measuring DjangoXBlockUserStateClient metrics 2015-08-13 16:31:33 -04:00
Chris Rodriguez
644d20ec99 Addressing PR feedback 2015-08-13 15:07:13 -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
Marko Jevtic
35e7a7338c Addresses design review feedback 2015-08-13 12:46:48 +00: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