Commit Graph

52730 Commits

Author SHA1 Message Date
edX requirements bot
a05714e397 Updating Python Requirements 2019-12-30 05:48:38 -05:00
Awais Qureshi
c7c6242a0e Merge pull request #22617 from edx/awais786/BOM-1124
BOM-1124
2019-12-30 15:09:27 +05:00
Zainab Amir
257c635a68 Fix Targeted Feedback HTML (#22606)
etree.tostring returns bytes instead of string which when converted
back to XML, to be rendered as etree element, presents stray
characters.

PROD-1116
2019-12-30 15:06:02 +05:00
Zaman Afzal
c07268d1b5 Fix the broken privacy page link url on enterprise login page (#22528) 2019-12-30 14:57:28 +05:00
edX Transifex Bot
55cfc45a85 fix(i18n): update translations 2019-12-30 03:22:15 -05:00
Awais Qureshi
804a84f9cf BOM-1124
Direct assignment to the forward side of a many-to-many set is deprecated Fixing this issue.
2019-12-28 00:04:15 +05:00
Feanil Patel
0fd3c84889 Merge pull request #22624 from edx/feanil/remove_screenshots
Remove unused screenshots.
2019-12-27 11:22:34 -05:00
Feanil Patel
59808c82f1 Merge pull request #22611 from edx/feanil/fix_mathjax_bug
Don't try to typset mathjax if Hub has not loaded.
2019-12-27 11:22:22 -05:00
Jeremy Bowman
0cb7539999 Python dependencies cleanup (#22612) 2019-12-27 11:00:46 -05:00
Feanil Patel
f0fdb18d64 Remove unused screenshots. 2019-12-27 10:51:11 -05:00
David Ormsbee
a8992a16dd Merge pull request #21610 from open-craft/samuel/test-oauth2
SE-1071 send user_logged_in signal from my_user_info
2019-12-27 10:34:44 -05:00
Feanil Patel
1b1de5c1ab Merge pull request #22618 from open-craft/giovanni/remove-python3-flaky-test
BB-1744: Remove flaky test related to MockS3Mixin [FOLLOW-UP]
2019-12-27 10:34:28 -05:00
Feanil Patel
99e31ab4ae Merge pull request #22610 from edx/feanil/remove_unused_static
We don't need this anymore.
2019-12-27 10:28:30 -05:00
edX cache uploader bot
1cbe81f747 Updating Bokchoy testing database cache (#22614) 2019-12-27 09:19:10 -05:00
Giovanni Cimolin da Silva
d1aeec45ad Remove flaky test related to MockS3Mixin
The MockS3Mixin prevents the correct setup of the ModuleStoreTestCase 
and made this test fail. Since the fix for this wasn't trivial, this 
test was skipped on python 3, and now is removed.
2019-12-27 09:59:25 -03:00
Samuel Walladge
c0b908e02d send user_logged_in signal from my_user_info
A user's last logged in value previously wasn't updated when the user
logs in through the oauth2 flow from the ios mobile app. Here we must
send the user_logged_in signal manually. It's implemented in the
my_user_info mobile rest api endpoint because adding it to where the
oauth2 flow happens is to complex, and the mobile app hits this endpoint
after a successful login anyway.
2019-12-27 09:37:22 +10:30
edX cache uploader bot
fe1f69741e Updating Bokchoy testing database cache (#22608) 2019-12-26 16:39:55 -05:00
Jeremy Bowman
673592d89b Switch xblock-poll back to source repo (#22597) 2019-12-26 16:38:48 -05:00
Feanil Patel
ff40369990 Don't try to typset mathjax if Hub has not loaded.
In our tests there are times when Mathjax has been initialized but
Hub is still undefied.  In this case don't queue up typesetting.
2019-12-26 16:13:58 -05:00
Feanil Patel
979e7ea653 Merge pull request #21128 from edx/feanil/py3-canary
Make a change to cause tests to run.
2019-12-26 15:25:26 -05:00
Feanil Patel
ae842fd250 We don't need this anymore.
They were created to work with a service that no longer exists.
2019-12-26 15:23:02 -05:00
Jeremy Bowman
b2046f6674 Switch make upgrade to Python 3.5 (#22609)
* Switch make upgrade to Python 3.5

* bok-choy fixes, constrain django-debug-toolbar

* Remove flaky bok-choy test
2019-12-26 15:13:02 -05:00
David Ormsbee
10cc7895bd Merge pull request #22607 from appsembler/omar-matej/fix-image-ratio-studio
fix uploaded image aspect ratio in tinymce
2019-12-26 12:33:27 -05:00
Feanil Patel
f359c9cd8f Merge pull request #21197 from open-craft/giovanni/upgrade-pymongo
BB-1744: Bump pymongo version and fix course export issue
2019-12-26 11:16:15 -05:00
David Ormsbee
a4b64c3a79 Merge pull request #21166 from open-craft/guruprasad/fix-courseenrollment-mode-default
[BB-1506] Use a callable as the default value for CourseEnrollment.mode
2019-12-26 10:25:27 -05:00
Matej Grozdanović
4b2bf9c4ac fix uploaded image aspect ratio in tinymce 2019-12-26 16:39:39 +03:00
Awais Qureshi
9bae9c0f55 Merge pull request #22595 from edx/awais786/BOM-1111
BOM-1111
2019-12-23 21:29:46 +05:00
Alan Zarembok
4b727ef5e9 Merge pull request #22590 from edx/azarembok/fix-retry-verifications
PROD-1113: Fix retry_failed_photo_verifications.
2019-12-23 11:25:27 -05:00
edX requirements bot
033bb5a3c4 Updating Python Requirements (#22594) 2019-12-23 10:08:29 -05:00
Awais Qureshi
5f6b2db31b BOM-1111
Updating User.is_authenticated and User.is_anonymous as properties
2019-12-23 17:51:27 +05:00
adeel khan
91bb648d11 Merge pull request #22593 from edx/adeel/prod_1076_html_editor_error
Fix html editor for adding �
2019-12-23 16:46:51 +05:00
Adeel Khan
51da469762 Fix html editor for adding �
This patch would fix html editor
for adding � characters in
html attributes whenever cursor
is inside quotes. � characters
are added on save.

PROD-1076
2019-12-23 15:47:48 +05:00
edX Transifex Bot
610ea4a5a4 fix(i18n): update translations 2019-12-22 16:26:53 -05:00
Alan Zarembok
be8fef3513 PROD-1113: Fix retry_failed_photo_verifications to work when no database arguments exist. 2019-12-20 17:52:03 -05:00
Feanil Patel
1454dc0c2a Merge pull request #22588 from edx/feanil/fix_export_filename
Don't encode the filename.
2019-12-20 14:31:10 -05:00
Feanil Patel
898df63955 Don't encode the filename.
We fixed this for when we sand_tarballs for local but not for when we
used django storages.  This should fix the filename when we get the file
from storages.
2019-12-20 13:30:28 -05:00
Feanil Patel
7372f07cf4 Merge pull request #22587 from edx/feanil/update_instructor_task_logic
Only store bytes to s3 via boto2.
2019-12-20 12:59:03 -05:00
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
edX requirements bot
1aa2bd548c Updating Python Requirements (#22586) 2019-12-20 10:53:22 -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