Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,431 Commits 1 Branch 0 Tags
8c1957fd5e40d78d4b103de01309345b1965d229
Commit Graph

51431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Qureshi
8c1957fd5e BOM-641 
Fixing python3
 2019-09-20 15:41:45 +05:00
Thomas Tracy
c6edb954d5 Merge pull request #21719 from edx/ttracy/ent-2305-enterprise-version-bump 
Enterprise Version Bump
 2019-09-19 16:35:47 -04:00
David Ormsbee
75b8c7ea13 Merge pull request #21722 from open-craft/new-runtime-fixes 
Fix: new runtime was not mixing 'has_score' into XBlocks
 2019-09-19 16:25:47 -04:00
Braden MacDonald
e1d2257fe0 Fix: new runtime was not mixing 'has_score' into XBlocks 2019-09-19 12:53:37 -07:00
Thomas Tracy
b0d731b829 Version bump 2019-09-19 15:39:27 -04:00
Ben Holt
5cc8da127a REV-935 mobile upsell and tests (#21687) 
Positive test case and improvements including: requires course id to be correctly encoded in the url params, only checks entitlements of the course in question, better source for the basket url, check enrollment upgrade deadline
 2019-09-19 14:59:07 -04:00
Jansen Kantor
b0f40a111c add requesting_user to simple-history model (#21683) 2019-09-19 13:43:35 -04:00
Nick
01ba7f6f20 Merge pull request #21696 from edx/ndalfonso/DISCO-1342-hide-fields 
DISCO-1342 hide fields
 2019-09-19 12:35:48 -04:00
Nicholas D'Alfonso
039b7aed29 DISCO-1342 hide fields 
hide course card image, course about page image, and course
display name when publisher flag is turned on
 2019-09-19 11:56:00 -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
Feanil Patel
dab38a5ef3 Merge pull request #21701 from edx/python3-swarm 
Python3 swarm
 2019-09-19 10:23:04 -04:00
Feanil Patel
8ae1f7ba1d Merge pull request #21705 from edx/jenkins/upgrade-python-requirements-5801f00 
Python Requirements Update
 2019-09-19 10:04:09 -04:00
Michael Terry
3dcc2bdcfe Merge pull request #21700 from edx/mikix/delay-msg 
Add Studio note about mktg site delay
 2019-09-19 09:47:52 -04:00
Ayub
70152513cf Merge pull request #21710 from edx/BOM-630 
BOM-630
 2019-09-19 18:04:27 +05:00
Ayub khan
28cb3c9a71 BOM-630 
python3 compatibility
 2019-09-19 17:19:04 +05:00
edX requirements bot
3dee5a5aac Updating Python Requirements 2019-09-19 06:48:26 -04:00
Aarif
5801f00006 Merge pull request #21681 from edx/BOM-484 
BOM-484
 2019-09-19 14:11:33 +05:00
Ayub
edd8322ec2 Merge pull request #21693 from edx/BOM-432 
BOM-432
 2019-09-19 12:22:30 +05:00
Feanil Patel
bab6b87eb8 Fix pylint error. 2019-09-18 17:28:12 -04:00
Jeremy Bowman
10d9bb22b5 Fix oauth_dispatch tests BOM-732 2019-09-18 17:02:38 -04:00
Jeremy Bowman
f08a2ed88d Fix text representation of VerifiedTrackCohortedCourse BOM-733 2019-09-18 16:55:00 -04:00
Ned Batchelder
71ce73d98e Merge pull request #21207 from edx/nedbat/api-docs 
REST API docs
 2019-09-18 16:42:10 -04:00
Jeremy Bowman
83eb9e7f1a Fix auth_exchange tests BOM-648 2019-09-18 16:37:52 -04:00
Michael Terry
1f024c406b Add Studio note about mktg site delay 
Add a note when marketing site is enabled that there is a delay
from changes in Studio appearing on the marketing site.

DISCO-1356
 2019-09-18 16:31:36 -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
90838d27aa BOM-618 update dependency to fix test mixins. 2019-09-18 15:14:07 -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
Ned Batchelder
456ab68986 Check for ascii with an explicit ascii encode. BOM-728 2019-09-18 14:49:03 -04:00
Ned Batchelder
1c6ed4026e Test JSON data without relying on arbitrary ordering. BOM-734 2019-09-18 14:34:16 -04:00
Jeremy Bowman
07ab555d05 Fix most common/djangoapps/util tests 2019-09-18 14:26:41 -04:00
Alex Dusenbery
44c96b4e9b Minor correction of grade freeze ADR. 2019-09-18 14:24:40 -04:00
Ned Batchelder
7281fed719 Test JSON data without relying on arbitrary ordering. BOM-735 2019-09-18 14:24:37 -04:00
Feanil Patel
cb64fed1af BOM-489 Studio tests with byte/str mismatch. 2019-09-18 14:21:16 -04:00
Jeremy Bowman
8f6286a1a2 Fix a few user_api tests 2019-09-18 14:07:38 -04:00
Jeremy Bowman
5f2a6430fe Fix YouTube stub responses 2019-09-18 13:56:11 -04:00
Jeremy Bowman
0c207859cd Fix most tests in user_authn 2019-09-18 13:43:30 -04:00
Ned Batchelder
b027437e80 get_all_orgs returns a set, not a list. BOM-731 2019-09-18 13:42:55 -04:00
Ned Batchelder
1e4fac6440 Better tests of stringifying objects. BOM-730 and BOM-731 2019-09-18 13:29:32 -04:00
Jeremy Bowman
f68c7e87f7 Fix student.helpers logging tests 2019-09-18 12:59:32 -04:00
Jeremy Bowman
42cfb3ec8f Fix last common/djangoapps/track test 2019-09-18 12:08:36 -04:00
Jeremy Bowman
6f18383142 Fix bytes/string handling in tracking middleware 2019-09-18 11:59:24 -04:00
Feanil Patel
220759ee1d Remove unnecessary print statements. 2019-09-18 11:52:15 -04:00
Feanil Patel
ea49975a73 BOM-617 Fix test_static_replace test failures. 
Update the tests around static_file code to use byte streams instead of
string streams for generating static content.  This is a fix to get
these tests passing on python 3.
 2019-09-18 11:51:49 -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