Commits · a345edfa1c24f22c0862d3da1a889a1df93a99c7 · edx / edx-platform

16 Aug, 2015 1 commit
- Merge pull request #9324 from edx/cdodge/dont-load-proctoring-JS-unnecessarily · a345edfa
```
only include JS when feature flag is on and the course has proctoring…
```
  chrisndodge committed Aug 16, 2015
  a345edfa Browse Files
15 Aug, 2015 1 commit
- only include JS when feature flag is on and the course has proctoring enabled · e19fa2c4
  Chris Dodge committed Aug 15, 2015
  
  e19fa2c4 Browse Files
14 Aug, 2015 20 commits
- Merge pull request #9322 from edx/efischer/tnl3061-rc-branch · 69886290
```
Validating team size on join, server-side
```
  Eric Fischer committed Aug 14, 2015
  69886290 Browse Files
- Validating team size on join, server-side · fc6930a5
```
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
```
  Eric Fischer committed Aug 14, 2015
  fc6930a5 Browse Files
- Merge pull request #9321 from edx/andha/rc-fix-broken-test · 1b08d940
```
Fix broken test due to two PRs merging
```
  Andy Armstrong committed Aug 14, 2015
  1b08d940 Browse Files
- Fix broken test due to two PRs merging · 6e53d9c6
  Andy Armstrong committed Aug 14, 2015
  
  6e53d9c6 Browse Files
- Merge pull request #9302 from edx/andya/team-refresh-handling · 1265d540
```
Implement model refreshing for Teams tab
```
  Andy Armstrong committed Aug 14, 2015
  1265d540 Browse Files
- Merge pull request #9315 from edx/sarina/20150814-update-translations · 752226df
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Aug 14, 2015
  752226df Browse Files
- Bok choy tests for dynamic updating after team changes. · c84abfab
  cahrens committed Aug 14, 2015
  
  c84abfab Browse Files
- Implement model refreshing for Teams tab · a24e3cb0
```
TNL-2976
```
  Andy Armstrong committed Aug 14, 2015
  a24e3cb0 Browse Files
- Merge pull request #9316 from edx/diana/create-teams-error · 7e9bba5e
```
Show correct error when creating a team.
```
  Diana Huang committed Aug 14, 2015
  7e9bba5e Browse Files
- Clean i18n directories before validating · 0265ce0a
  Sarina Canelake committed Aug 14, 2015
  
  0265ce0a Browse Files
- Show correct error when creating a team. · d244368d
```
TNL-3063
```
  Diana Huang committed Aug 14, 2015
  d244368d Browse Files
- Update translations (autogenerated message) · 3a250c13
  Sarina Canelake committed Aug 14, 2015
  
  3a250c13 Browse Files
- Merge pull request #9314 from edx/release · cff41273
```
Merge Release back into master.
```
  Diana Huang committed Aug 14, 2015
  cff41273 Browse Files
- Merge pull request #9114 from mitocw/fix/aq/ccx_schedule · 50240c3e
```
Fixed accessibility issues in Schedule Tab in CCX
```
  Mark Sadecki committed Aug 14, 2015
  50240c3e Browse Files
- Merge pull request #9273 from edx/adam/add-lti-logging · 460b3311
```
add more lti logging around oauth (TNL-2980)
```
  Adam committed Aug 14, 2015
  460b3311 Browse Files
- Merge pull request #9069 from edx/cdodge/proctoring-lms-integration · 460a4b5f
```
Integration of Proctoring into the LMS
```
  chrisndodge committed Aug 14, 2015
  460a4b5f Browse Files
- Merge pull request #9309 from edx/frances/teams-style-fixes · 8da4fcbb
```
Teams cards list spacing
```
  frances botsford committed Aug 13, 2015
  8da4fcbb Browse Files
- Merge pull request #9303 from edx/usman/tnl3053-fetch-memberships · 04d3cb98
```
Also pass course_id when fetching memberships for user in team profile view.
```
  Daniel Friedman committed Aug 13, 2015
  04d3cb98 Browse Files
