Commit Graph

52686 Commits

Author SHA1 Message Date
Feanil Patel
640e8cc9c8 Only store bytes to s3 via boto2.
https://github.com/boto/boto/issues/2868

In python 3 contentfile can act like a file but return unicode strings.
Boto doesn't like that and it causes issues when encoding the bytes for
transfer to s3.
2019-12-20 11:57:32 -05:00
Andytr1
b1b5403041 Merge pull request #22559 from edx/andytr1/studio_teamsconfiguration_svc
EDUCATOR-4846 - added team config service for xblocks.
2019-12-20 10:46:04 -05:00
David Ormsbee
62eeabd1bc Merge pull request #22427 from open-craft/anonymous-user-state
Support anonymous users with new (Blockstore-based) XBlock Runtime
2019-12-20 10:28:41 -05:00
atesker
e0d57fe1a7 EDUCATOR-4846 - added team config service for xblocks.
Quality / encoding

Remove comments

remove debug

Changed service implementation to make unit testing easier

Corrected service

code style

unit test cleanup

Clean up imports
2019-12-20 09:57:30 -05:00
Feanil Patel
120d97ba38 Merge pull request #22584 from edx/feanil/fix_photo_id_key
Instantiate idv attempt with a string photo_id_key.
2019-12-19 23:25:55 -05:00
Braden MacDonald
f31dc19887 Support anonymous users in the Blockstore-based XBlock runtime
Implementation details:
* Anonymous users are assigned a unique ID (like 
  `anon42c08f9996194e2a9339`) which gets stored in the django session.
  `block.scope_ids.user_id` and `block.runtime.anonymous_student_id`
  will both return this value.
* User state for anonymous users is stored in the django cache and
  automatically expires as the cache gets pruned. Because user state is
  stored, anonymous users can use interactive blocks like capa problems.
* There is no mechanism for upgrading to a registered account and
  keeping user state since the user state store for anonymous users
  (EphemeralKeyValueStore) is completely different than the one for
  registered users (DjangoKeyValueStore/"CSM"), and has no "list all
  keys" functionality.
* "User State Summary" field values are shared among [recently active]
  anonymous users but are not shared with registered users.
* Anonymous users can only access the `public_view` of XBlocks, not the
  regular `student_view`.
2019-12-19 16:12:24 -08:00
Feanil Patel
2cae30cd92 Instantiate idv attempt with a string photo_id_key.
When we run the management command, the photo_id_key is retrieved
through the orm and so is represented as a string.  However, when we do
the initial attempt, the object is instantiated and we refer to the key
without having decoded it.  The photo_id_key is sent as a part of the
request to software secure.  And if we have a byte representation their
signature checking will fail.

This is why the management command worked even when the site didn't.
It was getting a cleaned key via the orm.
2019-12-19 16:18:02 -05:00
Simon Chen
682a450362 Fix the bug where we return many programs if the number of courses the staff user is enrolled in are many 2019-12-19 15:00:43 -05:00
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
Feanil Patel
67f677bffb Merge pull request #22581 from edx/feanil/fix_export_filename
Correct the output file name for exports.
2019-12-19 14:24:44 -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
Feanil Patel
75eeee0f89 Correct the output file name for exports. 2019-12-19 12:48:13 -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
Hassan
92d585dd4a Merge pull request #22442 from edx/pwnage101/rename-creditrequirement-order-1
Rename order in CreditRequirement (1/3)
2019-12-19 21:00:21 +05:00
edX requirements bot
7a52523830 Updating Python Requirements (#22575) 2019-12-19 10:37:49 -05:00
Robert Raposa
e74b19c900 Merge pull request #22577 from edx/feanil/fix_json_response
Upgrade edx-ora2 to fix studio edit view.
2019-12-19 09:57:18 -05:00
Hassan
7d110cb5d4 Merge pull request #22574 from edx/hassan/add-history-from-snapshot-to-coursemode
Added management command to add coursemode history from snapshot.
2019-12-19 19:21:11 +05:00
Feanil Patel
84093e11c1 Upgrade edx-ora2 to fix studio edit view.
There was a serialization issue with one of the studio JS assets that
is rendered as a part of the edit view.
2019-12-19 09:17:13 -05:00
George Babey
6546d394fe Merge pull request #22510 from edx/hasnain-naveed/ENT-2452
ENT-2452, ENT-2068 | Made the lms and learner portal alerts responsiv…
2019-12-19 09:10:23 -05:00
Zainab Amir
d2ca9a02d1 Disable Audit Certs for Whitelisted Students (#22401)
Ensure that certificate is not generated if a learner enrolled in
audit mode is whitelisted

PROD-978
2019-12-19 17:06:33 +05:00
Troy Sankey
52eae381ac Rename order in CreditRequirement (1/3)
This stage does the following:

- Adds the new field and migration to create the column.
- Makes all* writes go to both old and new field.

(*) Except for writes from the Django Admin for this model.  I confirmed
with Support that CreditRequirements are never edited through the Django
Admin interface.  Additionally, I confirmed via the django_admin_log
that there is no record of anybody changing any CreditRequirements.
2019-12-19 15:42:46 +05:00
Hassan Javeed
b699308933 Added management command to add history from snapshot. 2019-12-19 15:41:29 +05:00
Zaman Afzal
f20a064a0c ENT-2500 Bypass multiple enterprise selection page for SAML user (#22459) 2019-12-19 13:16:38 +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
Feanil Patel
972aa3fd4e Merge pull request #22567 from edx/feanil/fix_id_verification_errors
Ensure that photo verification data is correctly typed.
2019-12-18 16:31:52 -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
Jansen Kantor
92e833d565 add api function and teams service (#22515)
* add api function and teams service
2019-12-18 15:05:02 -05: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
Matthew Piatetsky
652b49c5ac Merge pull request #22550 from edx/REV-1064
[REV-1064] show discount in sidebar and sock
2019-12-18 14:08:22 -05: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
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
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