Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,704 Commits 1 Branch 0 Tags
06e5e2db513dbbeb66a60d443f6849cc44cbb7ee
Commit Graph

54704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
M. Zulqarnain
8d4e71957c Merge pull request #24179 from edx/bom-1691 
BOM-1691 : Update openedx-calc and chem packages
 2020-06-09 19:48:55 +05:00
Robert Raposa
4d30876d06 ARCHBOM-1263: refactor ownership mapping from middleware (#24175) 
- move ownership mapping code to separate module
- simplify `__module__` mocking.

ARCHBOM-1263
 2020-06-09 09:59:37 -04:00
Zulqarnain
ac412c9dc9 update dependencies in sandbox 2020-06-09 18:50:03 +05:00
Robert Raposa
03032d4979 ARCHBOM-1247: ownership mapping for external apps (#24148) 
- add clean script to help list unmapped Django apps.
- use clean script to source new app mappings.
- update generate script to include 3rd-party app ownership.

ARCHBOM-1247
 2020-06-09 09:15:16 -04:00
Feanil Patel
d58914fca0 Merge pull request #24171 from edx/feanil/update-sandbox-reqs-2 
Feanil/update sandbox reqs 2
 2020-06-09 08:59:22 -04:00
Adeel Khan
2383fb3fa6 Improving user locked out logic. 
This patch improves on the user locked
out logic by providing a helping message
near locked out. This would help reduce
retries by giving user the option to use
password reset flow to fix the issue.

PROD-1505
 2020-06-09 09:36:42 +05:00
adeel khan
adc405ae5c Merge pull request #24065 from edx/adeel/prod_1363_fix_key_error 
Fix key error.
 2020-06-09 08:31:50 +05:00
David Ormsbee
7bf8387b6c Merge pull request #24172 from edx/revert-23265-guruprasad/BB-112-fix-randomized-content-block-order 
Revert "[BB-112] Fix the unpredictable order randomization issue with randomized content blocks"
 2020-06-08 17:35:13 -04:00
M. Zulqarnain
8c16a93cf6 install lti-consumer-xblock from pypi (#24167) 2020-06-09 02:26:14 +05:00
David Ormsbee
4f3a45f444 Revert "[BB-112] Fix the unpredictable order randomization issue with randomized content blocks" 2020-06-08 16:47:35 -04:00
Feanil Patel
278b747918 Don't fail to provision if we can't find the revision_config_file. 2020-06-08 16:21:30 -04:00