Commits · 9ddf5c2e1ee1d7f8ee52d2fa979730ac1916bec1 · edx / edx-platform · GitLab

30 Jul, 2015 4 commits
- Revert "TNL-394: Fixed the confirmation message" · 9ddf5c2e
  Vedran Karačić committed Jul 30, 2015
  
  9ddf5c2e 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
- Copy & Styling for Credit messages on Dashboard · ab69e0df
```
ECOM-1917
```
  Ahsan Ulhaq committed Jul 30, 2015
  ab69e0df Browse Files
29 Jul, 2015 19 commits
- Merge pull request #9108 from edx/merge-release-into-master · b5c2e9cc
```
Merge release into master
```
  John Baker committed Jul 29, 2015
  b5c2e9cc Browse Files
- Merge pull request #9120 from edx/ned/fix-djdt-circular-imports · e0edc51e
```
Fix Django Debug Toolbar circular imports
```
  Ned Batchelder committed Jul 29, 2015
  e0edc51e Browse Files
- Merge pull request #9101 from edx/clytwynec/update-testing-docs · e7933515
```
Update testing.rst with info about bok choy accessibility tests
```
  Christine Lytwynec committed Jul 29, 2015
  e7933515 Browse Files
- Fix Django Debug Toolbar circular imports · 7a7a867e
```
There's an "explicit" way to configure Django Debug Toolbar that isn't
prone to circular import errors:

http://django-debug-toolbar.readthedocs.org/en/1.0/installation.html#explicit-setup

Do that.
```
  Ned Batchelder committed Jul 29, 2015
  7a7a867e Browse Files
- Merge pull request #9100 from edx/mushtaq/tnl2593-fix-publish-automatically-after-deleting-unit · 40f89473
```
Autopublish when vertical is deleted
```
  Mushtaq Ali committed Jul 29, 2015
  40f89473 Browse Files
- Merge pull request #9096 from edx/mushtaq/tnl-2609-fix-url-link-issue-markdown-editor · 69646900
```
Fix markdown editor reference link having colon issue
```
  Mushtaq Ali committed Jul 29, 2015
  69646900 Browse Files
- Merge pull request #9088 from edx/jeskew/PLAT-729_upgrade_mongoengine · c2c609ac
```
Bump mongoengine version to 0.10.0
```
  John Eskew committed Jul 29, 2015
  c2c609ac Browse Files
- Merge pull request #9067 from edx/clrux/ac-121-cms-modal-focus · 4e8aee7e
```
Sending focus to modal in CMS
```
  clrux committed Jul 29, 2015
  4e8aee7e Browse Files
- Merge pull request #9117 from edx/benmcmorran/team-api-docs · 7794431f
```
Add discussion_topic_id to Team API docstrings
```
  Ben McMorran committed Jul 29, 2015
  7794431f Browse Files
- Update testing.rst with info about bok choy accessibility tests · 5e1ba589
  Christine Lytwynec committed Jul 29, 2015
  
  5e1ba589 Browse Files
- Add discussion_topic_id to Team API docstrings · 44d4e280
  Ben McMorran committed Jul 29, 2015
  
  44d4e280 Browse Files
- Merge pull request #8972 from jolyonb/jolyonb/discussion · f8d17766
```
Small printing fixes (LMS)
```
  frances botsford committed Jul 29, 2015
  f8d17766 Browse Files
- Merge pull request #7594 from jolyonb/jolyonb/p-spacing · cfe3acb7
```
Fixing paragraph spacing with inline class (capa)
```
  frances botsford committed Jul 29, 2015
  cfe3acb7 Browse Files
- Sending focus to modal in CMS · 2bea68fc
  Chris Rodriguez committed Jul 29, 2015
  
  2bea68fc Browse Files
- Merge pull request #9104 from edx/improve-learner-profile-tests · 7a32fbc9
```
Minor improvements to learner profile tests
```
  David Baumgold committed Jul 29, 2015
  7a32fbc9 Browse Files
