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

52545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
d3517b0773 Merge pull request #22522 from edx/diana/py3-cleaned-data 
Remove items from a different dictionary than the one we're iterating over.
 2019-12-12 16:22:26 -05:00
Jeremy Bowman
6cb441b876 Upgrade edx-proctoring to fix Py3 bug (#22521) 2019-12-12 15:46:26 -05:00
Diana Huang
ddf3a8208f Remove items from a different dictionary than the one we're 
iterating over.
 2019-12-12 15:18:01 -05:00
Feanil Patel
35c2d766e6 Merge pull request #22512 from edx/diana/fix-response-caching 
Handle the caching of responses between Python 2 and Python 3.
 2019-12-12 12:44:04 -05:00
Diana Huang
40c98fb22b Copy list in a way that is both Py2 and Py3 compatible. 2019-12-12 12:17:56 -05:00
Feanil Patel
a8ea9844dc Deal with cache misses. 2019-12-12 11:40:59 -05:00
Diana Huang
e005c0461e Handle the caching of responses between Python 2 and Python 3. 2019-12-12 11:18:43 -05:00
Diana Huang
fe5a862153 Merge pull request #22503 from edx/diana/logging-middleware 
Add logging middleware to determine why our responses are bad.
 2019-12-12 09:33:37 -05:00
Feanil Patel
23e6f13937 Merge pull request #22506 from edx/nedbat/fix-codejail-serialization 
Fix serialization issues in codejail
 2019-12-11 21:17:24 -05:00
Ned Batchelder
13fdbd0c75 Fix serialization issues in codejail 2019-12-11 18:19:53 -05:00
Diana Huang
28ce0e6739 Add logging middleware to determine why our responses are bad. 2019-12-11 17:01:07 -05:00
Feanil Patel
617e8519d9 Merge pull request #22499 from edx/feanil/no-exception-to-re-raise 
Re-raise issue was in codejail.
 2019-12-11 14:56:10 -05:00
Jeremy Bowman
ca1265a679 Make XModuleDescriptor hashable again (#22501) 2019-12-11 14:37:07 -05:00
Diana Huang
d0ab1fc423 Merge pull request #22500 from edx/diana/update-lti 
Update xblock-lti-consumer with more Python 3 fixes.
 2019-12-11 14:33:14 -05:00
Jeremy Bowman
09c995a3cd Update xblock-poll with Python 3 fix (#22497) 2019-12-11 12:20:42 -05:00
Diana Huang
c958ff449b Update xblock-lti-consumer with more Python 3 fixes. 2019-12-11 11:58:48 -05:00
Feanil Patel
f52a0f6b98 Re-raise issue was in codejail. 
- Undo the previous change.
- Pull in the version of codejail with the fix for the issue.
 2019-12-11 11:50:20 -05:00
Feanil Patel
a76139da97 Merge pull request #22482 from edx/feanil/fix_mobile_versioning_middleware 
Ignore bad cached data.
 2019-12-10 18:11:03 -05:00
Feanil Patel
0e1116003a Ignore bad cached data. 
When migrating from python 2 to 3 we can get in a situation where the
cache has data that the new version of python can't read.  In this case
drop the bad data and re-cache the correct data.
 2019-12-10 16:15:46 -05:00
Diana Huang
ce0de597fd Merge pull request #22483 from edx/diana/update-xblock-lti-consumer 
Upate xblock-lti-consumer to get more Python 3 fixes.
 2019-12-10 16:01:45 -05:00
Jeremy Bowman
86186e2026 Fix graph traversal under Python 3 (#22484) 2019-12-10 15:52:26 -05:00
Diana Huang
4b6a522a87 Upate xblock-lti-consumer to get more Python 3 fixes. 2019-12-10 15:11:17 -05:00
Feanil Patel
fb73bcb27c Merge pull request #22478 from edx/diana/handle-branding-string 
Redirect to the view names directly.
 2019-12-10 15:06:32 -05:00
Diana Huang
5d095b3a7b Merge pull request #22477 from edx/diana/reraise-capa 
Use six to reraise a capa error.
 2019-12-10 14:50:48 -05:00
Jeremy Bowman
0e1881f525 Fixes for celery worker Python 3 bugs (#22479) 2019-12-10 14:07:27 -05:00
Diana Huang
6e7d54e820 Use the view names for redirect. 2019-12-10 13:39:54 -05:00
Diana Huang
5cc562b5b8 Use six to reraise a capa error. 2019-12-10 12:47:27 -05:00
Feanil Patel
01b6b19f2e Merge pull request #22454 from edx/feanil/handle_pickling_failure 
Feanil/handle pickling failure
 2019-12-09 11:44:14 -05:00
Feanil Patel
f485ff450d Deal with pylint. 2019-12-09 11:03:22 -05:00
edX cache uploader bot
fa24ed8e83 Updating Bokchoy testing database cache (#22463) 2019-12-09 09:01:59 -05:00
Syed Muhammad Dawoud Sheraz Ali
a189baadae Merge pull request #22425 from edx/dsheraz/PROD-1055 
create CSM service
 2019-12-09 14:01:58 +05:00
DawoudSheraz
c58ec73210 create service for CSM 2019-12-09 12:21:16 +05:00
edX Transifex Bot
f6258affda fix(i18n): update translations 2019-12-08 16:24:04 -05:00
Robert Raposa
adf6327196 Merge pull request #22465 from edx/robrap/ARCH-1253-fix-flaky-test 
fix flaky test_login unit test
 2019-12-06 17:03:45 -05:00
Robert Raposa
6fc75c834b fix flaky test_login unit test 
ARCH-1253
 2019-12-06 16:19:52 -05:00
Feanil Patel
bf482f4989 Respond to code review. 2019-12-06 15:02:22 -05:00
Albert (AJ) St. Aubin
8a529c63ad Merge pull request #22462 from edx/aj/ENT-2082_offers_2 
Upgrade edx-enterprise
 2019-12-06 14:11:15 -05:00
Alex Wang
f1d2ddc97a no student create team in instructor managed topic (#22432) 
Students can't create team in an instructor-managed topic
 2019-12-06 13:41:56 -05:00
Albert (AJ) St. Aubin
12a416486a Upgrade edx-enterprise 2019-12-06 13:20:14 -05:00
Diana Huang
ca5e408b2e Merge pull request #22439 from edx/diana/move-account-settings-url 
Move account_settings into user_api.
 2019-12-06 12:46:13 -05:00
Alex Dusenbery
07dfe4db1c EDUCATOR-4821 | Upgrade edx-bulk-grades to 0.6.5 2019-12-06 10:47:13 -05:00
Diana Huang
461b11650e Move account_settings into user_api. 2019-12-06 10:27:26 -05:00
David Ormsbee
be7df8ba9f Merge pull request #22451 from edx/ormsbee/course_staff_search_preview 
Add ENABLE_COURSEWARE_SEARCH_FOR_COURSE_STAFF flag
 2019-12-06 09:55:35 -05:00
AsadAzam
9032652cf7 Merge pull request #22457 from edx/dsheraz/PROD-1000-logs 
log exception for further context
 2019-12-06 15:42:11 +05:00
DawoudSheraz
99d694c86c log exception for further context 2019-12-06 15:06:19 +05:00
Feanil Patel
48e9724808 Handle other places where we might be unpickling things. 
We use pickling in conjunction with caches in these cases so we should
be able to fallback to the uncached behavior if the pickled data is
corrupt in some way.

eg. it's a python 2 pickle we don't know how to read.
 2019-12-05 17:06:12 -05:00
Feanil Patel
684f254a77 Add error handling in course structure cache. 
When going between python 2 and python 3.5 we can get pickeld course
structires that are incompatible no matter what we do do to the bug
linked in the comment.  In this case, handle the error and delete the
corrupt data from the cache.

Making this fairly generic because if we have any bad data in cache we
don't want it to blow up the whole process.  Just delete the bad data
and try again.
 2019-12-05 17:06:12 -05:00
Robert Raposa
054fa85fc6 Merge pull request #22452 from edx/robrap/ARCH-1253-login-cleanup-part-2 
ARCH-1253: return json for third party auth failure
 2019-12-05 17:02:54 -05:00
Robert Raposa
ebcff3fb4b return json for third party auth failure 
Returning JSON from `login_user` for third party auth failures makes
the response more consistent with all other `login_user` responses.

The only calls to `login_user` with this failure are processed by
`shim_student_view` which will in-turn remove this JSON. This improves
the `login_user` response in advance of switching the logistration page
to use `login_user` without `shim_student_view`.

ARCH-1253
 2019-12-05 16:29:35 -05:00
David Ormsbee
aaf4c46645 Add ENABLE_COURSEWARE_SEARCH_FOR_COURSE_STAFF flag 
Add an LMS feature flag to enable courseware search for course staff
only. TNL-6931
 2019-12-05 15:14:26 -05:00