Commits · 25ff53539d75acce86ae9f07b9b76ee77115b204 · edx / edx-platform · GitLab

03 Aug, 2015 3 commits
- Merge pull request #9168 from edx/marco/TNL-2946/capa/styling-fixes · 25ff5353
```
Capa Styling Fixes for Annotation Problems
```
  Marco Morales committed Aug 03, 2015
  25ff5353 Browse Files
- Merge pull request #9161 from edx/andya/fix-forums-bug · d3986c88
```
Fix forums escaping bug
```
  Ned Batchelder committed Aug 03, 2015
  d3986c88 Browse Files
- adds back in correct and incorrect styling for annotations problems · 90fcf464
  Marco Morales committed Aug 03, 2015
  
  90fcf464 Browse Files
31 Jul, 2015 15 commits
- Fix forums escaping bug · 96e14e3f
```
TNL-2919
```
  Andy Armstrong committed Jul 31, 2015
  96e14e3f Browse Files
- ECOM-1947: updated the middleware to exclude the password strings from event logging · f286152f
  aamir-khan committed Jul 31, 2015
  
  f286152f 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 #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
- 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
- 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
- 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 22 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
- Merge pull request #9125 from open-craft/sso-metadata-email-config · 659db2eb
```
SSO: Make email addresses in SAML metadata fully configurable
```
  Braden MacDonald committed Jul 30, 2015
  659db2eb Browse Files
- Move is_commentable_cohorted to django_comment_client · 4a782718
  Ben McMorran committed Jul 30, 2015
  
  4a782718 Browse Files
- Fix setuptools infinite loop bug triggered by python-saml · afeef4cb
  David Baumgold committed Jul 30, 2015
  
  afeef4cb Browse Files
- Upgrade MySQL-python to 1.2.5 · 957c8144
```
This reverts commit 2ff0f636.
```
  David Baumgold committed Jul 30, 2015
  957c8144 Browse Files
- Upgrade setuptools to 18.0.1 · ebe8b252
```
This reverts commit 1a3f0958.
```
  David Baumgold committed Jul 30, 2015
  ebe8b252 Browse Files
- Merge pull request #9137 from edx/peter-fogg/test-team-list-fix · b2545ce8
```
Revert "Remove unnecessary DB call in team pagination."
```
  Peter Fogg committed Jul 30, 2015
  b2545ce8 Browse Files
- Merge pull request #9130 from edx/clytwynec/js-diff-coverage · 48480861
```
generate diff-coverage report in JS jenkins build
```
  Christine Lytwynec committed Jul 30, 2015
  48480861 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · 3e8eac90
```
Conflicts:
	requirements/edx/github.txt
```
  Will Daly committed Jul 30, 2015
  3e8eac90 Browse Files
- Merge pull request #9136 from edx/patch/2015-07-29 · 50247472
```
Multiple Patches
```
  Will Daly committed Jul 30, 2015
  50247472 Browse Files
- Allow enrollments in expired modes to be deactivated · 4131aa4d
```
Facilitates revocation of enrollments in expired modes. XCOM-490.
```
  Renzo Lucioni committed Jul 30, 2015
  4131aa4d Browse Files
- Merge pull request #9131 from edx/revert-9037-vkaracic/TNL-394-confirmation-msg · c9b65b0c
```
Revert "TNL-394: Fixed the confirmation message"
```
  Vedran Karačić committed Jul 30, 2015
  c9b65b0c Browse Files
- Merge pull request #9004 from edx/dsego/discovery-ui-improvements · 65eb26b7
```
Improve course discovery filtering and empty search
```
  Davorin Šego committed Jul 30, 2015
  65eb26b7 Browse Files
- Revert "Remove unnecessary DB call in team pagination." · 95b8d723
```
This reverts commit 948f652c.
```
  Peter Fogg committed Jul 30, 2015
  95b8d723 Browse Files
- Merge pull request #9124 from edx/jsa/no-course-discovery-in-devstack · bf00fe0e
```
disable course discovery feature by default in devstack.
```
  Jim Abramson committed Jul 30, 2015
  bf00fe0e Browse Files
- Merge pull request #9102 from edx/peter-fogg/indices-teams · 7b01ed61
```
Add index on CourseTeam name.
```
  Peter Fogg committed Jul 30, 2015
  7b01ed61 Browse Files
- Revert "TNL-394: Fixed the confirmation message" · 9ddf5c2e
  Vedran Karačić committed Jul 30, 2015
  
  9ddf5c2e Browse Files
- generate diff-coverage report in JS jenkins build · bb3a281a
  Christine Lytwynec committed Jul 30, 2015
  
  bb3a281a Browse Files
- Merge pull request #9073 from edx/ahsan/ECOM-1917-Copy-styling-for-credit-messages-on-dashboard · ea183283
```
Copy & Styling for Credit messages on Dashboard
```
  Ahsan Ulhaq committed Jul 30, 2015
  ea183283 Browse Files
- Update ICRV version · 08165e88
  Ahsan Ulhaq committed Jul 30, 2015
  
  08165e88 Browse Files