- Merge pull request #9017 from edx/aamir-khan/ECOM-1817-instructions-on-receipt · 487d8331
```
ECOM-1817: updated the course name and also styling for the provider
```
  Aamir committed Jul 29, 2015
  487d8331 Browse Files
- ECOM-1817: updated the course name and also styling for the provider · 459ccae0
  aamir-khan committed Jul 29, 2015
  
  459ccae0 Browse Files
- Autopublish when vertical is deleted · edad392a
  mushtaqali committed Jul 29, 2015
  
  edad392a Browse Files
- Merge pull request #6503 from edx/pull-out-lms-underscore-templates · 601f1602
```
Pull discussion underscore templates out into individual files
```
  Andy Armstrong committed Jul 28, 2015
  601f1602 Browse Files
28 Jul, 2015 17 commits
- Merge pull request #8585 from edx/clee/discussion-api-order-and-sort-threads · 384fa77e
```
Thread sort key and direction for discussion api
```
  Christopher Lee committed Jul 28, 2015
  384fa77e Browse Files
- Merge pull request #9080 from mitocw/feature/cg/rfc6266_logger_issue · 1df53ac3
```
Resolved LogHandler bug in rf6266
```
  Carson Gee committed Jul 28, 2015
  1df53ac3 Browse Files
- Simplify birth_year variable · 263bcaf2
  David Baumgold committed Jul 28, 2015
  
  263bcaf2 Browse Files
- Resolved LogHandler bug in rf6266 · c19a683f
  Carson Gee committed Jul 28, 2015
  
  c19a683f Browse Files
- Merge pull request #9058 from edx/renzo/update-edx-oauth2-provider · dfbfabd8
```
Update edx-oauth2-provider to 0.5.6
```
  Renzo Lucioni committed Jul 28, 2015
  dfbfabd8 Browse Files
- fixed aws.py · d96648df
  John Baker committed Jul 28, 2015
  
  d96648df Browse Files
- Thread sort key and direction for discussion api · ed3bb27d
```
Discussion API for thread sorting now takes the sort_by
parameter for the sort key such as by comment_count or
vote_count. Also takes the sort_direction parameter for
sorting the thread results.
```
  christopher lee committed Jul 28, 2015
  ed3bb27d Browse Files
- Merge pull request #8982 from edx/benmcmorran/team-discussion-context · 2bad5946
```
TNL-1943 Support thread context for team discussions
```
  Ben McMorran committed Jul 28, 2015
  2bad5946 Browse Files
- Merge pull request #9003 from edx/rc/2015-07-22 · 7f3b5c88
```
Rc/2015-07-22
```
  John Baker committed Jul 28, 2015
  7f3b5c88 Browse Files
- Merge pull request #9093 from edx/will/ecom-1905 · af4a569e
```
Allow users to submit initial verification at in-course checkpoints.
```
  Will Daly committed Jul 28, 2015
  af4a569e Browse Files
- Merge pull request #9103 from edx/dan-f/fix-team-count · c8e4f2ca
```
Fix team count in topic serializers
```
  Daniel Friedman committed Jul 28, 2015
  c8e4f2ca Browse Files
- assertTrue should be assertEqual · 55006037
  David Baumgold committed Jul 28, 2015
  
  55006037 Browse Files
- Minor improvements to learner profile tests · 51976b06
  David Baumgold committed Jul 28, 2015
  
  51976b06 Browse Files
- Merge pull request #9099 from edx/benp/fix-lettuce-flaky-jul2015 · 77d7a38b
```
Fix flaky lettuce test.
```
  Ben Patterson committed Jul 28, 2015
  77d7a38b Browse Files
- Fix markdown editor reference link having colon issue · bfd49b2c
  mushtaqali committed Jul 28, 2015
  
  bfd49b2c Browse Files
- Merge pull request #9097 from edx/aj/plat-760-fix-flaky-test_import_timestamp · ece64cf2
```
Fixed Flaky test 
```
  Awais Jibran committed Jul 28, 2015
  ece64cf2 Browse Files
- TNL-1943 Support thread context for team discussions · 6b08bb20
  Ben McMorran committed Jul 28, 2015
  
  6b08bb20 Browse Files