Commit Graph

54722 Commits

Author SHA1 Message Date
Carla Duarte
8949ee96da Merge pull request #24193 from edx/ciduarte/AA-181
AA-181: Updating Outline Tab API to include Course Blocks
2020-06-15 15:15:53 -04:00
Nick
badf3281b3 Merge pull request #24122 from edx/ndalfonso/AA-133-mfe-dates-banner
AA-133 mfe dates banner
2020-06-15 15:08:02 -04:00
Nicholas D'Alfonso
9a83d0781b AA-133 mfe dates banner
- add serializer mixin to expose date banner info
- add endpoint to reset deadlines for a sepcific course
2020-06-15 14:22:23 -04:00
Dave St.Germain
73ba615f5a Merge pull request #24198 from open-craft/0x29a/bb-2503/enable_ora_usernames_feature_toggle
[BD-5] [BB-2503] Add 'ENABLE_ORA_USERNAMES_ON_DATA_EXPORT' feature toggle
2020-06-15 12:13:19 -04:00
0x29a
a8b13afe48 Add 'ENABLE_ORA_USERNAMES_ON_DATA_EXPORT' feature toggle in common settigns file 2020-06-15 17:29:32 +02:00
Matt Tuchfarber
fd145713b3 Merge pull request #24210 from edx/tuchfarber/add_demographics_banner_to_theme
Add demographics prompt to edx.org theme
2020-06-15 10:43:52 -04:00
edX requirements bot
0fd34d596a Updating Python Requirements (#24222) 2020-06-15 10:35:14 -04:00
M. Zulqarnain
f3161468a3 BOM-1703 : Ora2 Upgrade (#24221) 2020-06-15 18:44:07 +05:00
Awais Jibran
26a5f1844c Merge pull request #24177 from edx/aj/change-switch-to-waffle-flag
Change switch to waffle flag.
2020-06-15 17:15:53 +05:00
Awais Jibran
5d4df5383b Change switch to waffle flag. 2020-06-15 15:15:10 +05:00
edX Transifex Bot
4a3f2e33cd fix(i18n): update translations 2020-06-14 17:35:01 -04:00
Michael Terry
39bb9bc57d Merge pull request #24213 from edx/mikix/another-null-guard
Guard highlights against null module
2020-06-12 15:35:47 -04:00
Michael Terry
557079042f Guard highlights against null module
Sometimes a course module will not exist and was causing exceptions
in our weekly highlights mail code. This will hopefully guard against
that a bit better.
2020-06-12 14:57:09 -04:00
Carla Duarte
4537408383 AA-181: Updating Outline Tab API to include Course Blocks 2020-06-12 14:52:56 -04:00
Matt Tuchfarber
b7cf7808b8 Add demographics prompt to edx.org theme
- Add bootstrap utility function to lms-base-v1 CSS
- Moved coaching sass to edx.org theme
- Banner feature flag and MB program gated
2020-06-12 10:58:37 -04:00
Robert Raposa
7e56d89bcc remove temp_view_func_compare custom metric (#24211)
In an earlier PR, we moved logic from process_view to process
request, so mapping would happen earlier in the middleware
lifecycle, and the code_owner metric would be set for requests
that never made it to process_view.

The temp_view_func_compare custom metric was added temporarily to
ensure this earlier refactor did not introduce any unaccounted for
differences. It did not, so we are removing this temporary metric.

ARCHBOM-1263
2020-06-12 08:53:20 -04:00
edX requirements bot
46ae66a146 Updating Python Requirements (edx-enterprise) (#24212) 2020-06-12 08:52:49 -04:00
morenol
cfb53bb9bb Upgrade transifex-client (#24183)
Upgrade transifex-client version.

This is only made in order to run the tests with a transifex-client version compatible with python3.8

The actual problem that we have in edx-platform is that the last version of transifex-client has as constraint python-slugify<2.0.0 which is not compatible with the current requierements of edx-platform on the other hand, the current version used in edx-platform is not compatible with python3.8
2020-06-11 16:06:03 -04:00
Calen Pennington
06e5e2db51 Merge pull request #24144 from cpennington/hide-dates-banner-archived
Hide dates banner archived
2020-06-11 14:03:09 -04:00
edX Transifex Bot
8c9c536e82 fix(i18n): update translations 2020-06-11 11:50:40 -04:00
Calen Pennington
86e2677f26 Use a standard function to find out if a course has ended 2020-06-11 11:40:56 -04:00
Calen Pennington
1cf46e76d0 Don't compare None to a date when a course doesn't have an end date 2020-06-11 11:40:56 -04:00
Calen Pennington
333c9ccddf Simplify how the course-outline template context is constructed to bring it into parity with other template contexts 2020-06-11 11:40:56 -04:00
Calen Pennington
514d10599d Refactor dates_banner conditionals slightly 2020-06-11 11:13:55 -04:00
Calen Pennington
2b2a6cca23 Never show the dates banner on archived courses 2020-06-11 11:13:55 -04:00
edX Transifex Bot
be7abfa271 fix(i18n): update translations 2020-06-11 11:01:12 -04:00
Kyle McCormick
4857bd5d1e Disable changing special exam type after release date (#24118)
* Disable changing special exam type after release date

Do some client-side validation to make sure that exams
that *are* or *ever were* special may not be changed
to a special exam type (other than the current one)
after release date.

MST-258

Co-authored-by: Zach Hancock <zhancock@edx.org>
2020-06-11 10:45:04 -04:00
Binod Pant
44eeaa1874 Upgrade deps to edx-enterprise 3.3.1 and others (#24203) 2020-06-11 10:39:44 -04:00
edX Transifex Bot
aa3501c63a fix(i18n): update translations 2020-06-11 09:56:32 -04:00
Awais Qureshi
762665aaf6 Merge pull request #24200 from edx/revert-24191-fixing-comment
Revert "Updating the comment."
2020-06-11 17:58:21 +05:00
Awais Qureshi
03b5b4322f Revert "Updating the comment." 2020-06-11 17:16:57 +05:00
Stu Young
b370745b9b management command to retire a single user (#24188) 2020-06-10 18:07:25 -04:00
Braden MacDonald
831a90ebca Document the various integration points for platform extensions (#24057) 2020-06-10 17:22:32 -04:00
edX Transifex Bot
6cc5474dba geoip2: update maxmind geolite country database 2020-06-10 17:15:21 -04:00
Calen Pennington
6a4be324de Merge pull request #24142 from cpennington/allow-reset-for-visible-missed-dates
Allow reset for visible missed dates
2020-06-10 15:48:57 -04:00
Calen Pennington
c6695e0b6f Only actually reset user schedule if they have missed deadlines and not missed any gated content deadlines 2020-06-10 15:18:53 -04:00
Calen Pennington
15df17034a Only prompt the user to upgrade if they have missed the deadline of gated graded content 2020-06-10 15:18:53 -04:00
Daniel Francis
4dc3251af5 render_to_response deprecated in Django 3 (#24141)
Fixing RemovedInDjango30Warnings

**Background:** The `django.shortcuts` method `render_to_response` became deprecated in [Django 1.3](https://docs.djangoproject.com/en/3.0/releases/1.3/), when  `render` was introduced.

Per the documentation:

> render() is the same as a call to render_to_response() with a context_instance argument that forces the use of a RequestContext.

Both return an `HttpResponse` object.

**Context:** We changed two statements: An import line and the call to the method, adding explicit parameter names to improve readability.

**Before:**
```
from django.shortcuts import get_object_or_404, render_to_response
...
return render_to_response("teams/teams.html", context)


```

**After**
```
from django.shortcuts import get_object_or_404, render
...
return render(
            request=request,
            template_name="teams/teams.html",
            context=context
        )

```
2020-06-10 14:25:04 -04:00
Jeremy Bowman
a36332858d Remove bok-choy shoppingcart tests DEPR-43 (#24182)
Removed the FakePaymentPage page object which used shoppingcart app functionality, as well as everything that depended on it. I checked the e2e test repo also, and it doesn't seem to need any of the removed code.
2020-06-10 14:13:40 -04:00
Awais Qureshi
462cee266d Merge pull request #24191 from edx/fixing-comment
Updating the comment.
2020-06-10 19:39:13 +05:00
Robert Raposa
b721e186f3 ARCHBOM-1263: enhance code owner middleware (#24184)
* conservative move to process_request
* added temp_view_func_compare metric to be extra conservative

ARCHBOM-1263
2020-06-10 10:36:13 -04:00
Nathan Sprenkle
44b0d832a0 Scope team search to course when removing from team (#24174) 2020-06-10 10:03:27 -04:00
Awais Qureshi
ffe69a5b43 Updating the comment. 2020-06-10 17:57:45 +05:00
Awais Qureshi
28f2dc46e5 Merge pull request #24091 from edx/awais786/enmerkar
rename djang-babel to enmarker
2020-06-10 17:50:41 +05:00
adeelehsan
d879f9fd00 Merge pull request #23980 from edx/aehsan/PROD-1582/specify_user_message_for_about_me_in_profile
Specify bio field error message for user
2020-06-10 14:46:04 +05:00
adeel khan
76419f9d01 Merge pull request #23913 from edx/adeel/prod_1505_improve_security_lockouts_logic
Improving user locked out logic.
2020-06-10 14:21:16 +05:00
adeelehsan
4e1fe2045f Specify bio message for user
Currently user message is generic. Specifying for
bio field so that it make more sense to user.

PROD-1582
2020-06-10 14:19:39 +05:00
Waheed Ahmed
6b268c37b4 Rate limit logistration endpoints.
PROD-1506
2020-06-10 13:33:26 +05:00
Diana Huang
86b82efbaf Merge pull request #23972 from edx/diana/remove-shoppingcart-references
Remove shoppingcart references from verify_student and instructor.
2020-06-09 13:51:15 -04:00
bom
77fa87d8d3 Make Upgrade 2020-06-09 22:50:10 +05:00