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
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
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
Feanil Patel
f182c77092 Upgrade and constrain things for python 3. 
sympy needs to be at a newer version for python3.
 2020-06-08 16:21:30 -04:00
edX cache uploader bot
35cf1b6ea0 Updating Bokchoy testing database cache (#24139) 2020-06-08 15:55:37 -04:00
Tim McCormack
325cdeadc9 Explain drf-jwt pin with issue link (#24159) 2020-06-08 18:19:14 +00:00
Carla Duarte
d9b0f7483c Merge pull request #24130 from edx/ciduarte/AA-173 
AA-173: Assignment Type on Dates Page
 2020-06-08 11:11:06 -04:00
Carla Duarte
01b693a5c3 AA-173: Assignment Type on Dates Page 
Appending the assignment type to each graded
assignment on the Dates Tab. Exposed the 'format'
field, which corresponds to the graded assignment type.
 2020-06-08 10:27:50 -04:00
Ben Warzeski
b37b6c4c4e bump edx-proctoring and completion versions. (#24168) 
* bump proctoring version to 2.4.2 (python requirements update)

* bump completion to 3.2.1 (python requirements update)

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-06-08 10:25:56 -04:00
David Ormsbee
d507a5cd99 Merge pull request #23265 from open-craft/guruprasad/BB-112-fix-randomized-content-block-order 
[BB-112] Fix the unpredictable order randomization issue with randomized content blocks
 2020-06-08 10:11:48 -04:00
Dillon Dumesnil
304b000b1b Merge pull request #24134 from edx/ddumesnil/dates-widget-enhancement-AA-103 
AA-103: Dates widget enhancements
 2020-06-08 06:21:44 -07:00
Adeel Khan
ebc2948f81 Fix key error. 
Job is failing because of unhandled
case where the mode, status key is
not found in course_cert_info.

PROD-1363
 2020-06-08 15:53:03 +05:00
M. Zulqarnain
185fc3c8e0 update crowdsourcehinter to install from pypi (#24155) 2020-06-08 13:39:20 +05:00
edX Transifex Bot
2315d0a0eb fix(i18n): update translations 2020-06-07 17:55:18 -04:00
Zachary Hancock
f70ce6eb85 prevent proctoring provider changes after course start (#24146) 
* prevent proctoring provider changes after course start

* better comment wording

* add support email to error msg
 2020-06-05 13:25:12 -04:00
Aarif
7763741b0a Merge pull request #24152 from edx/openedx-chem-upgrade 
Switch the dependencies to use openedx-chem from PyPi
 2020-06-05 22:04:04 +05:00
Aarif
fe5a0cb68c Merge branch 'master' into openedx-chem-upgrade 2020-06-05 21:12:05 +05:00
Aarif
e90cf34471 ordered dependencies alphabetically as suggested 2020-06-05 19:18:24 +05:00
M. Zulqarnain
c382237c33 update django-appconf installation (#24151) 2020-06-05 19:09:58 +05:00