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

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
2e0e2ef80c Revert "Python Requirements Update" 2020-07-10 09:59:38 -04:00
Tim McCormack
87edb542b1 Delete flaky test according to process (#24441) 
https://openedx.atlassian.net/browse/CR-2425 for re-evaluating it
 2020-07-10 13:39:13 +00:00
Feanil Patel
9bb9d655ec Merge pull request #24438 from edx/feanil/fix_url_link_map_logic_archbom-1336 
Correct logic on building marketing links.
 2020-07-10 09:26:49 -04:00
adeelehsan
a26b9317db Merge pull request #24418 from edx/aehsan/prod-674/get_useremail_from_request_session 
Get user email from request
 2020-07-10 18:06:03 +05:00
Justin Lapierre
6efa2c8f94 EDUCATOR-5080 - Removed repeat argument from test method 2020-07-10 08:58:39 -04:00
Michael Terry
7a0ae455f7 Merge pull request #24442 from edx/mikix/update-when 
Bump edx-when to 1.2.9
 2020-07-10 08:53:18 -04:00
Justin Lapierre
bf4b87627b Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-10 08:50:18 -04:00
Aarif
bf4ea104c0 Python Requirements Update (#24445) 2020-07-10 17:06:32 +05:00
adeelehsan
b26f26e993 Get user email from request 
PROD-674
 2020-07-10 16:50:05 +05:00
edX requirements bot
98e606d23b Updating Python Requirements 2020-07-10 07:29:40 -04:00
Michael Terry
6ff23be320 Bump edx-when to 1.2.9 
This prevents seeing due dates for enrollments originally created
too close to the course end to allow for finishing the course in time.

AA-195
 2020-07-09 16:20:15 -04:00
Feanil Patel
4ac2c5e92b Correct logic on building marketing links. 
The logic used to has a special case for edge in the hostname which
didn't really make sense. So instead we just check to see if the given
url starts with http and if it does we return it directly.  If it doesn't,
then we try to convert it to a valid url and return that.  If that fails
we return .

Add a new custom metric `unresolved_marketing_link` to track when we
run into this scenario.
 2020-07-09 15:09:38 -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
Alex Dusenbery
0e2b612c1f Update edx-enterprise to 3.3.18 2020-07-09 11:17:25 -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
Felipe Montoya
72483a0f66 Merge pull request #24379 from eduNEXT/lmm/ratelimit 
[BD-6] Use PyPi release of django-ratelimit
 2020-07-09 09:23:03 -05:00
alangsto
90d6b18711 Add link to exam settings page from studio (#24405) 
* testing

* updates to drop down

* unit tests. env changes were copied based on other MFEs in LMS

* added exam settings link to other course settings pages

* fixed pylint errors

* updates for requested changes

* updates for requested changes, as well as changes for xss linter
 2020-07-09 10:13:18 -04:00
Feanil Patel
39dcd80211 Merge pull request #24428 from edx/feanil/404-on-not-found 
If this reverse failed, it was throwing a 500.
 2020-07-09 09:57:21 -04: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
edX Transifex Bot
542b33e1e0 geoip2: update maxmind geolite country database 2020-07-09 14:27:06 +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
Usman Khalid
4cc0f30db7 Convert WordCloudDescriptor and WordCloudModule into WordCloudBlock. 2020-07-09 09:46:54 +05:00
Feanil Patel
b6fdad2ea4 If this reverse failed, it was throwing a 500. 
Catch the 500 in this case and throw a 404 instead.
 2020-07-08 15:56:53 -04: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
Feanil Patel
be23278034 Merge pull request #24422 from edx/feanil/archbom-1298-login-page-error-on-invalid-email 
ARCHBOM-1298 Validate before accessing email parts.
 2020-07-08 14:16:16 -04:00
Feanil Patel
f2ac18049b Validate before accessing email parts. 
For somereason earlier validation is not ensuring that we have a valid e-email.
In this case, break out of the flow since we don't have a domain that's in our
list and log the user's id so that we can learn more about when this happens.

By a reading of the code flow, it doesn't seem like it should be possible except
with a handful of users that have invalid e-mail addresses in the database but it
seems to be happening pretty regularly.
 2020-07-08 13:35:55 -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
Robert Raposa
371f89838b use flag's everyone setting when no request (#24416) 
This is Phase 2 if a rollout started here:
https://github.com/edx/edx-platform/pull/24392

When a flag is being used without a request, we will
return True if the flag's everyone status is set to
True.

The current implementation is to use flag_undefined_default,
which is deprecated and we are trying to remove it.

ARCHBOM-1331
 2020-07-08 11:12:56 -04:00
Awais Qureshi
57f628a847 Merge pull request #24415 from edx/testeng/bokchoy_auto_cache_update_bac4b8ed6fb3d1273f95cf244f6242b76f73731e 
Bokchoy Testing DB Cache update
 2020-07-08 19:51:25 +05:00
Diana Huang
db93b66ddc Merge pull request #24411 from edx/diana/shoppingcart-removal-instructor 
DEPR-43 - Remove final shoppingcart references from instructor.
 2020-07-08 10:13:50 -04:00
Diana Huang
1655ecd063 Remove final shoppingcart references from instructor. 2020-07-08 09:36:43 -04:00
Feanil Patel
e8a7529243 Merge pull request #24414 from edx/feanil/shoppingcart-remove-student-transfer-command-refs 
DEPR-43 Remove shoppingcart certs refs.
 2020-07-08 09:30:50 -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
edX requirements bot
4b078a056d Updating Python Requirements (#24419) 2020-07-08 17:06:07 +05: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
Luis Moreno
a96c218553 Use PyPi release of django-ratelimit 2020-07-07 19:19:55 -04:00
edX cache uploader bot
50a81db551 Updating Bokchoy testing database cache 2020-07-07 17:01:52 -04:00