Commit Graph

12296 Commits

Author SHA1 Message Date
Carla Duarte
3879ad2252 Merge pull request #24387 from edx/ciduarte/AA-200
AA-200: Redirecting logged out users on Dates Tab
2020-07-08 15:45:37 -04:00
Robert Raposa
e7e1a409b2 consolidate ENABLE_FORUM_DAILY_DIGEST config (#24423)
The ENABLE_FORUM_DAILY_DIGEST config was using both
a Django Setting and a waffle flag. This consolidates
this to simply use the single Django Setting:
FEATURES['ENABLE_FORUM_DAILY_DIGEST'].

ARCHBOM-132
2020-07-08 13:08:06 -04:00
Dillon Dumesnil
f0b4c75289 AA-226: Adding Authentication classes to endpoints for mobile use
The class BearerAuthenticationAllowInactiveUser is needed for the
mobile app to authenticate. The other Auth classes are to support
the standard work flows.
2020-07-08 10:06:58 -07:00
Diana Huang
1655ecd063 Remove final shoppingcart references from instructor. 2020-07-08 09:36:43 -04:00
Feanil Patel
5fe7b0ad94 Merge pull request #24413 from edx/feanil/shoppingcart-removal-instructor-analytics
DEPR-43 - Remove shopping cart from instructor analytics.
2020-07-08 09:30:28 -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
64e94867fc Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-08 07:11:07 -04:00
Waheed Ahmed
a6a69224d1 Ratelimit login_user endpoint.
Ratelimited `login_user` endpoint using `django-ratelimit`, also
decreased default value of logistration rate limit to 100 requests
per five minutes per IP.

PROD-1877
2020-07-08 15:36:11 +05:00
Justin Lapierre
79f596a74e Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-07 22:03:27 -04:00
Feanil Patel
ca85021187 DEPR-43 - Remove shopping cart from instructor analytics. 2020-07-07 16:38:32 -04:00
daphneli-chen
51eff80553 Merge pull request #24329 from edx/dlichen/AA-202-Setup
dlichen/AA-202 setup
2020-07-07 13:15:32 -04:00
Daphne Li-Chen
76a2523c6e AA-203: created API framework for Progress tab, sending user information 2020-07-07 11:54:39 -04:00
Carla Duarte
24b4a4d1f2 AA-200: Redirecting logged out users on Dates Tab 2020-07-07 09:44:22 -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
Peter Pinch
03982bc44e format 2020-07-06 11:48:19 -04:00
Peter Pinch
ab80bb9cb1 format 2020-07-06 11:47:20 -04:00
Peter Pinch
01b0ee016a move staffing and enrollment to the remove section 2020-07-06 11:40:07 -04:00
Peter Pinch
6f3be0984b link to user retirement docs 2020-07-06 11:40:07 -04:00
Peter Pinch
fdc2aa3115 copy edits 2020-07-06 11:40:07 -04:00
Peter Pinch
254fcd17b6 file extension 2020-07-06 11:40:07 -04:00
Peter Pinch
e1c95a950c ADR for Sysadmin Dashboard deprecation and removal 2020-07-06 11:40:07 -04:00
Ali-D-Akbar
b2755a35a0 optimize course enrollment count query 2020-07-06 12:47:46 +05:00
Samuel Walladge
34516b9660 Consolidate get_transcript methods
There were two get_transcript methods. The broken one that was being
used (VideoTranscriptsMixin.get_transcript) is stripped out here - it
has been superseded by transcripts_utils.get_transcript. The latter
includes support for blockstore and VAL, while the former did not.

This fixes the `AttributeError: 'LibraryLocatorV2' object has no
attribute 'make_asset_key'` error seen when attempting to load a
transcript from a video through the xblock api when the video had the
transcript stored in blockstore.

Note that if you were previously using video.get_transcript, you should
now use `transcripts_utils.get_transcript(video, ...)`, and note that
the returned 'filename' will be prefixed with the language code, as
other `get_transcript*` functions already do.
2020-07-03 08:20:55 +09:30
Michael Terry
c9c548a550 Merge pull request #24365 from edx/ddumesnil/AA-220
AA-220: Making Library Content an Aggregator CompletionMode
2020-07-02 10:57:01 -04:00
Awais Jibran
44bde2f9da Patch IDV emails approved 2020-07-02 14:47:09 +05:00
Dillon Dumesnil
35549f56ba AA-220: Making Library Content an Aggregator CompletionMode
This change will prevent Library Content from being marked as
complete on view and the corresponding version bump to
edx-completion contains code that will start looking at the
children of the library content for completeness.
2020-07-01 17:33:54 -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
Michael Terry
3030efec78 AA-177: Add masquerading for course home MFE
- Looks at masquerading config for dates, outline, metadata, and
  celebration APIs in course_home_api / courseware_api.
- Consolidates and cleans up places we check whether masquerading
  gives us full access to a course.
2020-06-29 12:37:47 -04:00
Feanil Patel
cf5f9482e3 Merge pull request #23975 from edx/depr/shoppingcart-instructor-report
instructor_task: remove shoppingcart (DEPR-43)
2020-06-29 11:05:26 -04:00
Nimisha Asthagiri
80ea0a61f0 instructor_task: remove shoppingcart (DEPR-43) 2020-06-29 10:28:26 -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
alangsto
d694582441 Displays escalation email on Special Exams tab (#24331)
* Displays escalation email on Special Exams tab of instructor dashboard. MST-274

* updates for requested changes

* updates necessary for unit testing

* Fixes for pylint warning

* fix for quality tests
2020-06-29 09:11:48 -04:00
Awais Jibran
c106bfd83f Merge pull request #24254 from edx/aj/update-id-v-emails
Updating ID Verification Approved email template.
2020-06-29 13:07:35 +05:00
Awais Jibran
0142dcdf86 Adding ID Verification Approved email template.
PROD-1639
2020-06-29 12:17:55 +05: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
Danial Malik
c962423bbc Replace track calls with eventtracking in task_track and server_track (#24282)
* Replace track calls with eventtracking in task_track and server_track

* Making  events compatible with events emitted via track app

* Fixed broken tests and quality violation

* Removed useless changes in shim. using  in  to have  and  keys in event context

Co-authored-by: zia.fazal@arbisoft.com <zia.fazal@arbisoft.com>
2020-06-26 13:49:16 -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
Eric Herrera
bf945e2aec Separate tests according to the python version, due to incompatibilities in sorted dicts. 2020-06-25 11:35:21 -04:00