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

3137 Commits

Author SHA1 Message Date
Ayub
846a12939e Merge pull request #21735 from edx/BOM-update_str_method 
BOM Project __unicode__ to __str__
 2019-09-26 10:47:14 +05:00
Braden MacDonald
8a2d499dd2 Track grades for Blockstore content, emit tracking logs 2019-09-25 10:42:55 -04:00
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05:00
Aarif
22992029f8 Merge pull request #21755 from edx/BOM-658 
BOM-658
 2019-09-25 15:19:01 +05:00
Aarif
5f3b5d6110 Merge pull request #21748 from edx/BOM-586 
BOM-586
 2019-09-25 14:55:12 +05:00
Jeremy Bowman
6cfa08d21d Fix CSV writing in test BOM-639 (#21762) 2019-09-24 12:13:59 -04:00
Jeremy Bowman
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
aarif
11fe396314 python 3 fixes 2019-09-24 15:38:01 +05:00
Awais Qureshi
6d5ea3b7ea Merge pull request #21732 from edx/awais786/BOM-584 
Awais786/bom 584
 2019-09-24 14:37:37 +05:00
Awais Qureshi
1f92b080f7 Merge pull request #21733 from edx/awais786/BOM-581 
BOM-581
 2019-09-24 14:26:29 +05:00
Ned Batchelder
e1a3d66143 Merge pull request #21220 from eduNEXT/coa/course-index-regex 
Making the regex that gets the index courses more secure
 2019-09-23 11:32:28 -04:00
aarif
822af10479 python 3 fixes 
quality fixes
 2019-09-23 19:22:40 +05:00
aarif
70f51de25b python 3 fixes 
quality fixes

python 3 fixes

quality fixes
 2019-09-23 17:21:37 +05:00
Hassan Javeed
23cd4d9899 Management command to add history to course_overviews_courseoverview. 2019-09-20 23:50:01 +05:00
Kyle McCormick
298c3498ae Add course_exists utility to CourseOverview class 2019-09-20 09:55:13 -04:00
Awais Qureshi
62595bba75 BOM-581 
Fixing python3
 2019-09-20 18:32:22 +05:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2 
Python3 swarm 2
 2019-09-20 08:48:19 -04:00
Awais Qureshi
f10df9dd5e BOM-581 
Fixing python3
 2019-09-20 16:30:15 +05:00
Awais Qureshi
75b5fffb87 BOM-584 
Fixing python3
 2019-09-20 16:11:47 +05:00
Awais Qureshi
718fb0f5b8 BOM-585 
Fixing python3
 2019-09-20 16:03:28 +05:00
Ayub
fe61a3cddc Merge pull request #21712 from edx/BOM-574 
BOM-574
 2019-09-20 15:32:36 +05:00
Feanil Patel
844acea50e Fix linting errors. 2019-09-19 17:05:02 -04:00
Feanil Patel
0e1ad4cd26 Fix pylint error in email_opt_in_list. 2019-09-19 16:19:37 -04:00
Feanil Patel
4eaf875741 BOM-621 Fix hashing in a bunch of places. 2019-09-19 15:53:39 -04:00
Braden MacDonald
e1d2257fe0 Fix: new runtime was not mixing 'has_score' into XBlocks 2019-09-19 12:53:37 -07:00
Feanil Patel
24c0974f78 BOM-619 Fix csv encoding/decoding in management command test. 2019-09-19 14:14:22 -04:00
Feanil Patel
cbf35593ac BOM-618 Decode to utf-8 before loading as json in tests. 2019-09-19 11:15:11 -04:00
Jeremy Bowman
91c87fd65b Fixed last lms/djangoapps/discussion test failures - BOM-680 2019-09-19 10:38:49 -04:00
Jeremy Bowman
23870802c6 Replace usage of UUID.get_hex() - BOM-672 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
22916323a1 BOM-574 2019-09-19 18:18:49 +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
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
Ned Batchelder
7281fed719 Test JSON data without relying on arbitrary ordering. BOM-735 2019-09-18 14:24:37 -04:00
Jeremy Bowman
8f6286a1a2 Fix a few user_api tests 2019-09-18 14:07:38 -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
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
Aarif
530dadb1b0 Merge pull request #21682 from edx/BOM-485 
BOM-485
 2019-09-18 18:01:37 +05:00
adeel khan
b3737ff95a Merge pull request #21670 from edx/adeel/prod_548_automate_args_simulate_publish_command 
Adds config model to pass arguments to management command
 2019-09-18 16:32:56 +05:00
Adeel Khan
98c6c1af49 Adds config models to pass arguments to management command 
This would enable simulate_publish management command to
fetch its arguments from config model.

PROD-548
 2019-09-18 11:42:02 +05:00
Ned Batchelder
f7cd63f784 Convert bookmarks and certificates API docs to yasg format 2019-09-17 16:54:27 -04:00
Ned Batchelder
28d2788ade OpenAPI schema generation helpers with drf-yasg 2019-09-17 16:53:48 -04:00
aarif
13f9609386 python 3 fixes 2019-09-17 19:13:16 +05:00