Commit Graph

52502 Commits

Author SHA1 Message Date
Alex Dusenbery
07dfe4db1c EDUCATOR-4821 | Upgrade edx-bulk-grades to 0.6.5 2019-12-06 10:47:13 -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
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
Syed Muhammad Dawoud Sheraz Ali
0e6be31f08 Merge pull request #22428 from edx/dsheraz/PROD-1050
ora version bump
2019-12-03 14:58:28 +05:00
DawoudSheraz
ec044a604c ora version bump 2019-12-03 10:28:10 +05:00
Diana Huang
54be35f913 Move AccountCreationForm to user_authn. 2019-12-02 17:20:23 -05:00
Kyle McCormick
dcf5d70bc4 Create UI for CSV team management (#22310)
Adds "Manage" sub-tab to course "Teams" tab
with UI for downloading and uploading team
membership CSVs. The upload and download function-
ality are currently not implemented.

The new tab only appears when the user is course staff
and the course has at least one instructor-managed
team-set, which is not the case for any existing
courses, so not current course staff will see this
change.

This ticket will be followed-up upon in MST-44 and
MST-49.

MST-41
2019-12-02 11:27:05 -05:00
Michael Terry
c1f7b35483 Merge pull request #22407 from edx/mikix/verified-only
Support courses with only a verified mode
2019-12-02 09:25:39 -05:00
Zia Fazal
94166afa64 Revert "Revert "ENT-1849: Removed EnterpriseMiddleware"" 2019-12-02 11:28:59 +05:00
Awais Qureshi
4a932718f1 Merge pull request #22418 from edx/awais786/django-pyfs-bump-ver
BOM-1028
2019-11-28 16:17:52 +05:00
Waheed Ahmed
69b86af171 Merge pull request #22420 from edx/geoip2-bot-update-country-database2019-11-27
geoip2: update maxmind geolite country database
2019-11-28 13:05:18 +05:00
edX Transifex Bot
7c94dab10d geoip2: update maxmind geolite country database 2019-11-27 20:33:15 +00:00
Awais Qureshi
ca746885a2 BOM-1028
Bump the versio
2019-11-28 01:31:03 +05:00
Feanil Patel
6d7f5cb272 Merge pull request #22414 from edx/feanil/remove_flaky_test
Remove this test because it is flaky.
2019-11-27 11:02:56 -05:00
Zia Fazal
bbaabdb5dd Merge pull request #22413 from edx/revert-22345-ziafazal/ENT-1849-b
Revert "ENT-1849: Removed EnterpriseMiddleware"
2019-11-27 20:23:42 +05:00
Feanil Patel
ca2c24a058 Remove this test because it is flaky.
It failed and passed on the same commit.  The failure was that the page
timed out, so it could be fixed by making that page performant.  I'd
rather not increase the timeout for the page to load as the bokchoy
tests are already very slow.

I'm also not sure why this test needs to exist.  I would think that this
could be tested on the underlying function without testing at the UI
layer.
2019-11-27 10:19:38 -05:00
Feanil Patel
2faa45a2d1 Merge pull request #22409 from edx/feanil/update_tox_config
BOM-1075 - Fix coverage reporting for python3 unit tests.
2019-11-27 10:14:18 -05:00
Zia Fazal
052035bcfd Revert "ENT-1849: Removed EnterpriseMiddleware" 2019-11-27 19:26:07 +05:00
Saad Yousaf
0186f5e175 Merge pull request #22344 from edx/saad/PROD-736
[PROD-736] Course outline links incorrect in subsections with staff-only units
2019-11-27 16:41:20 +05:00
saadyousafarbi
a59363432c handle section link bug for staff-only units for learners. 2019-11-27 15:52:39 +05:00
Zaman Afzal
0497646ad9 bump edx-enterprise version to 2.0.27 (#22410) 2019-11-27 14:16:37 +05:00
Syed Muhammad Dawoud Sheraz Ali
af976b754d Merge pull request #22404 from edx/dsheraz/PROD-964
conditional logs to find the inconsistent block id in MITx course
2019-11-27 13:05:59 +05:00
DawoudSheraz
871f3bfb7e conditional logs to find the inconsistent block id in MITx course 2019-11-27 12:28:15 +05:00
Awais Jibran
7940ce3d74 Merge pull request #22403 from edx/aj/fix-course-key-encoding
Fix quote Unicode data
2019-11-27 11:26:03 +05:00
Alex Wang
f42d2edd29 Fix xss warnings (#22408) 2019-11-26 20:15:33 -05:00
Michael Terry
2213c4dd3d Support courses with only a verified mode 2019-11-26 15:57:29 -05:00
Feanil Patel
77c5ba62a2 Sort tox passenvs. 2019-11-26 15:31:48 -05:00