32335 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bill DeRusha	cd751ab5fe	Merge pull request #9460 from edx/bderusha/edx-search-for-teams-TNL-3013-patch ... Remove pylint: disable invalid-name for paginator error and fix syntax	2015-08-25 11:01:11 -04:00
David Ormsbee	154c9bae43	Merge pull request #9457 from edx/ormsbee/faster_tests_user_api ... Convert UpdateEmailOptInTestCase to use SharedModuleStoreTestCase	2015-08-25 10:31:23 -04:00
Muhammad Shoaib	dff2688c06	Merge pull request #9446 from edx/muhhshoaib/PHX-124-alignment-issues-in-proctoring-exam-screens ... PHX-124	2015-08-25 19:20:17 +05:00
Bill DeRusha	81ced1c964	Remove disable pylint for paginator error and fix syntax	2015-08-25 10:08:16 -04:00
David Ormsbee	a1a9a2a576	Convert UpdateEmailOptInTestCase to use SharedModuleStoreTestCase	2015-08-25 09:47:59 -04:00
David Ormsbee	3e4325dc4a	Merge pull request #9453 from edx/ormsbee/faster_tests_class_dashboard ... Convert class dashboard tests to use SharedModuleStoreTestCase.	2015-08-25 09:40:26 -04:00
David Ormsbee	fdfaa56579	Merge pull request #9449 from edx/ormsbee/faster_tests_ccx ... Move some CCX view tests to use SharedModuleStoreTestCase (performance).	2015-08-25 09:24:26 -04:00
David Ormsbee	08343b9636	Merge pull request #9438 from edx/ormsbee/instructor_dash_tests_speedup ... Speed up Instructor Dash tests + add manual reset for SharedModuleStoreTestCase	2015-08-25 08:52:19 -04:00
Muhammad Shoaib	73722c47d3	Merge pull request #9375 from edx/muhhshoaib/PHX-118-timer-bar-scroll-out-view-css ... PHX-118 added the css for the timer bar visibility when the page scrolls	2015-08-25 12:37:44 +05:00
David Ormsbee	d6f3cd8634	Convert class dashboard tests to use SharedModuleStoreTestCase.	2015-08-25 01:57:47 -04:00
David Ormsbee	2ecf7aec46	Update Instructor Dashboard tests to use SharedModuleStoreTestCase. ... Also added reset_test_case() and @modifies_courseware to SharedModuleStoreTestCase. Revert "More verbose test builds in Jenkins, for debugging." This reverts commit 58cade4cc4288335026649470a48b7bbca969ee8.	2015-08-25 01:28:55 -04:00
Sarina Canelake	887a3af401	Merge pull request #9452 from edx/sarina/update-dummy-strings ... Update dummy translation files with Underscore template strings	2015-08-24 20:25:05 -04:00
Sarina Canelake	6381be87c6	Update dummy translation files with Underscore template strings	2015-08-24 18:05:13 -04:00
Ned Batchelder	4c03b2bbee	Merge pull request #9451 from edx/ned/extract_more_i18n ... Adjust the i18n extraction rules to get all the strings we should get.	2015-08-24 17:54:26 -04:00
Ned Batchelder	3eb2e31c52	Adjust the i18n extraction rules to get all the strings we should get. ... There's a move afoot to put assets inside individual Django apps, instead of in upper-level "templates" directories. These i18n configuration files have to take this into account. .underscore files are easy to find by their unique file extension, so the rule can be simple. Mako files are .html, so we have to be more nuanced about it. We don't want to get pure HTML files, and we don't want to get .html files for tests, even if they are Mako templates.	2015-08-24 16:27:36 -04:00
David Ormsbee	4053d625c9	Move some CCX view tests to use SharedModuleStoreTestCase (performance).	2015-08-24 16:21:27 -04:00
David Ormsbee	f2b3f913c8	Merge pull request #9443 from edx/ormsbee/group_access_test_speedups ... Use bulk_operations in group access tests.	2015-08-24 14:54:00 -04:00
Kelketek	71e367ea81	Merge pull request #9445 from edx/update-edx-submissions ... Update edx-submissions hash	2015-08-24 11:36:15 -05:00
Bill DeRusha	28bca8e683	Merge pull request #9365 from edx/bderusha/edx-search-for-teams-TNL-3013 ... Add basic elasticsearch search for teams	2015-08-24 11:40:40 -04:00
Muhammad Shoaib	e8b399aaa1	PHX-118 added the css for the timer bar visibility when the page scrolls	2015-08-24 20:11:23 +05:00
Eric Fischer	5d1bd22505	Merge pull request #9431 from edx/efischer/js-flakes ... Potential fix for flaky TeamDiscussionView js tests	2015-08-24 10:49:09 -04:00
Kelketek	8912e02fd9	Update edx-submissions hash ... Fixes an issue where install_prereqs would occasionally install an old version of pytz because edx-submissions included an old version in its requirements.	2015-08-24 09:10:49 -05:00
Eric Fischer	d64c2b299f	Fix for flaky TeamDiscussionView js tests ... After being able to reproduce the errors exactly by making certain elements unfindable, I concluded that the issues we've been seeing on headless jenkins runs are due to execution happening too quickly and elements not loading in time to be interacted with. The fix is to make liberal use of Jasmine 1.3 `runs` and `waitsFor` functionality, to ensure that execution happens in the order that we want, with rendering being checked before proceeding. Once again, I can't be 100% sure that this fixes the Jenkins errors, as those are very hard to reliably reproduce, but this is an educated guess at fixing the problem with no drawbacks, as I've been able to successfully run all tests locally.	2015-08-24 10:06:52 -04:00
Muhammad Shoaib	8c2de514f8	PHX-124 ... fixed the alignment issues in proctoring exam screens	2015-08-24 18:58:13 +05:00
Bill DeRusha	973314de7b	Add basic elasticsearch search for teams ... TNL-3014 Add tests for search Add text_search to TeamsListView Add reindex command line tool for course teams Add Search Pagination and update comments Move paginate_search_results to common library	2015-08-24 09:22:06 -04:00
Marko Jevtić	45832b986a	Merge pull request #9283 from edx/mjevtic/SOL-1040 ... (SOL-1040) Indexing capa problems	2015-08-24 14:40:29 +02:00
zubair-arbi	7b346f7d11	Merge pull request #9441 from edx/zub/bugfix/ecom-2066-fix-error-display-on-getting-course-name ... display course id instead of name in course name placeholder, if ajax…	2015-08-24 16:21:10 +05:00
zubair-arbi	8ca590d4f3	display course id instead of name in course name placeholder, if ajax call to get course data fails	2015-08-24 14:03:57 +05:00
Muhammad Shoaib	c11049ee80	Merge pull request #9439 from edx/cdodge/add-course-name ... add ability to return the course name (optionally) when querying abou…	2015-08-24 13:51:08 +05:00
David Ormsbee	6b12969ea2	Use bulk_operations in group access tests.	2015-08-24 01:00:36 -04:00
Chris Dodge	ea1e875dfe	add ability to return the course name (optionally) when querying about credit requirement fulfillments	2015-08-22 17:24:23 -04:00
Peter Fogg	1f6d28e215	Merge pull request #9435 from edx/peter-fogg/remove-team-newrelic-trace ... Remove unnecessary New Relic trace.	2015-08-21 17:21:06 -04:00
David Ormsbee	56706d073c	Merge pull request #9429 from edx/ormsbee/test_recommender_speedup ... Switch TestRecommender to use SharedModuleStoreTestCase	2015-08-21 17:15:31 -04:00
Ahsan Ulhaq	3acd3bdaad	Merge pull request #9394 from edx/ahsan/ECOM-2026-Credit-email-should-use-correct-staticfiles-library ... Credit eligibility email should use the correct staticfiles library	2015-08-22 01:18:40 +05:00
Peter Fogg	839fb70869	Remove unnecessary New Relic trace.	2015-08-21 15:07:46 -04:00
Mark Hoeber	68414a1345	Merge pull request #9352 from edx/markhoeber-doc2219 ... Updated Certificate's config page help	2015-08-21 14:40:38 -04:00
Will Daly	a7e9789021	Merge pull request #9424 from edx/will/remove-unused-dependencies ... Remove django-followit and django-keyedcache	2015-08-21 10:58:24 -07:00
Eric Fischer	9a7605497b	Merge pull request #9430 from edx/revert-9405-efischer/js-flakes ... Revert "JS Flakiness in TeamDiscussionView"	2015-08-21 13:57:42 -04:00
Eric Fischer	f07c303628	Revert "JS Flakiness in TeamDiscussionView"	2015-08-21 13:56:44 -04:00
David Ormsbee	3d1ce45187	Switch TestRecommender to use SharedModuleStoreTestCase (for performance)	2015-08-21 13:41:09 -04:00
Will Daly	689efedeee	Merge pull request #9427 from edx/will/update-django-extensions ... Upgrade django-extensions to 1.5.5	2015-08-21 10:32:25 -07:00
Will Daly	5d53c4a12a	Remove django-followit and django-keyedcache	2015-08-21 10:09:11 -07:00
Will Daly	9382db5a76	Merge pull request #9426 from edx/will/upgrade-django-ipware ... Upgrade django-ipware to 1.1.0	2015-08-21 10:05:42 -07:00
Will Daly	0f590adde2	Upgrade django-extensions to 1.5.5	2015-08-21 09:16:56 -07:00
Sarina Canelake	1822d66120	Merge pull request #9425 from edx/sarina/20150821-translations-update ... Update translations (autogenerated message)	2015-08-21 12:11:05 -04:00
Will Daly	3901c03d30	Upgrade django-ipware to 1.1.0	2015-08-21 09:00:42 -07:00
Ahsan Ulhaq	e3674e92e3	Credit eligibility email should use the correct staticfiles library ... ECOM-2026	2015-08-21 20:17:55 +05:00
Sarina Canelake	8f3310c04b	Update translations (autogenerated message)	2015-08-21 10:49:56 -04:00
chrisndodge	e9638039de	Merge pull request #9420 from edx/cdodge/upgrade-edx-proctoring ... Update edx-proctoring version to 0.7.1	2015-08-21 10:33:57 -04:00
Usman Khalid	9330ce6669	Merge pull request #9384 from edx/usman/update-ora ... Update edx-ora2 to release-2015-08-19T17.17.	2015-08-21 19:30:10 +05:00