Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,855 Commits 1 Branch 0 Tags
655b02a5817bedd862a0e7addebc506efea28c92
Commit Graph

32855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Lee
655b02a581 Merge pull request #9739 from edx/clee/dapi-vote-bug-2 
fixed vote bug in discussion api
 2015-09-17 14:46:46 -04:00
Dennis Jen
305f88f646 Merge pull request #9488 from edx/dsjen/courses-via-overview 
Optimize OpenID Course Claims for users.
 2015-09-17 13:35:49 -04:00
Dennis Jen
844edac443 Optimize OpenID Course Claims for users. 
- Course overviews will cache courses upon publish.
- Added management command to warm up cache.
- OAuth2 handler returns courses via course overviews.
 2015-09-17 11:29:28 -04:00
christopher lee
ccc921bce8 MA-1149 fixed vote bug in discussion api 
An incorrect response was being returned when voting for a comment
or thread.
 2015-09-17 09:55:03 -04:00
Ben Patterson
d0b6d18134 Merge pull request #9767 from edx/benp/pin-coveralls 
Pin coveralls to specific version.
 2015-09-17 09:19:53 -04:00
Matt Drayer
cac9f97e77 Merge pull request #9785 from edx/saleem-latif/SOL-1199 
SOL-1199
 2015-09-17 07:44:55 -04:00
Saleem Latif
3741d065c2 CSS Animations disabled for test 2015-09-17 14:42:32 +05:00
Clinton Blackburn
70866104bf Merge pull request #9790 from edx/clintonb/enrollment-admin 
Built a better course enrollment admin
 2015-09-16 17:28:34 -04:00
John Eskew
22672ed8dc Merge pull request #9797 from edx/jeskew/resolve_issues_with_release 
Resolve issues with release 2015-09-15 merge to master
 2015-09-16 17:22:43 -04:00
John Eskew
6b12ec97cc Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 16:23:52 -04:00
Kevin Falcone
2b24d3dfb2 Merge pull request #9789 from edx/hotfix/2015-09-16 
Hotfix/2015 09 16
 2015-09-16 16:18:01 -04:00
John Eskew
684f901760 Fix quality issue. 2015-09-16 16:04:51 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Ben Patterson
c88b43b72d Pin coveralls to specific version. 
The latest version is compatible with the new coverage.py.
 2015-09-16 15:50:02 -04:00
Matt Drayer
ac0d926492 Merge pull request #9717 from edx/ziafazal/SOL-1193 
SOL-1193: moved variables from template to view
 2015-09-16 15:06:57 -04:00
Clinton Blackburn
7625c6eec3 Built a better course enrollment admin 2015-09-16 14:28:58 -04:00
Andy Armstrong
536783e6c9 hotfix/2015-09-16-3: Re-enable uglification of JavaScript in production. 2015-09-16 14:27:09 -04:00
Clinton Blackburn
011062e570 hotfix/2015-09-16-2: Credit Fixes 
- Updated checkout page to disallow purchase of credit seats (the credit payment page is hosted in ecommerce)
- Corrected path to providers endpoint
- Cleaned receipt page styling
- Updated receipt page copy
- Added provider thumbnail to receipt page

ECOM-2172
 2015-09-16 14:26:59 -04:00
Matt Drayer
05a2b54b5a hotfix/2015-09-16-1: Removed signatory org char limit 2015-09-16 14:24:57 -04:00
John Eskew
fa39016dfe Merge pull request #9729 from edx/rc/2015-09-15 
Rc/2015 09 15
 2015-09-16 14:01:18 -04:00
Ned Batchelder
da58885ebf Merge pull request #9788 from edx/ned/fix-mako-comments 
Mako comments have to be double-hash, or they are included on the page.
 2015-09-16 13:02:32 -04:00
Zia Fazal
cf80c07c14 moved variables from template to view 
fixed broken tests and quality violations

moved twitter_url to view also

escaped string for js
 2015-09-16 20:42:04 +05:00
Ned Batchelder
764cd862bd Mako comments have to be double-hash, or they are included on the page. 2015-09-16 11:24:18 -04:00
Max Rothman
628eb86654 Merge pull request #9558 from edx/max/set-superuser 
Add management command for granting superuser access
 2015-09-16 10:59:37 -04:00
Ben Patterson
9751b00b1c Merge pull request #9774 from edx/benp/sept2015-bok-choy-shard-rebal 
Bok-choy rebalance. Shard 5 is getting long comparatively.
 2015-09-16 10:56:42 -04:00
