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

32802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zia Fazal
5effbf14f2 scroll to top after saving 
fixed broken bok choy tests
 2015-09-16 20:10:16 +05: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
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
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
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
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
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
David Baumgold
477daac605 Merge pull request #9633 from edx/people-yaml-private 
Fetch people.yaml file from private repo
 2015-09-14 13:01:44 -04:00
David Baumgold
260038356c If cannot fetch people.yaml, entire script should fail 2015-09-14 12:57:31 -04:00
David Baumgold
1c4d160596 Fetch people.yaml file from private repo 2015-09-14 12:57:31 -04:00
Eric Fischer
4fe575d8c5 Fixing bad button style 
Removing unneeded styling on confirmation button; making the
appearance and hover/focus behavior of the button match that
of the confirmation dialog in studio.

TNL-3189
 2015-09-14 12:32:44 -04:00
Bill DeRusha
1cfadf39cc Add logic to handle not searching when focus is passed to the clear search button 
TNL-3238
 2015-09-14 11:08:33 -04:00
Ned Batchelder
59e2f47947 Merge pull request #9722 from edx/ned/upgrade-coverage-40b3 
Upgrade coverage.py to 4.0b3
 2015-09-14 10:36:21 -04:00
Muhammad Shoaib
e6d8841bac Merge pull request #9678 from edx/muhhshoaib/css-issue-for-allowances-in-instructor-dashboard 
fixed the allowances table css issue in instructor dashboard
 2015-09-14 19:15:22 +05:00
wajeeha-khalid
e492aa2367 Merge pull request #9737 from edx/jia/MA-1182_feedback 
MA-1182 - updated
 2015-09-14 19:13:21 +05:00
Peter Pinch
01eb2dffaf Merge pull request #9635 from mitocw/fix/bdero/dump-grades-command 
CRI-40 Don't assume user in request context when grading
 2015-09-14 09:05:56 -04:00
John Eskew
78af86bc5b Refactor the test_crud file. 
Move Split-specific tests to test_split_modulestore.py.
Derive remaining tests from ModuleStoreTestCase.
Remove unused persistent_factory.py.
 2015-09-14 07:51:00 -04:00
Muhammad Shoaib
20a3723544 Merge pull request #9693 from edx/muhhshoaib/fix-flaky-test 
SOL-1182 Fix of Flaky test in proctored exams.
 2015-09-14 13:44:41 +05:00
Aamir
b61f6bde2c Merge pull request #9581 from edx/aamir-khan/ECOM-2150-ga-client-missing-in-request 
ECOM-2150: Added the ga client fetching as a customer header in middl…
 2015-09-14 12:25:09 +05:00
wajeeha-khalid
bbad9ae772 MA-1182 - added test for not enrolled in course, removed commented out nose test code, formatted import statements according to edx standards 2015-09-14 11:43:21 +05:00
Ned Batchelder
985c6f64ec Fix the inheritance of tests into tests for the recommender tests 2015-09-12 08:32:14 -04:00
Bill DeRusha
4234ff5959 Merge pull request #9707 from edx/bderusha/edx-search-config 
Add edx-search configuration to lms
 2015-09-11 14:45:23 -04:00
Brian Beggs
60e4a9f31f Merge pull request #9653 from edx/ammar/remove-django-threaded-multihost 
remove django-threaded-multihost
 2015-09-11 14:08:30 -04:00
Bill DeRusha
eec2bed0c7 Add edx-search configuration to lms 
remove "defensive code" until we can figure out how to actually
catch the errors,
 2015-09-11 13:55:39 -04:00
Peter Fogg
12c9d6b52f Merge pull request #9714 from edx/peter-fogg/fix-slow-memberships 
Prevent over-expansion of team memberships.
 2015-09-11 13:37:50 -04:00
Matt Drayer
5241b04b03 Merge pull request #9689 from edx/ziafazal/SOL-1187 
SOL-1187: missing is_active attribute fix
 2015-09-11 13:35:27 -04:00
Daniel Friedman
87fcdb8088 Merge pull request #9723 from edx/dan-f/fix-teams-tab-spec-syntax-error 
Fix syntax error in teams_tab_spec.js
 2015-09-11 13:05:32 -04:00
Peter Fogg
48f72612c3 Prevent over-expansion of team memberships. 
TNL-3202
 2015-09-11 12:55:39 -04:00
Mark Hoeber
1aa73aa639 Merge pull request #9712 from edx/markhoeber-apidocfix 
Fix and cleanup of API doc
 2015-09-11 12:34:51 -04:00
chrisndodge
987808261d Merge pull request #9699 from edx/cdodge/0.9-proctoring 
update edx-proctoring to 0.9.x
 2015-09-11 12:29:07 -04:00
Zia Fazal
dd48bb0f4a missing is_active attribute fix 2015-09-11 11:46:32 -04:00
Daniel Friedman
44fd787a98 Fix syntax error in teams_tab_spec.js 2015-09-11 11:43:20 -04:00