Commit Graph

52526 Commits

Author SHA1 Message Date
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
Matthew Carter
cf961828c2 Merge pull request #22450 from edx/mattcarter/EDUCATOR-4820
EDUCATOR-4820 Update edx-ora2 to 2.4.7
2019-12-05 14:46:22 -05:00
Mat Carter
b4e3dfb731 EDUCATOR-4820 Update edx-ora2 to 2.4.7 2019-12-05 13:40:52 -05:00
David Ormsbee
009b96d4db Merge pull request #22449 from open-craft/blockstore-runtime-python3
Fixes for the blockstore API client / XBlock runtime under python 3
2019-12-05 13:31:33 -05:00
Braden MacDonald
1ea3c032d3 Fixes for the blockstore API client / XBlock runtime under python 3 2019-12-05 09:24:24 -08:00
Robert Raposa
0d899a1392 Merge pull request #22357 from edx/robrap/ARCH-1253-login-cleanup-part-1
ARCH-1253: clean-up login part 1
2019-12-05 11:23:39 -05:00
Zia Fazal
b2de1b5214 Merge pull request #22448 from edx/revert-22413-revert-22345-ziafazal/ENT-1849-b
Revert "Revert "ENT-1849: Removed EnterpriseMiddleware""
2019-12-05 19:00:15 +05:00
Syed Muhammad Dawoud Sheraz Ali
406eb9aa1e Merge pull request #22447 from edx/dsheraz/PROD-964-logs-update
fix logs condition
2019-12-05 11:52:55 +05:00
DawoudSheraz
2470d9a0f5 fix logs condition 2019-12-05 11:08:38 +05:00
Robert Raposa
58fadab939 clean-up login part 1
`shim_student_view` is used for login, and is being simplified so it
can ulimately be completely deleted. In this commit, the shim
preprocessing was removed by deleting unused code, and moving code
that is still being used to login_user.

Note: `shim_student_view` was originally added in
https://github.com/edx/edx-platform/pull/5768/files

ARCH-1253
2019-12-04 17:01:23 -05:00
edX Transifex Bot
fa71006cad geoip2: update maxmind geolite country database 2019-12-04 16:08:42 -05:00
edX cache uploader bot
979ecf0a92 Updating Bokchoy testing database cache (#22437) 2019-12-04 11:58:21 -05:00
Abdul Hannan
8066ccb25d Merge pull request #22373 from edx/rename_start_in_schedule_2/5
Rename start in schedule 2/5
2019-12-04 21:12:00 +05:00
hunytalk
227ae8a51a Add reference to new field in schedule model 2019-12-04 19:05:55 +05:00
Zaman Afzal
bdf0075117 bump edx-enterprise version to 2.0.30 (#22436) 2019-12-04 18:58:27 +05:00
Robert Raposa
b47f3680df Merge pull request #22416 from edx/robrap/ARCH-1253-remove-studio-login
ARCH-1253: remove studio signin and signup pages
2019-12-04 03:20:39 -05:00
Robert Raposa
2202545aec remove studio signin and signup pages
This completes the work started in https://github.com/edx/edx-platform/pull/19453
to use the LMS login and registration for Studio, rather than Studio
providing its own implementation.

LMS login/registration are being used for the following reasons:
1. LMS logistration properly handles all SSO integrations.
2. A single logistration is simpler to maintain and understand.
3. Allows Studio to work more like all other IDAs that use LMS
logistration.

The original switch to use LMS logistration for Studio also added the
toggle `DISABLE_STUDIO_SSO_OVER_LMS` to provide the community some
additional time for switching. This commit removes this toggle, which
at this point means all deployments will use the LMS logistration.

This change requires sharing cookies across LMS and Studio. Should that
prove to be a problem for certain Open edX instances, there are
discussions of possible alternative solutions.
See https://github.com/edx/edx-platform/pull/19845#issuecomment-559154256

Detailed changes:
* Fix some Studio links that still went to old Studio signin and signup.
* Remove DISABLE_STUDIO_SSO_OVER_LMS feature toggle.
* Remove old studio signin and signup pages and templates.
* Fix url name "login", which had different meanings for Studio and LMS.
* Use the following settings: LOGIN_URL, FRONTEND_LOGIN_URL,
FRONTEND_LOGOUT_URL, and FRONTEND_REGISTER_URL.
* Redirect /signin and /signup to the LMS logistration.
* Add custom metric `uses_pattern_library`.
* Add custom metric `student_activate_account`.
* Add Django Settings to allow /signin, /signup, and /login_post to be
disabled once ready.

This work also relates to ARCH-218 and DEPR-6.

ARCH-1253
2019-12-04 02:36:36 -05:00
syedimranhassan
8fc357bb2e Merge pull request #22280 from edx/ihassan/OPS-4397_added_devstack_yml_file
Added devstack config yml file to app repo
2019-12-03 22:42:22 +05:00
syedimranhassan
f8f1edf4d8 Added devstack config yml file to app repo 2019-12-03 22:07:51 +05:00
Diana Huang
43354f86ae Merge pull request #22415 from edx/diana/move-account-creation-form
Move AccountCreationForm to user_authn.
2019-12-03 11:49:38 -05:00