Adam
b0247f1735
Merge pull request #9408 from edx/hotfix/2015-08-20
...
Fix Forum Update Issue #TNL-3101
2015-08-20 14:59:08 -04:00
Mushtaq Ali
c80906596b
Fix Forum Update Issue #TNL-3101
2015-08-20 13:08:41 -04:00
Renzo Lucioni
f17df2d009
Merge pull request #9390 from edx/patch-2015-08-20
...
Allow user partition version >= current version.
2015-08-20 08:16:54 -04:00
Will Daly
cea22a12ff
Allow user partition version >= current version.
...
If code is deployed that updates the user partition version,
then the code is rolled back, we may see user partition versions
greater than the currently deployed version.
The previous behavior was to raise a TypeError when this occurred;
the new behavior assumes that the newer version is backwards
compatible and tries to load the partition.
2015-08-19 16:59:03 -04:00
Christina Roberts
5f5daa266e
Merge pull request #9342 from edx/christina/privileged-multiple-teams
...
Allow course staff and privileged users to create multiple teams.
2015-08-17 12:33:41 -04:00
Kevin Falcone
58bc8e4973
Merge pull request #9349 from edx/jibsheet/escape-studio-courses-to-rc
...
HTML-escape uses of course display name.
2015-08-17 12:27:06 -04:00
Sarina Canelake
ed9b5c24db
Merge pull request #9347 from edx/sarina/revert-pc
...
Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial…
2015-08-17 12:17:50 -04:00
Peter Fogg
2c6a9c5ebd
HTML-escape uses of course display name.
2015-08-17 12:15:15 -04:00
Will Daly
3e19ebe9a8
Merge pull request #9348 from edx/will/ecom-2019-to-rc
...
Fixing minimum grade value error
2015-08-17 08:47:28 -07:00
chrisndodge
85c4c68e18
Merge pull request #9331 from edx/cdodge/only-global-staff-see-proctoring
...
only let global staff (is_staff) see the proctoring tab
2015-08-17 11:40:52 -04:00
Tasawer
7ee5d35fbb
Fixing minimum grade value error
...
ECOM-2109
2015-08-17 08:40:51 -07:00
cahrens
425b8c6ba8
Allow course staff and privileged users to create multiple teams.
...
TNL-3071
2015-08-17 11:39:58 -04:00
Sarina Canelake
2861cbbf35
Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit"
...
This reverts commit cea274dc5202cf9caca6
2015-08-17 11:31:51 -04:00
Chris Dodge
1bd0ce572e
Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard
...
Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard if the feature flag is enabled.
2015-08-17 19:24:59 +05: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
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
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
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
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
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
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
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