- Merge pull request #9305 from edx/cdodge/fix-broken-styling-ecomm · 7d0c9459
```
fix various style regressions on eComm tab of Instructor dashboard
```
  chrisndodge committed Aug 13, 2015
  7d0c9459 Browse Files
- Merge pull request #9312 from edx/diana/remove-invite-link · 4fc2ae7c
```
Remove invite link functionality from teams.
```
  Christina Roberts committed Aug 13, 2015
  4fc2ae7c Browse Files
13 Aug, 2015 18 commits
- Merge pull request #9289 from edx/efischer/tnl-2962-filter-team-by-course · ec916a31
```
TNL-2962 Add course_id filtering to team_membership API endpoint
```
  Eric Fischer committed Aug 13, 2015
  ec916a31 Browse Files
- Integration of edx_proctoring into the LMS · 6cf5516a
  Chris Dodge committed Aug 13, 2015
  
  6cf5516a Browse Files
- Remove invite link functionality from teams. · afa587cc
```
TNL-3062
```
  Diana Huang committed Aug 13, 2015
  afa587cc Browse Files
- Merge pull request #9217 from edx/andya/land-teams · 01065b6a
```
Enable teams and deprecate the advanced setting
```
  Andy Armstrong committed Aug 13, 2015
  01065b6a Browse Files
- fix various style regressions on eComm tab of Instructor dashboard · c1a06524
  Chris Dodge committed Aug 13, 2015
  
  c1a06524 Browse Files
- Support filtering team membership · 57d49b0a
```
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
```
  Eric Fischer committed Aug 13, 2015
  57d49b0a Browse Files
- remove list margin and padding on cards lists · 70a14ffe
  Frances Botsford committed Aug 13, 2015
  
  70a14ffe Browse Files
- Merge pull request #9308 from edx/diana/status-message-release · 91ea3260
```
Make status use ConfigurationModel instead.
```
  Diana Huang committed Aug 13, 2015
  91ea3260 Browse Files
- Merge pull request #9276 from edx/diana/update-status-message · 2ac1590d
```
Make status use ConfigurationModel instead.
```
  Diana Huang committed Aug 13, 2015
  2ac1590d Browse Files
- Also pass course_id when fetching memberships for user in team profile view. · 08498bc2
```
TNL-3053
```
  Usman Khalid committed Aug 13, 2015
  08498bc2 Browse Files
- Fixed accessibility related issues on schedule tab inside CCX coach dashboard · 4c8e45c7
  Amir Qayyum Khan committed Aug 13, 2015
  
  4c8e45c7 Browse Files
- Merge pull request #9228 from edx/muzaffar/tnl1906-team-profile · f785ae46
```
Team profile page sidebar.
```
  Usman Khalid committed Aug 13, 2015
  f785ae46 Browse Files
- Merge pull request #9298 from edx/christina/lean-modal · d96e1eb2
```
Add toggle_login_modal to list of base_application_js.
```
  Christina Roberts committed Aug 13, 2015
  d96e1eb2 Browse Files
- Merge pull request #9299 from edx/ammar/tnl-1910-support-leaving-a-team · b9cf31f4
```
Support leaving a team.
```
  Usman Khalid committed Aug 13, 2015
  b9cf31f4 Browse Files
- Add toggle_login_modal to list of base_application_js. · bb910ca6
```
TNL-3051
```
  cahrens committed Aug 13, 2015
  bb910ca6 Browse Files
- Support leaving a team · 5fc61207
```
TNL-1910
```
  muhammad-ammar committed Aug 13, 2015
  5fc61207 Browse Files
- Merge pull request #8996 from edx/ziafazal/SOL-1044 · f8f23240
```
ziafazal/SOL-1044: Custom Web Certificates
```
  Matt Drayer committed Aug 13, 2015
  f8f23240 Browse Files
- ziafazal/SOL-1044: Database-Driven Certificate Templates · 2467d697
```
* 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.
```
  Zia Fazal committed Aug 13, 2015
  2467d697 Browse Files