Commit Graph

12063 Commits

Author SHA1 Message Date
clrux
4e6dbc9e62 Merge pull request #9440 from OmarIthawi/omarithawi/nav-seq-module-rtl
Flipped the direction of the seq_module arrows
2015-08-25 11:39:57 -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
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
Omar Al-Ithawi
e57d8a732c RTL next and prev. arrows in sequence module navigation 2015-08-25 12:37:18 +03: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
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
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
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
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
David Ormsbee
6b12969ea2 Use bulk_operations in group access tests. 2015-08-24 01:00:36 -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
Peter Fogg
839fb70869 Remove unnecessary New Relic trace. 2015-08-21 15:07:46 -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
Eric Fischer
a1a9f3bdcb Merge pull request #9405 from edx/efischer/js-flakes
JS Flakiness in TeamDiscussionView
2015-08-21 10:29:21 -04:00
Mushtaq Ali
d1e31afa4b Merge pull request #9397 from edx/mushtaq/tnl-3095-fix-course-sidebar-padding
Fix course info sidebar padding
2015-08-21 19:20:31 +05:00
Mushtaq Ali
7c61e08dcd Fix course info sidebar #3095 2015-08-21 18:39:38 +05:00
Eric Fischer
90b94a46bc Potential fix for flaky TeamDiscussionView js tests
Adding waitsFor check in the beforeEach method. The condition I'm
waiting for here is shamelessly borrowed from bok-choy's
wait_for_ajax._is_ajax_finished() method:
https://github.com/edx/bok-choy/blob/master/bok_choy/page_object.py#L431

This seems to fix the errors I was able to generate with the
set_timeout, which themselves looked ver similar to the failing
master tests, so I *think* this will fix our woes, but since I was
never able to get the tests to fail exactly the same way I can't be sure.

Since there don't seem to be any drawbacks, this is going into mainline
as-is and we'll monitor for the sporadic failures over the next few
weeks.
2015-08-21 09:38:46 -04:00
chrisndodge
045a67aa30 Merge pull request #9416 from edx/cdodge/remove-external-id-from-report
alter columns in proctoring exam report
2015-08-21 07:29:00 -04:00
tasawernawaz
68da716d3d Merge pull request #9399 from edx/tasawer/bugfix/ecom-1932-Upgrade-page-not-displaying-in-French
Fixing issue for french language
2015-08-21 11:24:09 +05:00
Chris Dodge
110dbc048c alter columns in proctoring exam report 2015-08-20 20:21:54 -04:00
Alison Hodges
1e374f4d4e Merge pull request #9382 from edx/ahodges/comments_on_roles
Adds a comment to reduce confusion over remaining role name differences
2015-08-20 20:18:04 -04:00
Peter Fogg
16503d9853 Merge pull request #9410 from edx/peter-fogg/fix-tnl-3101-quality
Peter fogg/fix tnl 3101 quality
2015-08-20 16:16:08 -04:00
Alison Hodges
3547821b1a Adds a comment to reduce confusion over remaining role name differences 2015-08-20 16:09:35 -04:00
Peter Fogg
5c855bdc7b Fix quality violation. 2015-08-20 15:15:14 -04:00
Mushtaq Ali
c80906596b Fix Forum Update Issue #TNL-3101 2015-08-20 13:08:41 -04:00
Will Daly
d4f521b43d Merge pull request #9332 from edx/will/final-icrv-access-control
In-Course Reverification Access Control
2015-08-20 09:24:05 -07:00
zubair-arbi
ec28a75f14 In-course reverification access control
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
2015-08-20 08:43:55 -07:00
Matt Drayer
ebed8cd42a Merge pull request #9339 from edx/ziafazal/SOL-493
ziafazal/SOL-493: Fetch scores via ScoresClient
2015-08-20 10:20:48 -04:00
Tasawer
ad77bc51ec Fixing issue for french language
ECOM-1932
2015-08-20 17:49:52 +05:00
Awais
653554fd7a fixing issue with student reverification.
ECOM-2106
2015-08-20 16:25:05 +05:00
tasawernawaz
74c7c2ad77 Merge pull request #9392 from edx/tasawer/bugfix/ecom-1996-hiding-find-course-button-on-edge
Hiding find courses button from dashboard of edge.edx.org
FYI @wedaly
2015-08-20 14:13:10 +05:00
Tasawer
46f2adf68c Hiding find courses button from dashboard of edge.edx.org
ECOM-1996
2015-08-20 11:45:34 +05:00
Christina Roberts
2f5193cf18 Merge pull request #9383 from edx/christina/search-sort
Add sorting by last_activity_at.
2015-08-19 16:48:10 -04:00
Ahsan Ulhaq
a495847b45 Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages
Add USD labels to prices on track selection pages
2015-08-20 00:37:27 +05:00
Marco Morales
e56c3d91af Merge pull request #9310 from edx/frances/teams-padding-responsive
Teams page content padding
2015-08-19 15:31:55 -04:00
Eric Fischer
5ee49351f1 Merge pull request #9346 from edx/efischer/fix_docs_course_id_team_membership
Updating documentation for team_membership endpoint
2015-08-19 14:59:38 -04:00
Ahsan Ulhaq
3d62580fc2 Add USD labels to prices on track selection pages
ECOM-2114
2015-08-19 23:59:15 +05:00
cahrens
295108c9a4 Add sorting by last_activity_at.
TNL-3011
2015-08-19 14:23:38 -04:00
Christina Roberts
276cba90c6 Merge pull request #9262 from edx/christina/search-sort
Add sorting by team_count, as well as secondary sort (by name).
2015-08-19 12:25:07 -04:00
Eric Fischer
86f4806e84 Updating documentation for team_membership endpoint
Recent changes to the team_membership API endpoint added the
course_id optional parameter, but the in-code documentation
was never updated to reflect this. The wiki documentation at
https://openedx.atlassian.net/wiki/display/TNL/Team+API is OK.

Related: https://github.com/edx/edx-platform/pull/9289
2015-08-19 12:21:45 -04:00