Commits · f49461c2eddcb1496220f2068228bd1ab6b8edfe · edx / edx-platform · GitLab

14 Oct, 2015 2 commits
- Merge pull request #10124 from edx/jia/MA-1240 · f49461c2
```
MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity
```
  wajeeha-khalid committed Oct 14, 2015
  f49461c2 Browse Files
- MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity · b5c74652
  wajeeha-khalid committed Oct 14, 2015
  
  b5c74652 Browse Files
13 Oct, 2015 11 commits
- Merge pull request #10120 from edx/frances/fix/repo-cert-template-bugs · a2bb8ed9
```
Platform Web Cert template fixes
```
  frances botsford committed Oct 13, 2015
  a2bb8ed9 Browse Files
- Merge pull request #10117 from edx/db/upgrade-paver · a0f5a006
```
Upgrade Paver to 1.2.4
```
  David Baumgold committed Oct 13, 2015
  a0f5a006 Browse Files
- Merge pull request #10112 from edx/saleem-latif/SOL-1281 · 82a1989a
```
SOL-1281: Setup/conduct automated testing for SOL-1196
```
  Matt Drayer committed Oct 13, 2015
  82a1989a Browse Files
- Merge pull request #10078 from openedx-newbie/doc-2268 · 65aacc1a
```
DOC-2268 - Fix instances of "register" on the course about page
```
  Sarina Canelake committed Oct 13, 2015
  65aacc1a Browse Files
- Merge pull request #10132 from edx/chrome-bok-choy-test-as-student-in-alpha-plus-beta · 0369a245
```
Fixed test, test as student in alpha and beta failing on chrome
```
  raeeschachar committed Oct 13, 2015
  0369a245 Browse Files
- remove linebreaks import from web certs · c8c9eb36
  Frances Botsford committed Oct 13, 2015
  
  c8c9eb36 Browse Files
- Fixed test as student in alpha and beta failing on chrome · b69cbfa1
  raeeschachar committed Oct 13, 2015
  
  b69cbfa1 Browse Files
- Bok-Choy test added for SOL-1196 to verify no black box around view certificate… · b55dee8f
```
Bok-Choy test added for SOL-1196 to verify no black box around view certificate note in Progress Tab
```
  Saleem Latif committed Oct 13, 2015
  b55dee8f 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 14 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
- web cert template rendering - adjust signature image sizing · 06df341f
  Frances Botsford committed Oct 09, 2015
  
  06df341f Browse Files
- adjust platform web cert print style to look like web rendering; fix signatory layouts · 40170dbf
  Frances Botsford committed Oct 09, 2015
  
  40170dbf 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
- Upgrade Paver to 1.2.4 · 6c68b19f
  David Baumgold committed Oct 09, 2015
  
  6c68b19f 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 8 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