Sarina Canelake
cd05b62c64 Merge pull request #9780 from edx/sarina/fix-mako-syntax 
Fix Translator comment syntax in Mako templates [TNL-3277]
 2015-09-16 10:13:38 -04:00
Sarina Canelake
07664389b7 Fix Translator comment syntax in Mako templates [TNL-3277] 2015-09-15 21:16:16 -04:00
Adam
7f8b77cccb Merge pull request #9778 from edx/adam/patch-rc-with-fix-to-fix-not-found 
Adam/patch rc with fix to fix not found
 2015-09-15 18:04:40 -04:00
Adam Palay
8dd95a8825 add test for fix_not_found 
(PLAT-835)
(TNL-844)
 2015-09-15 18:03:53 -04:00
Adam Palay
cf71f48589 update_course_index should be passed a course key as a kwarg 2015-09-15 17:16:51 -04:00
Ben Patterson
754145a180 Rebalance. Shard_5 is getting long comparatively. 2015-09-15 15:19:38 -04:00
Peter Fogg
d265932621 Merge pull request #9768 from edx/peter-fogg/remove-expanded-team-membership 
Remove membership field from team serializer in the membership list endpoint.
 2015-09-15 14:54:05 -04:00
Mushtaq Ali
4f6a1fe766 Merge pull request #9760 from edx/mushtaq/tnl3252-fix-mathjax-rendering 
Fix Mathjax rendering bug
 2015-09-15 23:49:37 +05:00
David Baumgold
9cd6e6ffde Merge pull request #9764 from edx/db/i18n-course-rerun-strings 
Internationalize course re-run strings
 2015-09-15 14:30:59 -04:00
Peter Fogg
33f559b04a Remove membership field from teams when serializing memberships. 
TNL-3281
 2015-09-15 13:05:10 -04:00
John Eskew
8a9291029d Merge pull request #9766 from edx/mattdrayer/signatory-title-textarea 
mattdrayer/signatory-title-textarea: Increase form input limit to 106…
 2015-09-15 12:41:52 -04:00
David Ormsbee
da62662659 Merge pull request #9704 from lduarte1991/lti-iframe-userinfo 
Allows username and user email to be sent to an LTI.
 2015-09-15 12:00:54 -04:00
Matt Drayer
3adb26d95b mattdrayer/signatory-title-textarea: Increase form input limit to 106 characters 2015-09-15 11:55:08 -04:00
David Baumgold
58ea785e6e Merge pull request #9660 from OmarIthawi/edraak/watch-xmodule-assets 
Watch and process xmodule assets
 2015-09-15 11:43:35 -04:00
David Baumgold
61419cefa5 Re-word translators comment 2015-09-15 11:24:46 -04:00
David Baumgold
9b34ab51bd Break translators comments across multiple lines 2015-09-15 11:24:43 -04:00
Eric Fischer
c82e928bd6 Merge pull request #9749 from edx/efischer/teams-iesearch-clear 
Removing extraneous IE search clear button
 2015-09-15 11:04:14 -04:00
Christine Lytwynec
60c32778b6 Merge pull request #9682 from edx/clytwynec/AC-163 
Make studio forgot password link focusable
 2015-09-15 10:27:22 -04:00
Omar Al-Ithawi
82c0206ca6 Added messages after assets process steps 2015-09-15 17:22:22 +03:00
Omar Al-Ithawi
68198845ed Watch and process JS and CSS xmodule assets 2015-09-15 17:22:19 +03:00
David Baumgold
4dbd81451f Internationalize course re-run strings 2015-09-15 10:19:55 -04:00
Matt Drayer
5b2b7be2d9 Merge pull request #9694 from edx/saleem-latif/SOL-449 
SOL-449: Flaky Milestones acceptance test
 2015-09-15 10:04:58 -04:00
John Eskew
6454ffc3b1 Merge pull request #9734 from edx/jeskew/replace_remove_persistent_factory 
Refactor the test_crud file.
 2015-09-15 09:05:43 -04:00
Mushtaq Ali
d563a3e921 Fix Mathjax rendering bug 2015-09-15 17:46:18 +05:00
Matt Drayer
bedcf81418 Merge pull request #9757 from edx/mattdrayer/signatory-title-length 
mattdrayer/signatory-title-length: Bump to 106 characters
 2015-09-14 23:22:46 -04:00