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

32784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ned Batchelder
25449e9148 Upgrade coverage.py to 4.0b3 2015-09-11 11:35:52 -04:00
Sarina Canelake
40976cef76 Merge pull request #9720 from edx/sarina/flaky-cert-test 
Mark test as flaky (SOL-1199)
 2015-09-11 11:31:59 -04:00
Matt Drayer
034a7261e8 Merge pull request #9715 from edx/ziafazal/SOL-1192 
SOL-1192: include Null in filters while making a decision to pick right custom template
 2015-09-11 11:22:47 -04:00
Muhammad Shoaib
a7cec3283a Fix of Flaky test in proctored exams. 2015-09-11 20:08:58 +05:00
Sarina Canelake
39bfe27191 Merge pull request #9718 from edx/sarina/20150911-translations-update 
Update translations (autogenerated message)
 2015-09-11 10:36:57 -04:00
Sarina Canelake
463d425c7a Mark test as flaky (SOL-1199) 2015-09-11 10:30:42 -04:00
Sarina Canelake
a4904b38d8 Merge pull request #9686 from jolyonb/feqanswer 
Modifying template for formulaequationinput and fixing CSS
 2015-09-11 10:27:21 -04:00
Chris Dodge
68ee28f8b0 update edx-proctoring to 0.9.x 2015-09-11 10:00:05 -04:00
Peter Pinch
fe1c44afaf Merge pull request #9637 from edx/shr/bug/ccx_plat-795 
save_cxx slow transaction
 2015-09-11 09:56:51 -04:00
Saleem Latif
c8dc10b2d7 added wait for loading js files 2015-09-11 18:46:36 +05:00
Diana Huang
222c3ba01e Merge pull request #9713 from edx/diana/eventing-updates 
Add course id contexts to teams events
 2015-09-11 09:16:06 -04:00
Syed Hassan Raza
49dfee0e44 save_cxx slow transaction 2015-09-11 06:06:42 -07:00
Sarina Canelake
da86964ff4 Update translations (autogenerated message) 2015-09-11 08:56:36 -04:00
Ahsan Ulhaq
3613d0f0c3 Merge pull request #9701 from edx/ahsan/Update-reverification-block-version-hash 
Update edX Reverification Block hash to the updated version
 2015-09-11 12:17:51 +05:00
Matt Drayer
673e7ea553 Merge pull request #9658 from edx/saleem/SOL-1053 
SOL-1053
 2015-09-11 00:04:05 -04:00
Andy Armstrong
84442697f0 Merge pull request #9706 from edx/andya/remove-stray-breadcrumb 
Remove unnecessary breadcrumbs for Teams tab
 2015-09-10 22:45:29 -04:00