Commits · a9d8678ed02f2c109569da82dde52a08efadf743 · edx / edx-platform

13 Oct, 2015 4 commits
- Fix staticfiles import in microsite.py. · a9d8678e
```
django-staticfiles was replaced with django.contrib.staticfiles
in dbcd1bf4.

The common/djangoapps/microsite_configuration/templatetags/microsite.py
file was still trying to import the old staticfiles package,
breaking the app on fresh installations.
```
  Matjaz Gregoric committed Oct 13, 2015
  a9d8678e Browse Files
- Merge pull request #9862 from edx/aj/plat833-orphan-problem-with-preview-button · 884569a5
```
Orphans in split breaks preview button in Studio
```
  Awais Jibran committed Oct 13, 2015
  884569a5 Browse Files
- Merge pull request #9784 from edx/jia/MA-1248 · 39b91914
```
MA-1248 - Mobile API: return discussion URL in course enrollment API
```
  wajeeha-khalid committed Oct 13, 2015
  39b91914 Browse Files
- Update users.rst · 2c3d64a5
  wajeeha-khalid committed Oct 13, 2015
  
  2c3d64a5 Browse Files
12 Oct, 2015 5 commits
- Merge pull request #10128 from edx/chrome-bok-choy-test-about-me-field · 8de4d875
```
Fixed test about me field test failing on chrome
```
  raeeschachar committed Oct 12, 2015
  8de4d875 Browse Files
- Merge pull request #10111 from edx/zub/story/ecom-2450-adjust-credit-eligibility-email-content · 5b07be58
```
minor changes in credit eligibility notification
```
  Zubair Afzal committed Oct 12, 2015
  5b07be58 Browse Files
- minor changes in credit eligibility notification · 2d1247be
```
ECOM-2450
```
  zubair-arbi committed Oct 12, 2015
  2d1247be Browse Files
- Fixed test about me field test failing on chrome · 652d3466
  raeeschachar committed Oct 12, 2015
  
  652d3466 Browse Files
- Published orphans in split breaks preview button in Studio · 2813b126
  Awais Jibran committed Oct 12, 2015
  
  2813b126 Browse Files
09 Oct, 2015 11 commits
- Merge pull request #10121 from edx/christina/delete-old-mathjax · 69c47e09
```
Delete old, unused version of MathJax.
```
  Christina Roberts committed Oct 09, 2015
  69c47e09 Browse Files
- Merge pull request #10089 from edx/oppia-block · 98a82a89
```
Add Oppia XBlock OSPR-778 DOC-2324
```
  Sarina Canelake committed Oct 09, 2015
  98a82a89 Browse Files
- Delete old, unused version of MathJax. · 5c12890d
```
This version was from 2012.
```
  cahrens committed Oct 09, 2015
  5c12890d Browse Files
- Add Oppia XBlock · a693feb8
  Sarina Canelake committed Oct 09, 2015
  
  a693feb8 Browse Files
- Merge pull request #10106 from edx/christina/tnl-2667 · e884c65a
```
Fix flaky Studio Course Team bok choy tests
```
  Christina Roberts committed Oct 09, 2015
  e884c65a Browse Files
- Merge pull request #10109 from edx/christina/tnl-1590 · c1ba907b
```
Remove skip from test_annotatable
```
  Christina Roberts committed Oct 09, 2015
  c1ba907b Browse Files
- Merge pull request #10021 from mitocw/enhancement/aq/remove_gradebook_draging · 34ac9db3
```
Add scrolling with dragging and added tool tip to student record.
```
  David Baumgold committed Oct 09, 2015
  34ac9db3 Browse Files
- MA-1248 - CourseEnrollmentAPI: added discussion URL · 90fe71db
  wajeeha-khalid committed Oct 09, 2015
  
  90fe71db Browse Files
- Merge pull request #8788 from edx/mattdrayer/eliminate-base-distinguished · 06129ada
```
mattdrayer/eliminate-base-distinguished: Switch back to honor/verified
```
  Matt Drayer committed Oct 09, 2015
  06129ada Browse Files
- Remove skip-- test passed 60 times in Jenkins. · 7a3975fe
```
TNL-1590
```
  cahrens committed Oct 09, 2015
  7a3975fe Browse Files
- mattdrayer/eliminate-base-distinguished: Switch back to honor/verified · 31cbef70
```
* talbs: Remove obsolete stuff
* frrrances: remove base and distinguished sass references and image assets
* mattdrayer: Cleaned up JSON syntax for test setups
```
  Matt Drayer committed Oct 09, 2015
  31cbef70 Browse Files
