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

55377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luis Moreno
070eb3807d Remove unused URL. 2020-06-10 13:59:21 -04:00
SaadYousaf
d7155825e9 PROD-1569 2020-06-10 21:07:10 +05:00
SaadYousaf
2339fa4f6d PROD-1570 2020-06-10 21:07:10 +05:00
SaadYousaf
190df56572 PROD-1464 2020-06-10 21:07:10 +05:00
Ali-D-Akbar
0ecbe873d9 PROD-1574 2020-06-10 21:07:10 +05: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
Ali-D-Akbar
c9e24e9a1d PROD-1572 2020-06-10 15:05:28 +05:00
Ali-D-Akbar
c2832dfb61 PROD-1571 2020-06-10 15:04:45 +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
Ali-D-Akbar
a02392d48a PROD-1282 2020-06-10 14:40:58 +05:00
SaadYousaf
4fb5e7692f PROD-1256 2020-06-10 14:40:58 +05:00
SaadYousaf
33543bb914 PROD-1258 2020-06-10 14:40:58 +05:00
SaadYousaf
684be2382e PROD-1284 2020-06-10 14:40:58 +05:00
SaadYousaf
028c6e1d56 PROD-1255 2020-06-10 14:40:58 +05:00
Ali-D-Akbar
d3a9895f82 PROD-1283 2020-06-10 14:40:58 +05:00
Ali-D-Akbar
26f4b0f54b PROD-1280 2020-06-10 14:40:58 +05:00
Ali-D-Akbar
e883636cbc PROD-1288 2020-06-10 14:40:58 +05:00
Ali-D-Akbar
7470a9d447 PROD-1285 2020-06-10 14:40:58 +05:00
Ali-D-Akbar
3573e23c4e PROD-1281 2020-06-10 14:40:58 +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
Diana Huang
cd79f2032f Remove additional templates not needed. 2020-06-09 13:26:22 -04:00
Diana Huang
c7bd5a8a15 Remove more references to fix tests. 2020-06-09 13:06:44 -04:00
Diana Huang
a0f24bbb64 Remove shoppingcart references from instructor. 2020-06-09 13:06:44 -04:00
Diana Huang
61563697c7 Remove shoppingcart references from verify_student. 2020-06-09 13:06:44 -04:00
Awais Qureshi
4e84d435c1 BOM-1637 
rename djang-babel to enmarker
upgrade the reqs
 2020-06-09 21:52:54 +05:00
Michael Terry
b9482a8d1b Merge pull request #24180 from edx/mikix/guard-highlights 
PROD-1633: fix highlights error case
 2020-06-09 12:09:19 -04:00
Michael Terry
c520fe8f19 PROD-1633: fix highlights error case 
When calculating course highlights, if we didn't manage to get
a course module, we were previously throwing an exception.
Handle that more gracefully.
 2020-06-09 11:05:02 -04:00