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

8665 Commits

Author SHA1 Message Date
Ayub
667b7cf2ca Merge pull request #21459 from edx/BOM-357 
BOM-357
 2019-09-04 11:22:22 +05:00
Ayub
3a5e58e6a8 Merge pull request #21535 from edx/BOM-361 
BOM-361
 2019-09-04 11:08:52 +05:00
Brian Mesick
75e38fc4fd DEPR-18 Remove deprecated Notes LMS djangoapp (#21008) 2019-09-03 16:49:58 -04:00
Feanil Patel
3205cdab5f Merge pull request #21536 from edx/feanil/get_runserver_working 
Fix errors when running runserver in python 3.
 2019-09-03 11:06:25 -04:00
Feanil Patel
ca9cfb128c Fix errors when running runserver in python 3. 
- The fields need to be unicode not bytes.  In python 2 it was auto
converting.
- The static url base has been allowed to be a unicode string for a
while.
 2019-09-03 09:10:58 -04:00
Ayub
ce27fb5c33 Merge pull request #21486 from edx/BOM-371 
BOM-371
 2019-09-03 16:50:13 +05:00
Ayub khan
506736b03e BOM-361 
py3 unittest fix
 2019-09-03 16:44:49 +05:00
Ayub khan
6b884c98b6 BOM-370 
py3 unittest fix
 2019-09-03 16:06:48 +05:00
Ayub khan
da9c71557b -Remove unicode and use six.text_type 2019-09-02 16:14:02 +05:00
Braden MacDonald
d3f6ed09d8 Learning Contexts, New XBlock Runtime, Blockstore API Client + Content Libraries 
https://github.com/edx/edx-platform/pull/20645

This introduces:
* A new XBlock runtime that can read and write XBlocks that are persisted using
  Blockstore instead of Modulestore. The new runtime is currently isolated so
  that it can be tested without risk to the current courseware/runtime.
* Content Libraries v2, which store XBlocks in Blockstore not modulestore
* An API Client for Blockstore
* "Learning Context" plugin API. A learning context is a more abstract concept
  than a course; it's a collection of XBlocks that serves some learning purpose.
 2019-08-30 10:31:15 -07:00
arbisoft
bcf1e781e2 BOM-349 
Fixing python3
 2019-08-29 23:26:41 +05:00
Ayub khan
588243f959 BOM-371 
py3 test fix
 2019-08-28 16:32:39 +05:00
Ayub khan
136bdf8c0f BOM-357 
Fix failing test
 2019-08-27 15:50:05 +05:00
Ayub
733d7cdc33 Merge pull request #21410 from edx/py3-fix-too-few-arguments-bug 
BOM-400, BOM-395, BOM-394, BOM-390, BOM-381, BOM-369, BOM-306, BOM-303
 2019-08-27 14:22:27 +05:00
Awais Qureshi
eddcf50260 Merge pull request #21432 from edx/awais786/BOM-356 
BOM-356
 2019-08-27 14:08:00 +05:00
Christie Rice
a513d477ac ENT-2252 Remove journals urls (#21451) 2019-08-26 12:13:51 -04:00
Ayub khan
f5d97260a5 Fixed all py3 tests with AssertionError: "Error: too few arguments" 2019-08-26 14:19:57 +05:00
Awais Qureshi
5dc63a9aab Merge pull request #21405 from edx/awais786/BOM-399 
BOM-399
 2019-08-26 11:03:07 +05:00
Awais Qureshi
a24d70c3b3 Merge pull request #21415 from edx/awais786/BOM-352 
BOM-352
 2019-08-26 11:02:38 +05:00
arbisoft
bf6cbe7f6b BOM-356 
None type comparison with int was not working in python3.
There was an issue with previous condition also. with Nonetype it was not coming into error part.
 2019-08-24 02:47:24 +05:00
arbisoft
4b432c4b48 BOM-354 
Fix Unicode-objects must be encoded before hashing.
 2019-08-23 12:04:51 +05:00
arbisoft
916e3e61e5 BOM-352 
using six.text_type for representing (Unicode) textual data.
This is unicode() in Python 2 and str in Python 3.
 2019-08-23 11:54:32 +05:00
Awais Qureshi
766d9fb649 Merge pull request #21408 from edx/awais786/BOM-388 
BOM-388
 2019-08-22 20:42:03 +05:00
Awais Qureshi
b42c3d565b Merge pull request #21406 from edx/awais786/BOM-396 
BOM-396
 2019-08-22 20:36:31 +05:00
arbisoft
84cfb8d1ec BOM-392 
Fixing encode/decode issues for python3.
 2019-08-22 16:45:25 +05:00
arbisoft
04536e5c5f BOM-388 
Fixing list len issue.
 2019-08-22 16:22:58 +05:00
arbisoft
e140d4aa93 BOM-396 
Fixing encode/decode issues for python3.
 2019-08-22 15:43:23 +05:00
arbisoft
933a55d92e BOM-399 
Fixing encode/decode issues for python3.
 2019-08-22 15:35:01 +05:00
noraiz-anwar
1c4f9da92d improved quality of multiple files 2019-08-22 12:47:08 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm 
Bom/python 3 swarm
 2019-08-21 09:27:59 -04:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Feanil Patel
3c33f6c30f Fix another quality issue. 2019-08-21 07:44:06 -04:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
3bb7d0f61a unicode -> text_type 2019-08-19 16:42:20 -04:00
Dave St.Germain
7a28bc8759 Response content is bytes 2019-08-19 16:39:09 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
David Ormsbee
95a4e9ba3c Fix BlockTransformer Py3 issues (#21376) 
Django's reverse can handle Unicode for arguments.
 2019-08-19 12:16:39 -04:00
Feanil Patel
68933ec089 Fix quality issues. 2019-08-19 11:51:30 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Feanil Patel
9925aaadb9 Be able to override this setting from yaml. 2019-08-16 15:09:13 -04:00
Ayub
658cd5c62e BOM-70 (#21327) 
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
 2019-08-16 13:05:35 -04:00
Diana Huang
5d7d3f7770 Merge pull request #21336 from edx/diana/remove-microsites 
Remove microsite djangoapp and configuration.
 2019-08-16 10:55:56 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
Feanil Patel
602970ed90 Fix test collection for CMS in python 3. (#21338) 2019-08-13 13:54:49 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85 
BOM-85
 2019-08-12 10:01:07 -04:00
arbisoft
9b87cb0172 BOM-85 
he builtin basestring abstract type was removed. Use str instead.
 2019-08-09 22:08:57 +05:00
Ayub
45ab1fec53 Merge pull request #21316 from edx/BOM-70-1 
BOM-70
 2019-08-09 20:19:18 +05:00