Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,160 Commits 1 Branch 0 Tags
5dae91bdf875eb5da68803e2948e32244dbd035d
Commit Graph

53160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
efd0c60ce1 Merge pull request #22560 from edx/feanil/ensure_tarfile_not_binary 
Make the file name not have a 'b' prefix.
 2019-12-18 13:59:50 -05:00
Feanil Patel
3808b2991c Ensure that photo verification data is correctly typed. 
There were cases where we needed to encode things to codecs other than
ascii.  In these cases, python returns byte strings but we needed them
to be unicode so that they serialize correctly later when we combine
them with other unicode strings.
 2019-12-18 13:54:37 -05:00
Nick
7d48feacb5 Merge pull request #22565 from edx/ndalfonso/DISCO-1414-org-source-of-truth 
DISCO-1414 org source of truth
 2019-12-18 13:36:27 -05:00
Calen Pennington
3633d7148e Merge pull request #22424 from eduNEXT/dmo/INCR-562 
INCR-562 @require_certificate_permission parameters added
 2019-12-18 13:25:28 -05:00
Feanil Patel
50ab035d49 Make the file name not have a 'b' prefix. 
We make sure the temp file name is a string because we combine it with
other string components with path later.
 2019-12-18 12:58:34 -05:00
Feanil Patel
d4f5ad3d18 Merge pull request #22564 from edx/feanil/fix_json_response 
Make sure the content is a string for json response.
 2019-12-18 12:51:41 -05:00
Feanil Patel
3fe207f9f1 Make sure the content is a string for json response. 2019-12-18 11:47:29 -05:00
Nicholas D'Alfonso
1fcab4d1ad DISCO-1414 org source of truth 
-point to updated edx-organizations package
 2019-12-18 11:47:22 -05:00
George Babey
aa111fbc66 Merge pull request #22472 from edx/hasnain-naveed/ENT-2505 
ENT-2505 | By passing the check for forcing the login by third auth when user is…
 2019-12-18 11:35:18 -05:00
Ned Batchelder
597c5d5f15 Merge pull request #22545 from edx/nedbat/coverage-5 
Upgrade to coverage 5.0
 2019-12-18 10:48:36 -05:00
Thomas Tracy
bedaeb2466 Merge pull request #22533 from edx/ttracy/MICROBA-70-update-footer-trademarks 
Change the footer trademark year.
 2019-12-18 10:40:15 -05:00
Feanil Patel
1fe28deed9 Merge pull request #22562 from edx/jenkins/upgrade-python-requirements-8e83865 
Python Requirements Update
 2019-12-18 10:35:19 -05:00
Robert Raposa
2e2ceeae8d update logistration js to require json 
This is Part 3 of clean-up for removing the shim from
LoginSessionView.post.  Not that the shim should be gone, the frontend
code can be simplified to always provide the shimless version of the
code.

ARCH-1253
 2019-12-18 10:20:18 -05:00
Robert Raposa
44a6ca3c2f Merge pull request #22488 from edx/robrap/ARCH-1253-remove-login-shim-part-2 
ARCH-1253: remove shim_student_view from LoginSession.post - Part 2
 2019-12-18 08:54:38 -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
Syed Muhammad Dawoud Sheraz Ali
a2558aea1b Merge pull request #22561 from edx/dsheraz/PROD-1092 
update user check in user state service
 2019-12-18 18:05:54 +05:00
