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

52539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Tuchfarber
3e94db7449 Adds optional setting to enable devstack theming 
The mako engine isn't able to find themed templates in devstack because
the path it checks is set before we enable comprehensive theming. This
Adds a settings section to  comment out if you want to enable
theming in devstack.
 2019-12-12 14:31:54 -05:00
Abdul Hannan
c804bca577 Merge pull request #22496 from edx/rename_start_in_schedule_2.5/5 
Custom management command for data migration in Schedule
 2019-12-12 01:01:47 +05:00
hunytalk
28d5458a1c Custom management command for data migration in Schedule 2019-12-12 00:02:59 +05:00
adeel khan
2eab2a3a8a Merge pull request #22350 from edx/adeel/prod_1005_automate_failed_photo_verification 
Automate retry_failed_photo_verification mgt command
 2019-12-11 14:17:03 +05:00
Nimisha Asthagiri
022a0117ae Merge pull request #22468 from edx/arch/account-activation-cleanup 
Account Activation cleanup
 2019-12-10 21:26:03 -05:00
Nimisha Asthagiri
f539a51901 user_authn: Move password-related tests to test_password.py 2019-12-10 20:23:52 -05:00
Nimisha Asthagiri
5e3df7aed4 user_api: Remove unneeded test-only activate_account 2019-12-10 20:23:52 -05:00
Nimisha Asthagiri
90be24986a student: Remove unused change_setting endpoint 2019-12-10 20:23:52 -05:00
David Ormsbee
fead65750f Merge pull request #20684 from open-craft/clemente/support-date-columns-in-student-csv-export 
Add last_login and date_joined to the student profile export
 2019-12-10 18:20:40 -05:00
Diana Huang
b4825c52be Merge pull request #22481 from edx/diana/py3-cleaned-data 
Remove items from a different dictionary than the one we're iterating over.
 2019-12-10 14:53:21 -05:00
Diana Huang
4a828d749a Remove items from a different dictionary than the one we're 
iterating over.
 2019-12-10 13:21:03 -05:00
Matthew Piatetsky
b7452ca61b Merge pull request #22430 from edx/REV-954 
[REV-954] get optimizely from cloudflare
 2019-12-10 11:13:31 -05:00
Adeel Khan
2b80fdbf66 Automate retry_failed_photo_verification mgt command 
This patch would enable a user to run management
command via jenkins job. Verification ids
are injected via a configuration model.

PROD-1005
 2019-12-10 16:53:12 +05:00
David Ormsbee
f508ba3d01 Merge pull request #19941 from open-craft/jill/opt-out-weekly-highlight-messages 
Add api support to let users opt out of email updates
 2019-12-09 16:57:09 -05:00
Robert Raposa
06a0d3ff71 Merge pull request #22453 from edx/robrap/ARCH-1253-remove-UPDATE_LOGIN_USER_ERROR_STATUS_CODE 
remove UPDATE_LOGIN_USER_ERROR_STATUS_CODE toggle
 2019-12-09 14:16:57 -05:00
Feanil Patel
0c1a169731 Merge pull request #22469 from edx/jenkins/upgrade-python-requirements-a189baa 
Python Requirements Update
 2019-12-09 12:16:20 -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
Taranjeet Singh
00653433a5 Adds optional "unsubscribe" link and api support to let users opt out of email updates. 
Scheduled emails show "unsubscribe" link if waffle switch
`schedules.course_update_show_unsubscribe` is enabled, and
settings.ACE_ENABLED_POLICIES respects `bulk_email_optout`.

API endpoint allows GET/POST requests, which:

* GET asks for confirmation of opt-out
* POST accepts "unsubscribe" or "cancel", where "unsubscribe" creates the
  Optout entry, and "cancel" does nothing.

Fixes flaky tests:

* The resolvers handle users in "bins", which are groups that depend on the user ID.
* The test user ID varies depending on the test order.
* This change ensures that the bin requested matches the user for the test.
 2019-12-09 22:49:57 +10:30
edX requirements bot
e7d5b0e6b1 Updating Python Requirements 2019-12-09 05:49:49 -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
9e4706e7bb remove UPDATE_LOGIN_USER_ERROR_STATUS_CODE toggle 
The toggle UPDATE_LOGIN_USER_ERROR_STATUS_CODE was added to roll out a
breaking change for `login_user` auth errors to return a 400 rather than
a 200.

This toggle was enabled in Production on 12/5/2019 with seemingly no
adverse affects.

ARCH-1253
 2019-12-06 17:20:17 -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