Commit Graph

22621 Commits

Author SHA1 Message Date
Jeremy Bowman
fc57bf9763 Use bytes with GridFS when not specifying an encoding - BOM-157 2019-09-19 11:17:01 -04:00
Awais Qureshi
112a0c7af6 Merge pull request #21694 from edx/awais786/BOM-437
BOM-437
2019-09-19 20:03:38 +05:00
Matt Hughes
09d5c87647 Fix bug with override removal conditions
This was failing to delete overrides stemming from proctoring which
pre-date the corresponding change.

JIRA:PROD-704
2019-09-19 10:44:18 -04:00
Jeremy Bowman
91c87fd65b Fixed last lms/djangoapps/discussion test failures - BOM-680 2019-09-19 10:38:49 -04:00
Ned Batchelder
835a84f33c Use bytestrings to create SimpleUploadedFiles. BOM-616 2019-09-19 10:32:23 -04:00
Feanil Patel
f259a911c7 BOM-618 Decode content we get from test requests. 2019-09-19 10:32:23 -04:00
Feanil Patel
dab38a5ef3 Merge pull request #21701 from edx/python3-swarm
Python3 swarm
2019-09-19 10:23:04 -04:00
Ayub khan
28cb3c9a71 BOM-630
python3 compatibility
2019-09-19 17:19:04 +05:00
Ayub khan
a075e44e72 BOM-273
tests fixed
2019-09-19 14:26:07 +05:00
Ayub
edd8322ec2 Merge pull request #21693 from edx/BOM-432
BOM-432
2019-09-19 12:22:30 +05:00
Ned Batchelder
71ce73d98e Merge pull request #21207 from edx/nedbat/api-docs
REST API docs
2019-09-18 16:42:10 -04:00
Feanil Patel
93142ebd2d Update the ssencrypt logic for python3.
We updated the underlying methods to always be passing unicode strings
aronud and only encode them to bytes when we need to hash them.
2019-09-18 16:28:11 -04:00
Feanil Patel
3427c1abf3 BOM-618 Pass unicode to json.loads 2019-09-18 16:28:11 -04:00
Ned Batchelder
6408f96e18 Use explicit values in test assertions. BOM-683
Python 3 changed how rounding is performed. In Python 2, .625 rounded to
.63 (as our grading code rounds it, so the test passed).  In Python 3,
.625 rounds to .62.  This fixes the test by avoiding round() to
calculate the expected value, and instead simply using the value we
expect.
2019-09-18 16:13:40 -04:00
Feanil Patel
de0eafa0ba BOM-618 Decode test client content.
The django test client returns bytes, and many of our tests start using
it like a string. This was fine in python 2 but not in python3.
2019-09-18 14:58:30 -04:00
Alex Dusenbery
44c96b4e9b Minor correction of grade freeze ADR. 2019-09-18 14:24:40 -04:00
Ned Batchelder
b027437e80 get_all_orgs returns a set, not a list. BOM-731 2019-09-18 13:42:55 -04:00
David Ormsbee
6ee4cbd94e Merge pull request #21697 from open-craft/symbolist/disable-edxnotes-blockstore-runtime
Disable edxnotes for blockstore runtime.
2019-09-18 11:39:27 -04:00
Usman Khalid
997f765eaf Disable edxnotes for blockstore runtime.
Blockstore runtime does not support courses currently and it will
not have the modulestore attribute in any case.
2019-09-18 19:54:57 +05:00
Braden MacDonald
1382bf8720 Save user state for Blockstore XBlocks in CSM, clean up CSM a bit (#21630)
This commit introduces the changes needed for XBlocks in Blockstore to save
their user state into CSM. Before this commit, all student state for Blockstore
blocks was ephemeral (in-process dict store).

Notes:

* The main risk factor of this PR is that it adds non-course keys to the
  course_id field in CSM. If any code (like analytics?) reads course keys
  directly out of CSM and doesn't have graceful handling for key types it
  doesn't recognize, it could cause an issue. With the included changes to
  opaque-keys, calling CourseKey.from_string(...) on these values will raise
  InvalidKeyError since they're not CourseKeys. (But calling
  LearningContextKey.from_string(...) will work for both course and library
  keys.)
* This commit introduces a slight regression for the Studio view of XBlocks in
  Blockstore content libraries: their state is now lost from request to request.
  I have a follow up PR to give them a proper studio-appropriate state store,
  but I want to review it separately so it doesn't hold up this PR and we can
  test this PR on its own.