08 Oct, 2015 20 commits
- Fix flaky bok choy tests. · 4125e594
```
TNL-2667
```
  cahrens committed Oct 08, 2015
  4125e594 Browse Files
- Removed dragging and added tool tip to student record. · 8b6c3757
```
Clarify and reformat some comments; rename a few functions to clarify those.

Convert tabs to spaces.

Fix inaccurate comment

Fixed jshint issues

Adjust how user-select is applied to the gradebook view. Add i18n for a string.

Allow selection when not dragging.
```
  Amir Qayyum Khan committed Oct 08, 2015
  8b6c3757 Browse Files
- Merge pull request #10081 from edx/clytwynec/update-bokchoy-0.4.6 · b92d239e
```
Clytwynec/update bokchoy 0.4.6
```
  Christine Lytwynec committed Oct 08, 2015
  b92d239e Browse Files
- Merge pull request #9981 from edx/bderusha/context-tracker-ip · 1030b277
```
Upgrade IP parsing in tracker middleware
```
  Bill DeRusha committed Oct 08, 2015
  1030b277 Browse Files
- Merge pull request #10095 from edx/bderusha/auto-rc · bff35010
```
Auto release branch cutting
```
  Bill DeRusha committed Oct 08, 2015
  bff35010 Browse Files
- Add details about debugging Jasmine tests · 421a9cc0
  Andy Armstrong committed Oct 08, 2015
  
  421a9cc0 Browse Files
- Upgrade IP parsing in tracker middleware · 40a8608b
  Bill DeRusha committed Oct 08, 2015
  
  40a8608b Browse Files
- Merge pull request #10094 from edx/christina/profile-flaky-tests · 6b7f1bce
```
Fix user profile flaky tests.
```
  Christina Roberts committed Oct 08, 2015
  6b7f1bce Browse Files
- Fix flaky profile tests. · 99cd1876
```
Trying to read the value right after setting it in the bio
field is flaky-- but nobody is using the return value
anyway! There is a test that verifies that the bio field
is properly set, but it uses a different method to get the value.

TNL-2704, TNL-3492, TNL-3514, TNL-2199
```
  cahrens committed Oct 08, 2015
  99cd1876 Browse Files
- Merge pull request #10086 from edx/clrux/ac-76-test-cleanup · f6d34711
```
Fixing JS tests for the accordion navigation
```
  clrux committed Oct 08, 2015
  f6d34711 Browse Files
- Add automatic release branch cutting to release script · 565b6759
  Bill DeRusha committed Oct 08, 2015
  
  565b6759 Browse Files
- Merge pull request #10104 from edx/peter-fogg/silence-spurious-pep8 · c580d4db
```
Make pep8 ignore test_root/staticfiles directory.
```
  Peter Fogg committed Oct 08, 2015
  c580d4db Browse Files
- Make pep8 ignore test_root/staticfiles directory. · 264f7c47
```
This directory is placed under .gitignore, so we shouldn't be worried
about pep8 errors in Python files placed there.
```
  Peter Fogg committed Oct 08, 2015
  264f7c47 Browse Files
- Fixing JS tests for the course navigation · a631a662
  Chris Rodriguez committed Oct 08, 2015
  
  a631a662 Browse Files
- Merge pull request #10034 from mitocw/fix/gdm/hide_block_from_ccx · ec023c22
```
Fixed visibility of hidden blocks in CCX schedule
```
  Peter Pinch committed Oct 08, 2015
  ec023c22 Browse Files
- Merge pull request #10075 from edx/saleem-latif/SOL-1266 · 994f8bd7
```
SOL-1266: Display course numbers in certificate configuration
```
  Matt Drayer committed Oct 08, 2015
  994f8bd7 Browse Files
- Merge pull request #10077 from edx/ziafazal/SOL-1258 · 6b93532c
```
SOL-1258: Percentage appearing wrong for specific numbers
```
  Matt Drayer committed Oct 08, 2015
  6b93532c Browse Files
- Merge pull request #10059 from edx/usman/use-included-staticfiles-app · f6193c87
```
Upgrade django pipeline to v.1.5.3.
```
  Usman Khalid committed Oct 08, 2015
  f6193c87 Browse Files
- minimum score percentage rounded · 14c31001
```
round before converting a decimal into integer
```
  Zia Fazal committed Oct 08, 2015
  14c31001 Browse Files
- course-number and override course-number added in Certificate Editor View · 9799d153
  Saleem Latif committed Oct 08, 2015
  
  9799d153 Browse Files