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

21383 Commits

Author SHA1 Message Date
Justin Lapierre
bf4b87627b Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-10 08:50:18 -04:00
Dillon Dumesnil
b3b812186e Merge pull request #24434 from edx/ddumesnil/complete-field-date-block 
Adding in missing field to the DateSummarySerializer
 2020-07-09 07:28:26 -07:00
Dillon Dumesnil
1abfb98cab Adding in missing field to the DateSummarySerializer 2020-07-09 06:53:11 -07:00
Robert Raposa
77e490f057 ARCHBOM-1305: remove deprecated flag_undefined_default (#24426) 
This is the final step in removing the deprecated
flag_undefined_default as explained by the following ADR:
https://github.com/edx/edx-platform/blob/master/openedx/core/djangoapps/waffle_utils/docs/decisions/0001-refactor-waffle-flag-default.rst

Notes:

* All uses of flag_undefined_default=False were always
  supposed to have been no-ops.
* All uses of flag_undefined_default=True that are removed
  in this PR have been replaced by migrations in past PRs.
* The temporary metric temp_flag_default_used id no longer
  reporting any data.

ARCHBOM-1305
 2020-07-09 09:31:31 -04:00
JJ
36e07f6be8 [REV-1205] Add ecommerce event tracking to course dashboard upgrade button (#24338) 
Create a Javascript function to log upsell events to & attach the eventing to the course dashboard upsell button. The revenue squad is looking for more insight into which buttons users are clicking to get to the checkout page.
 2020-07-09 09:28:03 -04:00
Awais Jibran
b30635af83 Merge pull request #24398 from edx/aj/remove-deprecated-idv-emails 
Deprecate old idv emails
 2020-07-09 16:10:13 +05:00
AsadAzam
0fa00c6e23 Merge pull request #24400 from edx/asad/prod-1634 
Fixed email sent on valid sso verification
 2020-07-09 16:04:48 +05:00
Asad
206977d571 Fixed email sent on valid sso verification 2020-07-09 13:37:35 +05:00
Awais Jibran
adaa701a76 Deprecate old idv code 2020-07-09 11:53:16 +05:00
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
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
ea314a9314 Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-08 08:53:44 -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
Waheed Ahmed
4f80fd6540 Improve password reset rate limit. 
Used django-ratelimit instead of django-ratelimit-backend
to configure two different rate limit configurations for same
endpoint.

PROD-1708
 2020-07-08 16:19:07 +05: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
Alex Dusenbery
acb9111beb cleanup devstack.py to only toggle ENABLE_ENTERPRISE_INTEGRATION in one place. 2020-07-07 10:43:37 -04:00
Carla Duarte
24b4a4d1f2 AA-200: Redirecting logged out users on Dates Tab 2020-07-07 09:44:22 -04:00
Tim McCormack
df3f8d4344 Enable "Sign in with Apple" auth backend (ARCHBOM-1281) (#24368) 2020-07-07 13:25:33 +00:00
Justin Lapierre
c371af4778 Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-07 08:36:10 -04:00
Ali-D-Akbar
b2755a35a0 optimize course enrollment count query 2020-07-06 12:47:46 +05:00
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
Alex Dusenbery
c3e5ec8272 Turn on enterprise integration in devstack settings. We are first-class citizens, and we demand respect! :p 2020-07-02 10:51:03 -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
Tim McCormack
ff203efe1f Envs doc updates: Django version, update aws.py reference in image (#24364) 
- Reference correct version of Django docs
- Updates to LMS envs diagram:
    - Rename aws.py reference in image (now production.py)
    - Remove deprecated and deleted environments
- Update note on `devstack_docker.py` to explain history
 2020-06-30 20:14:41 +00:00
atesker
d70303a893 EDUCATOR-5127 - update message 2020-06-30 11:55:21 -04:00
Saleem Latif
85bf89db3e Added COURSE_CATALOG_URL_ROOT to django settings 2020-06-30 14:19:54 +05:00
Michael Terry
e8c2f351fe Merge pull request #24289 from edx/mikix/masquerade-learning-mfe 
AA-177: Add masquerading for course home MFE
 2020-06-29 13:10:26 -04:00
Justin Lapierre
309547d464 EDUCATOR-5080 - Updated doctring to represent the current behavior 2020-06-29 13:04:48 -04:00
Zachary Hancock
6afbb9827b remove unenroll button for masters enrollments (#24325) 
* remove unenroll for masters

* i18n string
 2020-06-29 12:57:46 -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
Matthew Piatetsky
c8dd6e5d58 Temporarily increase default throttle rates for service user to handle increased throughput against data sharing consent endpoint 2020-06-29 11:20:35 -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