Commits · a9de5c90a4b9b9143ba1e048a5833cdb8c294b07 · edx / edx-platform · GitLab

03 Aug, 2015 5 commits
- Merge pull request #9050 from edx/christina/tnl-2677 · a9de5c90
```
Correct email settings URL and rename variable.
```
  Diana Huang committed Aug 03, 2015
  a9de5c90 Browse Files
- Merge pull request #9092 from cpennington/user-state-client-tests · ffc8a117
```
User state client tests
```
  John Eskew committed Aug 03, 2015
  ffc8a117 Browse Files
- Merge pull request #9158 from edx/release · eaeb3256
```
Merging hotfix 2015-07-30 release back to master
```
  Will Daly committed Aug 03, 2015
  eaeb3256 Browse Files
- Merge pull request #9166 from edx/peter-fogg/team-chat-icon · 051e838f
```
Make team chat icon appear.
```
  Peter Fogg committed Aug 03, 2015
  051e838f Browse Files
- Make team chat icon appear. · b47922ce
  Peter Fogg committed Aug 03, 2015
  
  b47922ce Browse Files
02 Aug, 2015 1 commit
- Merge pull request #9133 from edx/andya/remove-mustache-from-discussions · d98354d0
```
Remove Mustache usage from discussions
```
  Andy Armstrong committed Aug 01, 2015
  d98354d0 Browse Files
01 Aug, 2015 8 commits
- Remove Mustache usage from discussions · 540e8464
  Andy Armstrong committed Aug 01, 2015
  
  540e8464 Browse Files
- Merge pull request #8946 from edx/lliu/view-course-access · 8aa2d67b
```
Add access response information into view_course_access
```
  Linda Liu committed Aug 01, 2015
  8aa2d67b Browse Files
- Add a test of submission history display · 83c10331
  Calen Pennington committed Aug 01, 2015
  
  83c10331 Browse Files
- Remove remove_input_state.py, as it was one-time fix code, and is not worth… · 6ba611cb
```
Remove remove_input_state.py, as it was one-time fix code, and is not worth porting to the new interface
```
  Calen Pennington committed Aug 01, 2015
  6ba611cb Browse Files
- Make DjangoXBlockUserStateClient pass semantic tests · aa374ca1
```
This required the following changes to the DjangoXBlockUserStateClient
semantics:

1) Changes get/get_many to return XBlockUserState tuples, rather
than state dictionaries or (block_key, state) tuples.
2) Raises DoesNotExist if get_history is called on an XBlock that has
had no data saved to it.
3) Returns XBlockUserState tuples as the results of get_history.
```
  Calen Pennington committed Aug 01, 2015
  aa374ca1 Browse Files
- Remove extraneous documentation, contracts, and method definitions · 53b37e74
  Calen Pennington committed Aug 01, 2015
  
  53b37e74 Browse Files
- Add a subclass-implementation of the UserStateClient tests · 704ae713
  Calen Pennington committed Aug 01, 2015
  
  704ae713 Browse Files
- Merge pull request #9160 from edx/benmcmorran/dont-cohort-teams · 6530d5e3
```
TNL-2913 Extend is_commentable_cohorted to support teams
```
  Ben McMorran committed Jul 31, 2015
  6530d5e3 Browse Files
31 Jul, 2015 22 commits
- Merge pull request #9156 from edx/utkjad/Removing_@contract_from_DXUSC_inuser_state_client.py · 3de9a9b4
```
Removing @contract from `edx-platform/lms/djangoapps/courseware/user_state_client.py`
```
  Utkarsh committed Jul 31, 2015
  3de9a9b4 Browse Files
- Extend is_commentable_cohorted to support teams · 6d48e136
  Ben McMorran committed Jul 31, 2015
  
  6d48e136 Browse Files
- Removing @contract · b85b50d1
  utkjad committed Jul 31, 2015
  
  b85b50d1 Browse Files
- Merge pull request #9113 from edx/christina/team-discussion-permissions · b06e46c1
```
Christina/team discussion permissions
```
  Christina Roberts committed Jul 31, 2015
  b06e46c1 Browse Files
- Correct email settings URL and rename variable. · 614a9295
```
TNL-2677
```
  cahrens committed Jul 31, 2015
  614a9295 Browse Files
