Commit Graph

35669 Commits

Author SHA1 Message Date
Amir Qayyum Khan
e18fa2f489 Fixed explicit labels related issues on CCX coach dashboard and membershp team management to fix #21 2015-08-17 13:28:44 +05:00
Jolyon Bloomfield
c9fe2b9756 Fixing drag and drop labels 2015-08-16 20:16:40 -04:00
chrisndodge
a345edfa1c Merge pull request #9324 from edx/cdodge/dont-load-proctoring-JS-unnecessarily
only include JS when feature flag is on and the course has proctoring…
2015-08-16 08:36:09 -04:00
Chris Dodge
e19fa2c46f only include JS when feature flag is on and the course has proctoring enabled 2015-08-15 15:45:35 -04:00
Renzo Lucioni
03e6a12ede Fix release script typo 2015-08-15 14:31:41 -04: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
Christina Roberts
5e928417f1 Merge pull request #9325 from edx/christina/more-teams-tests
Add an additional test case related to re-fetching data.
2015-08-14 16:36: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
Jesse Zoldak
996ce1d62c Mark TeamPageTest class as flaky TNL-3069 2015-08-14 16:07:54 -04:00
cahrens
c929cdb54d Add an additional test case related to re-fetching data. 2015-08-14 14:48:09 -04:00
Eric Fischer
69886290fa Merge pull request #9322 from edx/efischer/tnl3061-rc-branch
Validating team size on join, server-side
2015-08-14 14:03:18 -04:00
clrux
50e7a9d6fd Merge pull request #9318 from edx/clrux/ac-133-hidden-form-label
Matching label to inputs in LMS course
2015-08-14 13:48:31 -04:00
Eric Fischer
fc6930a5d7 Validating team size on join, server-side
By doing this, we can prevent the bug where multiple users can join
a team simutaneously and push its enrollment over the defined
maximum value. Tests have also been added to confirm this behavior.

TNL-3061
2015-08-14 13:15:53 -04:00
Andy Armstrong
1d01da0739 Merge pull request #9320 from edx/andya/fix-broken-test
Fix broken test due to two PRs merging
2015-08-14 12:50:44 -04:00
Andy Armstrong
1b08d9402f Merge pull request #9321 from edx/andha/rc-fix-broken-test
Fix broken test due to two PRs merging
2015-08-14 12:49:56 -04:00
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