Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

418 Commits

Author SHA1 Message Date
Peter Fogg
86cce5f0ef Add teams eventing for search. 
TNL-3187
 2015-09-04 12:40:37 -04:00
Diana Huang
a743f4a642 Add teams eventing and tests. 2015-09-04 10:45:01 -04:00
Daniel Friedman
0e180bd2c2 Add membership thumbnails to team cards. 
TNL-3172
 2015-09-03 10:58:58 -04:00
Frances Botsford
0145ae7b6e adjust teams search styles and add search clear 2015-09-02 12:26:08 -04:00
Andy Armstrong
4be74937df Add searching to the teams view 
TNL-1935
 2015-09-02 12:26:07 -04:00
Peter Fogg
67a6dd08bc Remove unnecessary bindAll calls. 2015-09-01 13:56:20 -04:00
Christina Roberts
9f86f18841 Merge pull request #9503 from edx/christina/composite-index 
Team API Performance Improvements
 2015-09-01 10:30:47 -04:00
muhammad-ammar
4840b46716 i18n and rtl fixes 
TNL-3125
 2015-09-01 12:16:41 +05:00
frances botsford
072a66e196 Merge pull request #9468 from edx/frances/teams-padding-responsive-followup 
updated responsive body class to .is-view-in-course
 2015-08-31 21:52:01 -04:00
Frances Botsford
44d3cb444f updated responsive body class to .is-view-in-course 2015-08-31 14:41:46 -04:00
Peter Fogg
2c774fd271 Allow sorting of teams in a topic. 
TNL-1937
 2015-08-28 15:46:07 -04:00
cahrens
9992ba66df Name teams in a more meaningful way 2015-08-28 12:42:50 -04:00
Peter Fogg
17253ead24 Cache team_size on CourseTeam model and remove is_active field. 
TNL-3112 TNL-3154
 2015-08-28 12:29:42 -04:00
cahrens
583b265934 Add course_id and topic_id composite index. 2015-08-28 12:16:39 -04:00
cahrens
cd4916b68a MySQL order_by is case insensitive. 
Tests run with SQLlite though, which is case sensitive.
 2015-08-28 12:16:38 -04:00
Andy Armstrong
b74a1b9825 Disable team discussion Jasmine tests 
This is a temporary solution until we can fix TNL-3007
 2015-08-28 10:46:41 -04:00
Bill DeRusha
9eafe4dfe6 Merge pull request #9489 from edx/bderusha/teams-mock-callback 
Improve teams test run times by skipping signals
 2015-08-28 10:09:17 -04:00
muzaffaryousaf
b45ffa11cc Changing the createNew teams-tab.js method to use the viewWithHeader. 
TNL-2964
 2015-08-28 15:59:21 +05:00
muzaffaryousaf
f788caa6cc Edit team page for Instructor only. 
TNL-1914
 2015-08-28 12:47:15 +05:00
Bill DeRusha
24a41dc59e Improve teams test run times by skipping signals 
TNL-3126

add **kwargs to skip_signal method
 2015-08-27 16:08:54 -04:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals 
Add signals for user's discussion activity.
 2015-08-27 14:07:29 -04:00
Muzaffar yousaf
3eaf29fabe Merge pull request #9343 from edx/muzaffar/tnl1930-teams-accessibility 
Muzaffar/tnl1930 teams accessibility
 2015-08-27 22:50:36 +05:00
muzaffaryousaf
76f3ca8655 Accessibility fixes for team profile page. 
TNL-1930
 2015-08-27 22:02:29 +05:00
Christina Roberts
df76994ea5 Merge pull request #9415 from edx/christina/insensitive-check 
Do a case insensitive check for conflicts to improve performance.
 2015-08-27 12:57:29 -04:00
cahrens
41ac90fa7a Use team name prefix and UUID for team_id. 
TNL-3107
 2015-08-27 11:22:35 -04:00
Muhammad Ammar
d38da773ea Merge pull request #9265 from edx/ammar/use-studio-confirmation-dialog-in-lms 
Confirm when leaving team
 2015-08-27 17:26:07 +05:00
Eric Fischer
4d974730bf Removing extraneous render from team_discussion.js 
On the advice of https://github.com/edx/edx-platform/pull/9470,
the render call here is not needed and should be removed in order
to allow the view's owner to determine when it needs to be rendered.

This will hopefully also fix the flaky tests we've been seeing,
we'll need to continue to monitor the builds to be sure.
 2015-08-26 12:20:33 -04:00
Eric Fischer
3e407b9d7f Revert "Fix for flaky TeamDiscussionView js tests" 
This reverts commit d64c2b299f.
 2015-08-26 12:20:33 -04:00
Peter Fogg
fad40cf3f8 Show a team's last activity in the UI. 
Fix timeago and requireJS.
 2015-08-26 12:07:55 -04:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity. 
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
 2015-08-26 12:07:54 -04:00
muhammad-ammar
d8b419c64f Review changes 2015-08-26 20:26:35 +05:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
Peter Fogg
382909b7c3 Add sorting controls on Teams topics page. 
TNL-1936
 2015-08-25 16:59:52 -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
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
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
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
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
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
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
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
cahrens
c5f5a58c28 Allow course staff and privileged users to create multiple teams. 
TNL-3071
 2015-08-19 11:07:15 -04:00
Eric Fischer
da3ac3e65b Validating team size on join, server-side 
By doing this, we can prevent the bug where multiple users can join
a team simutaneously and push its enrollment over the defined
maximum value. Tests have also been added to confirm this behavior.

TNL-3061
 2015-08-19 11:07:14 -04:00
cahrens
9fe6dd2791 Call super instead of referencing superclass directly. 2015-08-19 10:52:50 -04:00
cahrens
1bd4b1d60c Add sorting by team_count, as well as secondary sort. 
TNL-3012
 2015-08-19 10:52:50 -04:00
Diana Huang
de15f8ec55 Merge pull request #9360 from edx/diana/add-last-activity 
Add a new last_activity_at field.
 2015-08-18 12:03:48 -04:00
Diana Huang
ce8f311256 Add a new last_activity_at field. 
TNL-3068
 2015-08-18 11:21:04 -04:00