- Merge pull request #9126 from edx/kyle/course-overviews-versioning · 2e53b9e8
```
WIP: MA-1063 Add versioning and timestamping to CourseOverview
```
  Kyle McCormick committed Jul 31, 2015
  2e53b9e8 Browse Files
- Merge pull request #9150 from edx/ned/remove-changelog · 337024bd
```
CHANGELOG is dead.
```
  Ned Batchelder committed Jul 31, 2015
  337024bd Browse Files
- Merge pull request #23 from edx/hotfix/2015-07-30 · 663b7b9c
```
Hotfix 2015-07-23
```
  Will Daly committed Jul 31, 2015
  663b7b9c Browse Files
- Merge pull request #9143 from edx/benmcmorran/move-is-commentable-cohorted · 3a70b877
```
Move is_commentable_cohorted to django_comment_client
```
  Ben McMorran committed Jul 31, 2015
  3a70b877 Browse Files
- Merge pull request #9142 from edx/diana/context-aware-comment-client · bc2892f2
```
Make context for threads more implicit.
```
  Diana Huang committed Jul 31, 2015
  bc2892f2 Browse Files
- MA-1063 Add versioning and timestamping to CourseOverview · 10aae0d4
  Kyle McCormick committed Jul 31, 2015
  
  10aae0d4 Browse Files
- Merge pull request #9134 from edx/sarina/allow-logistration-in-microsites · 848e72c7
```
Allow microsites to use logistration page (ECOM-1976)
```
  Sarina Canelake committed Jul 31, 2015
  848e72c7 Browse Files
- CHANGELOG is dead. · 19229806
  Ned Batchelder committed Jul 31, 2015
  
  19229806 Browse Files
- Merge pull request #9122 from jolyonb/questionfix · 10a0bc6f
```
CAPA CSS: Fixing indicator spacing on dropdown problems
```
  Marco Morales committed Jul 31, 2015
  10a0bc6f Browse Files
- Merge pull request #8934 from edx/db/fix-python-saml-compile-issue · 2afc586a
```
Re-upgrade to setuptools
```
  David Baumgold committed Jul 31, 2015
  2afc586a Browse Files
- Allow microsites to use logistration page (ECOM-1976) · db2d8f65
  Sarina Canelake committed Jul 31, 2015
  
  db2d8f65 Browse Files
- MA-851: Add access response information into view_course_access · 3b483d14
  tlindaliu committed Jul 31, 2015
  
  3b483d14 Browse Files
- Merge pull request #9148 from edx/sarina/20150731-translations-update · e93462c7
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Jul 31, 2015
  e93462c7 Browse Files
- Merge pull request #9135 from edx/renzo/always-allow-unenrollment · 50f920be
```
Allow enrollments in expired modes to be deactivated
```
  Renzo Lucioni committed Jul 31, 2015
  50f920be Browse Files
- Make context for threads more implicit. · c12c2933
  Diana Huang committed Jul 31, 2015
  
  c12c2933 Browse Files
- Update translations (autogenerated message) · 00af8222
  Sarina Canelake committed Jul 31, 2015
  
  00af8222 Browse Files
- Merge pull request #9111 from edx/ziafazal/SOL-1077 · 614baab3
```
SOL-1077: hide certificate configuration activate/deactivate and delete buttons if user is not global staff
```
  Zia Fazal committed Jul 31, 2015
  614baab3 Browse Files
30 Jul, 2015 4 commits
- Merge pull request #9145 from open-craft/bump-problem-builder · 99f4ec21
```
Bump problem builder version to avoid 500 error from PLAT-772
```
  Braden MacDonald committed Jul 30, 2015
  99f4ec21 Browse Files
- Bump problem builder version to avoid 500 error from PLAT-772 · 7aa7664e
  Braden MacDonald committed Jul 30, 2015
  
  7aa7664e Browse Files
- Merge pull request #9139 from edx/merge-release-into-master · 0662f127
```
Merge release into master
```
  Will Daly committed Jul 30, 2015
  0662f127 Browse Files
- Ignore team membership for privileged users. · 9d3e2c1a
  cahrens committed Jul 30, 2015
  
  9d3e2c1a Browse Files