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

17675 Commits

Author SHA1 Message Date
Calen Pennington
529b2312db Merge pull request #22582 from cpennington/pull-in-overwrite-storage 
OverwriteStorage was removed from django-storages, so pull it into ed…
 2019-12-19 14:49:15 -05:00
edX cache uploader bot
cb40d75437 Updating Bokchoy testing database cache (#22579) 2019-12-19 14:40:53 -05:00
Calen Pennington
c83d0e2ca8 OverwriteStorage was removed from django-storages, so pull it into edx-platform (for now?) 2019-12-19 14:06:30 -05:00
David Ormsbee
a09c4e160b Merge pull request #22538 from open-craft/blockstore-video-transcripts 
Support transcript files for video XBlocks in Blockstore
 2019-12-19 11:24:27 -05:00
Aarif
10a00f8c98 Merge pull request #22508 from edx/BOM-1082 
Updated the django-countries to support Django 2.2
 2019-12-19 12:15:04 +05:00
edX Transifex Bot
0b7b62ae7f geoip2: update maxmind geolite country database 2019-12-18 16:13:47 -05:00
Dillon-Dumesnil
50534a8844 Merge pull request #22566 from edx/ddumesnil/disco-1522 
DISCO-1522: check if enrolled before congrats message
 2019-12-18 20:31:41 +00:00
Dillon Dumesnil
7165eeff44 DISCO-1522: check if enrolled before congrats message 
This helps out the Verified Only case where the user
is not first enrolled as an audit learner.
 2019-12-18 19:54:28 +00:00
Jeremy Bowman
072b3c11a1 Upgrade edx-ace and edx-django-sites-extensions (#22535) 2019-12-18 14:07:20 -05:00
edX cache uploader bot
0e5f95c8bc Updating Bokchoy testing database cache (#22557) 2019-12-18 14:02:42 -05:00
aarif
d81af828fb updated the django-countries to version that supports django 2.2 
updated the tests

minor changes

changes made verify capitalized country code

changes made verify capitalized country code

changes made stay consistent with country code implementation

changes made to test with previous implementation

updated the django-countries version to latest

updated the tests input to match the output

updated the constants to use updated country names according to new ISO standards
 2019-12-18 18:40:48 +05:00
Hassan Javeed
596cbbdf6c Add history to CourseEntitlementSupportDetail 2019-12-17 19:10:45 +05:00
Robert Raposa
c5f44bf20e update READMEs to clarify responsibilities 
Add some clarifications for student, user_api, and user_authn given
the recent clean-up of moving code to the appropriate apps.

ARCH-1248
 2019-12-16 13:51:43 -05:00
edX cache uploader bot
95a015a388 Updating Bokchoy testing database cache (#22540) 2019-12-16 10:06:04 -05:00
Robert Raposa
b2be6b3ba2 Merge pull request #22513 from edx/robrap/ARCH-1253-login-user-post-only-take-3 
ARCH-1253: require POST for login_user
 2019-12-15 15:59:00 -05:00
Braden MacDonald
e4eac68e9f Support transcript files for video XBlocks in Blockstore 2019-12-15 12:35:03 -08:00
Robert Raposa
3505492fff require POST for login_user 
ARCH-1253
 2019-12-15 11:20:06 -05:00
Diana Huang
95ff97e87d Merge pull request #22532 from edx/diana/transcript-handling 
Standardize input into SubRipFile
 2019-12-13 14:07:15 -05:00
edX cache uploader bot
595b2ce529 Updating Bokchoy testing database cache (#22531) 2019-12-13 13:34:40 -05:00
Diana Huang
217228dffc Standardize input into SubRipFile. 2019-12-13 13:28:27 -05:00
Feanil Patel
1411ef548c Merge branch 'master' into release-mergeback-to-master 2019-12-13 10:28:35 -05:00
uzairr
c545ed8bbe Update privacy and TOS links for edge. 
Currently,edge environment is serving empty pages against privacy
and TOS.Now, this behaviour is modified by pointing those links to
edX's privacy and TOS pages.

PROD-1066
 2019-12-13 17:39:03 +05:00
AsadAzam
a6735cd8d3 Merge pull request #22252 from edx/asad/prod-969-export-csv 
Export staff users csv
 2019-12-13 17:31:35 +05:00
asadazam93
30c8e1571e Export staff users csv 2019-12-13 16:57:01 +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
Robert Raposa
d79e7df32b use login_ajax for logistration 
- use login_ajax (in place of login_session with shim) for
logistration's call to login POST
- add toggle for using login_ajax from logistration
  - FEATURES['ENABLE_LOGIN_POST_WITHOUT_SHIM']
- add custom metrics for redirect_url
- update test for third-party auth error_code

NOTE: The error_code `third-party-auth-with-no-linked-account`
was introduced in JSON in this earlier PR:
https://github.com/edx/edx-platform/pull/22452/files

ARCH-1253
 2019-12-12 10:39:49 -05:00
Zainab Amir
7eb21f4dec Change version of social-auth-app-django (#21956) 
Microsoft social login is not working on edx mobile app. The issue
is fixed in newer version of social-auth-app-django.

PROD-718
 2019-12-12 18:07:34 +05:00
Zainab Amir
3e426ccecc Suppress grade on dashboard (#22471) 
Learners should not be able to view final grade before course end
date.Suppress the grade achieved so far till course end date on
dashboard.

PROD-701
 2019-12-12 17:22:58 +05:00
Diana Huang
28ce0e6739 Add logging middleware to determine why our responses are bad. 2019-12-11 17:01:07 -05:00
edX Transifex Bot
67cf593e0f geoip2: update maxmind geolite country database 2019-12-11 20:33:17 +00: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
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
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
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
Jeremy Bowman
86186e2026 Fix graph traversal under Python 3 (#22484) 2019-12-10 15:52:26 -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
5cc562b5b8 Use six to reraise a capa error. 2019-12-10 12:47:27 -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
01b6b19f2e Merge pull request #22454 from edx/feanil/handle_pickling_failure 
Feanil/handle pickling failure
 2019-12-09 11:44:14 -05:00
edX cache uploader bot
fa24ed8e83 Updating Bokchoy testing database cache (#22463) 2019-12-09 09:01:59 -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
Feanil Patel
bf482f4989 Respond to code review. 2019-12-06 15:02:22 -05:00
DawoudSheraz
99d694c86c log exception for further context 2019-12-06 15:06:19 +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
edX Transifex Bot
fa71006cad geoip2: update maxmind geolite country database 2019-12-04 16:08:42 -05:00