2019-09-18 10:27:46 -04:00
Awais Qureshi
76bead175d BOM-437
Fixing python3
2019-09-18 19:20:06 +05:00
Ayub khan
8133b82d3c BOM-432
python3 compatibility
2019-09-18 16:44:27 +05:00
Ned Batchelder
f7cd63f784 Convert bookmarks and certificates API docs to yasg format 2019-09-17 16:54:27 -04:00
Ned Batchelder
33e8f77867 Make notifier_api available at the correct url: /api/notifier 2019-09-17 16:54:27 -04:00
Ned Batchelder
d585a8f71d URLs and settings for OpenAPI generation
API docs are now always available, no more toggle to enable them.
2019-09-17 16:54:27 -04:00
Awais Qureshi
8997ba5fbb Merge pull request #21685 from edx/awais786/BOM-422
BOM-422
2019-09-17 22:58:34 +05:00
Ayub
78a22371c5 Merge pull request #21668 from edx/BOM-438
BOM-438
2019-09-17 22:42:22 +05:00
David Ormsbee
993e9630b4 Merge pull request #21677 from open-craft/samuel/fix-migration-crash
SE-1553 conditionally run migration on CSMH Extended table
2019-09-17 13:19:40 -04:00
Stu Young
13bbf85257 clean up toggle annotations (#21673)
clean up toggle annotations and lint when running feature toggle report
2019-09-17 11:11:20 -04:00
Awais Qureshi
a4428d751d BOM-422
Fixing python3
2019-09-17 19:00:05 +05:00
Ayub
11a9a4b953 Merge pull request #21665 from edx/BOM-448
BOM-448
2019-09-17 16:22:52 +05:00
Ayub khan
d34eba0e9c BOM-438
Python3 compatibility.
2019-09-17 16:08:32 +05:00
Samuel Walladge
eeedc39b3e conditionally run migration on CSMH Extended table
CSMH_EXTENDED is optional, so this table is not guaranteed to exist.
2019-09-17 11:00:17 +09:30
usama sadiq
3a298f664d Prod-600
Changed <aside> tag to <div> tag according to the accessibility guidelines
mentioned in AXE 3.3

<aside> tag should not be a child of <main> hence replaced the
<aside> tag with the <div> tag.
2019-09-16 16:04:32 +05:00
Ned Batchelder
a4f03620a4 Merge pull request #21645 from edx/nedbat/no-pipes-on-logout
Remove extraneous pipes
2019-09-16 06:41:27 -04:00
Ayub
7b186b2f52 Merge pull request #21656 from edx/BOM-420
BOM-420
2019-09-16 12:26:46 +05:00
Ayub khan
f70bc1a03c BOM-448
python3 compatibility, tests fixes
2019-09-16 12:19:26 +05:00
Matt Hughes
4957b981a4 Only delete latest grade override if it came from proctoring
... on proctored exam attempt deletion

JIRA:EDUCATOR-4642
2019-09-13 11:54:32 -04:00
Ayub khan
06c7e3e4e9 BOM-420
fixed all file tests
2019-09-13 18:39:00 +05:00
Michael Terry
45d48e07cd Drop RUN_AS_ANALYTICS_SERVER_ENABLED
This is an ancient feature flag that uses an archived and
unsupported support library (edinsights, edx/insights).

DEPR-44
2019-09-13 09:30:02 -04:00
adeelehsan
89c57a636a Merge pull request #21572 from edx/aehsan/learner-3838/user_agent_regex_updated_for_mobile_platform
user agent regex updated in mobile platform
2019-09-13 15:05:52 +05:00
Aarif
072f878b90 Merge pull request #21637 from edx/BOM-446
BOM-446
2019-09-13 14:40:36 +05:00
Aarif
616ee00437 Merge pull request #21621 from edx/BOM-412
BOM-412
2019-09-13 12:01:07 +05:00
Kyle McCormick
358f989131 Create Python API for program_enrollments: Part III
This is the third in a series of commits to create
a Python API for the LMS program_enrollments app.
It does the following:
* Creates api/ folder.
* Moves link_program_enrollments.py to api/linking.py
* Creates api/reading.py for enrollment-fetching
  functions.
* Updates rest of app to use api/reading.py when
  it was going directly through the models before.
* Other misc. cleanup (isorting, unicode_literals,
  line breaks, etc).

Still to do:
* Create api/writing.py and update app to use it instead
  of going directly through models.
* Create api/reset.py and api/expire.py, which the management
  commands call out to.

EDUCATOR-4321
2019-09-12 14:54:03 -04:00
Awais Qureshi
1dde3c354a Merge pull request #21642 from edx/awais786/BOM-472
BOM-472
2019-09-12 21:30:30 +05:00
Awais Qureshi
ab50ee96ec Merge pull request #21636 from edx/BOM-411
BOM-411
2019-09-12 21:23:58 +05:00
Feanil Patel
1842ac2225 Merge pull request #21644 from edx/feanil/fix_bokchoy
Feanil/fix bokchoy
2019-09-12 12:04:08 -04:00
Ned Batchelder
e44f6d958c Remove extraneous pipes 2019-09-12 10:50:10 -04:00
Feanil Patel
dfe77a968e Remove the mongo plugin for the djnago-debug-toolbar.
We are currently running this plugin from a has directly off of master
to get support for a newer version of DJDT.  However even on master
there is not yet support for python 3.  We're running into this when
running runserver and when collecting static assets.

A quick survey of the development team at edX shows that people are no
longer actively using this debug panel.(14 responders all saying no to
the question "In the last year have you used the mongo portion of the
django-debug-toolbar in edx-platform?")

This makes sense since the module store and courseware related
developement is not very active right now.  Given all this, I'm removing
this toolbar for now and if we need it again we can survey what's
available at that time to choose the best tool.
2019-09-12 10:18:46 -04:00
Awais Qureshi
dfb00f95b5 BOM-411
Fixing python3
2019-09-12 19:12:37 +05:00