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 |
|
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 |
|
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 |
|
Matt Drayer
|
60a8531348
|
mattdrayer/signatory-title-length: Bump to 106 characters
* Fix typo
* Fix odd test inputs
|
2015-09-14 17:19:02 -04:00 |
|
Peter Fogg
|
e38fc82650
|
Merge pull request #9752 from edx/peter-fogg/handle-elasticsearch-errors
Add error handling for elastic search.
|
2015-09-14 17:01:10 -04:00 |
|
Bill DeRusha
|
f3f7ef5a6d
|
Merge pull request #9750 from edx/bderusha/align-team-links
Right align text above action buttons
|
2015-09-14 16:47:05 -04:00 |
|
Peter Fogg
|
ca124354ba
|
Add error handling for elastic search.
|
2015-09-14 16:15:17 -04:00 |
|
Andy Armstrong
|
74757ed7af
|
Merge pull request #9745 from edx/andya/fix-duplicate-search-request
Fix duplicate calls to search API
|
2015-09-14 16:13:04 -04:00 |
|
Daniel Friedman
|
50bcc49619
|
Merge pull request #9751 from edx/dan-f/make-teams-tabs-accessible
Dan f/make teams tabs accessible
|
2015-09-14 16:10:04 -04:00 |
|
David Baumgold
|
b92fe80af5
|
Merge pull request #9753 from edx/sass-whitespace-cleanup
Remove trailing whitespace from Sass files
|
2015-09-14 15:53:35 -04:00 |
|
Eric Fischer
|
8285c9d829
|
Removing extraneous IE search clear button
Taken from http://stackoverflow.com/questions/14007655/remove-ie10s-clear-field-x-button-on-certain-inputs.
Not yet tested, but will be soon.
|
2015-09-14 15:32:44 -04:00 |
|
Ned Batchelder
|
f590fac35e
|
Merge pull request #9735 from edx/ned/uninherit-recommender-tests
Fix the inheritance of tests into tests for the recommender tests
|
2015-09-14 15:26:11 -04:00 |
|
David Baumgold
|
1c21a0d250
|
Remove trailing whitespace from Sass files
|
2015-09-14 15:17:10 -04:00 |
|
Bill DeRusha
|
21b143e40a
|
Right align text above action buttons
TNL-3234
|
2015-09-14 15:10:52 -04:00 |
|
Frances Botsford
|
77384f1a75
|
update styling for tabs as buttons
|
2015-09-14 14:34:10 -04:00 |
|
Daniel Friedman
|
e7bfd2d62e
|
Make tabbed view accessible
TNL-3150
|
2015-09-14 14:34:05 -04:00 |
|
Bill DeRusha
|
5881adda89
|
Merge pull request #9742 from edx/bderusha/clear-search
Add logic to handle not searching when focus is passed to the clear search button
|
2015-09-14 14:00:29 -04:00 |
|
Eric Fischer
|
da113d7383
|
Merge pull request #9741 from edx/efischer/dialog-style-fixes
TNL-3189 Fixing bad button style
|
2015-09-14 13:43:37 -04:00 |
|
Eric Fischer
|
4d0a12755b
|
Merge pull request #9747 from edx/efischer/rc-style-fix
Fixing bad button style
|
2015-09-14 13:43:15 -04:00 |
|