Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,526 Commits 1 Branch 0 Tags
66e2c7a5ea2ed2d758e73de459de4e729fd2e89d
Commit Graph

393 Commits

Author SHA1 Message Date
Jansen Kantor
f0ae71ab76 add get_team_by_team_id to teams service (#24783) 2020-08-17 16:04:34 -04:00
Uzair Rasheed
314fae8928 Merge pull request #190 from edx/security-fix/fix-xss-date 
Fix xss in date
 2020-07-30 10:59:44 +05:00
Uzair Rasheed
32fae72852 Merge pull request #192 from edx/security-fix/fix-xss-edit-member 
Fix xss in edit member template
 2020-07-30 10:59:21 +05:00
Ben Warzeski
beace438a4 update search description on new search string (#24619) 
* update search description on new search string

* disable xss-lint rule for jquery.html
 2020-07-28 09:21:59 -04:00
uzairr
6b8f903188 Fix xss in edit member template 2020-07-23 22:49:08 +05:00
uzairr
a006eef364 Fix xss in date 2020-07-22 03:01:21 +05:00
Nathan Sprenkle
620bbd7649 Hide search boxes in private team-sets for non-privileged users (#24444) 2020-07-15 12:30:06 -04:00
Justin Lapierre
1c57bf1be5 Merge pull request #24348 from edx/EDUCATOR-5080 
Educator 5080 - Refactor, rename and update docscript to reflect current teamset driven functionality
 2020-07-14 13:57:38 -04:00
Justin Lapierre
6efa2c8f94 EDUCATOR-5080 - Removed repeat argument from test method 2020-07-10 08:58:39 -04:00
Mat Carter
5a90bf7f40 EDUCATOR-5088 - updated test to ensure record is stored. 2020-07-09 14:24:19 -04:00
Mat Carter
b386f0a25e ensure anonymous_id is persisted for each team member in a team 2020-07-09 14:24:19 -04:00
Justin Lapierre
d5a01142a8 EDUCATOR-5080 - All tests passing, all code review comments addressed 2020-07-08 08:27:04 -04:00
Justin Lapierre
6797c9c0fa EDUCATOR-5080 - Fixing tests 2020-07-08 07:52:29 -04:00
Justin Lapierre
c371af4778 Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-07 08:36:10 -04:00
Ben Warzeski
d99890fb1a Team card teamset name (#24360) 
* show teamset as pennant in team cards within my_teams view

* update verifyCards spec helper to be able to check teamset label

* update tests for team_card teamset label.

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-07-01 15:37:45 -04:00
Justin Lapierre
3c5edb9524 EDUCATOR-5080 - Switched back to using topid_id in the method due to a cascade of test failures. Added ticket to cover the refactor at a future time 2020-07-01 11:02:37 -04:00
Justin Lapierre
70f5c98fb7 EDUCATOR-5080 - Updated views test case to account for teamset_id as opposed to topic_id 2020-07-01 09:40:46 -04:00
Justin Lapierre
7d47bc39dc EDUCATOR-5080 - Fixed test according to linting rules 2020-07-01 09:28:43 -04:00
Justin Lapierre
8735f8aa0d EDUCATOR-5080 - Fixed linting issue in the tests 2020-07-01 09:07:44 -04:00
Justin Lapierre
ae848f9830 EDUCATOR-5080 - Responding to code review comments, removed deprecated test, updated docstrings, fixed linting issue 2020-07-01 08:39:43 -04:00
Justin Lapierre
6980a996c1 Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-01 06:26:56 -04:00
atesker
d70303a893 EDUCATOR-5127 - update message 2020-06-30 11:55:21 -04:00
Justin Lapierre
309547d464 EDUCATOR-5080 - Updated doctring to represent the current behavior 2020-06-29 13:04:48 -04:00
Justin Lapierre
638a740625 EDUCATOR-5080 - Removed unused course logic, renamed method to refer to teamsets, updated docstrings, api and tests 2020-06-29 09:35:18 -04:00
Aarif
9e34cb3df9 Removed deprecated future imports (#24295) 2020-06-28 23:40:03 +05:00
Ben Warzeski
64e8332d38 Topic teams actions (#24336) 
* modern eslint allowances

* update topic teams to request team membership per local teamset

* update tests for topic_teams change

* cleanup

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-06-26 14:46:51 -04:00
Nathan Sprenkle
835ccafa5d Fix team size validation issue (#24290) 
* Edit team manage to check sizes at end of import

* Fix size validation to take new teams into account

* Remove redundant max size check

* Consolidate team membership counters

* Remove unused user_ids_by_teamset_id set

* Fix team removal to only occur after validation

* Update team full error message

* Prefetch users when looking up team counts
 2020-06-26 11:55:36 -04:00
Ali Akbar
e4bf35e556 Merge pull request #24313 from edx/aakbar/PROD-1688 
allow moderators to post in forum
 2020-06-26 17:00:47 +05:00
Ali-D-Akbar
e319e84969 allow moderators to post in forum 2020-06-26 16:29:54 +05:00
Jansen Kantor
79a76887b2 rebind events on re-render (#24288) 2020-06-23 13:56:12 -04:00
Aarif
27480cdd2f Removed deprecated future imports 2020-06-23 18:51:43 +05:00
Jansen Kantor
5c0fd63f13 emit an event when removing users from teams via csv (#24271) 2020-06-22 14:25:05 -04:00
atesker
34171e6d6e Disallow the condition of trying to add a master's learner to a non-protected team. 2020-06-22 09:20:32 -04:00
David Ormsbee
0b4cf7e06c Merge pull request #23039 from open-craft/samuel/fix-unescaped-selector 
SE-2176 Fix elem not selected if id contains special chars
 2020-06-19 12:13:20 -04:00
Nathan Sprenkle
5cedc64f41 Correct team count for private team-sets in Teams tab (#24216) 
* Hide private team-sets from users not on a team

* Modify add team count to factor in team visibility

* Fix bug that broke search w/in private team-sets
 2020-06-18 15:21:58 -04:00
Jansen Kantor
7e459c7228 EDUCATOR-5069: Display student key in csv export (#24235) 
* use external_user_key in teams csv download
 2020-06-18 12:13:06 -04:00
Samuel Walladge
43f0cd72af Merge remote-tracking branch 'origin/master' into samuel/fix-unescaped-selector 2020-06-16 09:52:38 +09:30
Nathan Sprenkle
44b0d832a0 Scope team search to course when removing from team (#24174) 2020-06-10 10:03:27 -04:00
Ben Warzeski
7c9f901096 Update 'create team?' prompt check in topic teams to look in teamset (#24088) 
* Update check for showing the 'create team?' prompt in topic teams to look in teamset

* fix tests and correct which collection we are checking

* eslint fixes

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-06-03 11:37:43 -04:00
Nathan Sprenkle
e0ddb1e0e2 Team Assignments Dashboard (#24019) 
* Add team assignments to frontend

* Limit team assignments to the given teamset

* Remove deprecated django render_to_response

* Move team assignments panel behind feature flag
 2020-06-02 15:05:47 -04:00
atesker
de0e8524a2 EDUCATOR 5065 - updates 
EDUCATOR 5065 - CR comments 3
 2020-06-02 14:03:01 -04:00
Ali Akbar
27b0e8d845 Merge pull request #23983 from edx/aakbar/PROD-1362 
fix admin unable to delete course team
 2020-05-22 13:08:03 +05:00
Ali-D-Akbar
32d4b2dae6 fix admin unable to delete course team 
modify delete team unit test for admin

test improvements

test improvements

test improvements

test improvements

add team unauthorized access test

add team unauthorized and forbidden access test
 2020-05-22 12:34:47 +05:00
Ben Warzeski
ee6eac546b Test non-ascii utf-8 character team member name upload. (#24009) 
* remove old_format reference in teams config

* validate uploaded character values for team csv upload

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-05-20 12:13:27 -04:00
Ben Warzeski
1703a88d46 remove old_format from team config tests (#24010) 
* remove old_format from team config tests

* remove old format from teams_config

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-05-20 08:56:46 -04:00
atesker
cfff2a86aa EDUCATOR-5053 2020-05-19 12:07:05 -04:00
Jansen Kantor
9707dcff6e EDUCATOR 5042: Learner's Private Team Appears When Learner Browses all Team Sets (#24004) 
* fix query to remove dulicates and incorrect teams
 2020-05-15 16:50:31 -04:00
Ben Warzeski
7778347aed remove old_format from team config tests 2020-05-15 14:44:23 -04:00
atesker
839a0edc4e EDUCATOR-4989 - use student-key 2020-05-13 13:07:31 -04:00
atesker
5462a176a8 EDUCATOR-4990 - Modify team membership via CSV upload. Slight refactoring - removal happens post static validation 2020-05-07 16:23:23 -04:00