edX requirements bot
5d35941ec3 Updating Python Requirements 2019-12-18 05:50:07 -05:00
DawoudSheraz
bb02732d37 update user check in user state service 2019-12-18 11:16:43 +05:00
Simon Chen
8e8386501d Upgrade edx-proctoring so we can deploy the email message changes 2019-12-17 14:52:28 -05:00
edX requirements bot
bf0a6f6308 Updating Python Requirements (#22553) 2019-12-17 11:52:18 -05:00
Hassan
8960b58a34 Merge pull request #22555 from edx/hassan/add-history-to-course-entitlement-support-detail 
Add history to CourseEntitlementSupportDetail.
 2019-12-17 21:15:08 +05:00
Hassan Javeed
596cbbdf6c Add history to CourseEntitlementSupportDetail 2019-12-17 19:10:45 +05:00
Matthew Piatetsky
3a54df511a show discount in sidebar and sock 2019-12-17 09:09:19 -05:00
Calen Pennington
31d96dbc47 Merge pull request #22549 from cpennington/git-revision-on-disk 
Read the current edx-platform git revision from a file on disk
 2019-12-17 08:57:41 -05:00
Abdul Hannan
67ea6e9a4a Merge pull request #22480 from edx/pwnage101/add-history-to-generatedcertificate 
Add history to GeneratedCertificate
 2019-12-17 18:23:48 +05:00
Troy Sankey
22f8b65228 Add history to GeneratedCertificate 
DE-1881
 2019-12-17 17:50:25 +05:00
Calen Pennington
11e163d420 Read the current edx-platform git revision from a file on disk 2019-12-17 07:44:28 -05:00
Usama Sadiq
3fb00a40e0 Merge pull request #22552 from edx/usama/prod-793-custom-backpopulate-credentials-arguments 
Code fix & removed Pylint Warning Supression
 2019-12-17 15:44:41 +05:00
usama sadiq
dc666127f1 Code fix & removed Pylint Warning 2019-12-17 15:01:30 +05:00
Robert Raposa
0133288c39 Merge pull request #22548 from edx/robrap/update-READMEs 
update READMEs to clarify responsibilities
 2019-12-16 19:16:01 -05:00
Ned Batchelder
18b17b40af Unpin coverage and use the latest (5.0) 2019-12-16 15:36:46 -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
Simon Chen
c5e0a9f636 PROD-1089 upgrade edx-proctoring to the code with bug fixes on Instructor Dashboard Proctoring view 2019-12-16 10:40:29 -05:00
edX cache uploader bot
95a015a388 Updating Bokchoy testing database cache (#22540) 2019-12-16 10:06:04 -05:00
Waheed Ahmed
dde52f2ee3 Merge pull request #22542 from edx/transifex-bot-update-translations2019-12-16 
fix(i18n): update translations
 2019-12-16 18:02:42 +05:00
Awais Qureshi
1ac7fa503b Merge pull request #22527 from edx/awais786/BOM-1088 
BOM-1088
 2019-12-16 17:20:56 +05:00
Awais Qureshi
572448d82b BOM-1088 
Upgrade django-ses
 2019-12-16 16:26:07 +05:00
edX Transifex Bot
d8f114b7f8 fix(i18n): update translations 2019-12-16 11:20:20 +00:00
Ayub
bec7893ec5 Merge pull request #22526 from edx/BOM-1085 
BOM-1085
 2019-12-16 15:43:33 +05:00
Aarif
16e0207512 Merge pull request #22494 from edx/BOM-1081 
Updated the django-cors-headers to support Django 2.2
 2019-12-16 14:50:10 +05:00
Syed Muhammad Dawoud Sheraz Ali
2325831d2b Merge pull request #22495 from edx/dsheraz/PROD-1053 
update ORA version to use user state service
 2019-12-16 14:18:34 +05:00
Ayub khan
5c4c9fd26e BOM-1085 
-bumped django-model-utils version to support django 22
 2019-12-16 14:03:57 +05:00
aarif
e9672344f8 updated the django-cors-headers to version that supports django 2.2 
downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

updated the django-cors-headers to version that supports django 2.2

downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

updated the django-cors-headers to version that supports django 2.2

downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

ran make upgrade
 2019-12-16 12:57:10 +05:00
DawoudSheraz
113f48d545 update ora version 2019-12-16 11:20:55 +05:00
DawoudSheraz
5178256f3c add user state service in module render 2019-12-16 11:20:55 +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
ca519d63f3 Merge pull request #22536 from edx/release-candidate 
Release candidate
 2019-12-13 17:04:35 -05:00
David Moreno
c519196022 @require_certificate_permission parameters added 2019-12-13 15:55:59 -05:00