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

19994 Commits

Author SHA1 Message Date
arbisoft
1f78305f99  This is a combination of 2 commits. 
 This is the 1st commit message:

BOM-149
python3 tests failures.

 This is the commit message #2:

BOM-149
python3 tests failures.
 2019-09-05 12:49:06 +05:00
Aarif
e0500adc90 Merge pull request #21539 from edx/BOM-125 
BOM-125
 2019-09-05 12:06:35 +05:00
Ayub
2f606b1a50 Merge pull request #21549 from edx/BOM-121 
BOM-121
 2019-09-05 09:51:22 +05:00
Ayub
b5dbdde347 Merge pull request #21547 from edx/BOM-227 
BOM-227
 2019-09-05 09:47:45 +05:00
Ayub
aff9aca950 Merge pull request #21461 from edx/BOM-294 
BOM-294
 2019-09-05 09:44:35 +05:00
Kyle McCormick
ea5652010c Create Python API for program_enrollments: Part I (#21511) 
This is the first in a series of commits to create
a Python API for the LMS program_enrollments app.
We do some general refactoring, renaming, and clean-up
in order to move toward the creation of that API.

EDUCATOR-4321
 2019-09-04 14:06:00 -04:00
Michael Terry
b229e9749b Merge pull request #21516 from edx/mikix/enable-publisher 
Use new ENABLE_PUBLISHER feature flag
 2019-09-04 13:28:59 -04:00
Michael Terry
8bbc717637 Use new ENABLE_PUBLISHER feature flag 
ENABLE_MKTG_SITE has been serving double duty to both indicate that
an Open edX installation is using a Drupal marketing site AND
is using the Publisher workflow tool for managing course metadata.

But now that publisher-frontend is available and the Publisher
feature is no longer tied to the marketing site, we want to tease
apart those two concerns. Hence ENABLE_PUBLISHER.

Only really used so far in Studio, to control which fields are
shown (if using Publisher, some fields are only editable in
Publisher).
 2019-09-04 12:18:03 -04:00
Awais Qureshi
e7712e0c9b BOM-169 
python3 tests failures.
 2019-09-04 18:17:30 +05:00
Awais Qureshi
52c5a2d547 Merge pull request #21469 from edx/awais786/BOM-240 
BOM-240
 2019-09-04 15:47:47 +05:00
Ayub khan
a372d44b09 BOM-121 
python3 compatibility
 2019-09-04 15:35:15 +05:00
Ayub khan
09beb2c72e BOM-227 
python3 compatibility
 2019-09-04 14:36:06 +05:00
Ayub
2c1fc22af9 Merge pull request #21484 from edx/BOM-264 
BOM-264
 2019-09-04 12:48:13 +05:00
arbisoft
3fb5db43ea BOM-240 
Fixing python3. Hashvalues were saving with b prefix in db. Decoded them before insertion.
 2019-09-04 12:13:02 +05:00
Ayub
8a5d25f9fd Merge pull request #21476 from edx/BOM-104 
BOM-104
 2019-09-04 12:05:00 +05:00
Awais Qureshi
659cdbddb0 Merge pull request #21542 from edx/awais786/BOM-302 
BOM-302
 2019-09-04 11:38:28 +05:00
Ayub khan
9b46bd02fc BOM-104 
Fixed failing unittest
 2019-09-04 11:20:43 +05:00
Ayub
0b29872808 Merge pull request #21479 from edx/BOM-289 
BOM-289
 2019-09-04 11:11:19 +05:00
Ayub
eb133f61ac Merge pull request #21480 from edx/BOM-335 
BOM-335
 2019-09-04 11:09:56 +05:00
Brian Mesick
75e38fc4fd DEPR-18 Remove deprecated Notes LMS djangoapp (#21008) 2019-09-03 16:49:58 -04:00
Zachary Hancock
1a03816ddc ignore enrollment checks for masters (#21517) 2019-09-03 16:45:02 -04:00
Awais Qureshi
8b0bb0a707 BOM-302 
TypeError: unorderable types: int() <= MagicMock()
 2019-09-03 23:17:11 +05:00
aarif
929d73bd88 python 3 fixes 2019-09-03 20:33:22 +05: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
8aa214ddd3 Merge pull request #21527 from amitvadhel/BOM-275 
BOM-275
 2019-09-03 10:35:48 -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
Aarif
ee2fd56d8d Merge pull request #21503 from edx/BOM-269 
BOM-269 Python 3 fixes
 2019-09-03 13:56:02 +05:00
amitvadhel
19dd19d0e9 BOM-275: Test case fixes for Python 3.5 2019-09-02 23:29:56 +03:00
Ayub khan
da9c71557b -Remove unicode and use six.text_type 2019-09-02 16:14:02 +05:00
Aarif
43a36709ec Merge pull request #21500 from edx/BOM-327 
BOM-327 Python 3 fixes
 2019-09-02 14:33:49 +05:00
Aarif
a14064eb42 Merge pull request #21490 from edx/BOM-262 
BOM-262 Python 3 fixes
 2019-09-02 14:26:55 +05:00
Ayub
48b5dd781e Merge pull request #21512 from edx/BOM-96-2 
BOM-96
 2019-09-02 14:26:20 +05:00
Awais Qureshi
01a33b98ac Merge pull request #21505 from edx/awais786/BOM-115 
BOM-115
 2019-09-02 14:08:14 +05:00
arbisoft
19ea7c3875 BOM-115 
Fixing python3
 2019-09-02 13:37:16 +05:00
Ayub khan
8e71206312 BOM-96 
-fixes all issues
 2019-09-02 13:30:33 +05:00
David Ormsbee
8dc4fd1a2d Merge pull request #20645 from open-craft/new-runtime 
Foundation for Learning Contexts and Blockstore XBlock Runtime
 2019-08-30 15:23:41 -04:00
Joseph Mulloy
7e908a8fc2 Merge pull request #21493 from edx/jdmulloy/fake_csm_id_migration 
Add CSM primary key to bigint migration
 2019-08-30 15:13:01 -04: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
Awais Qureshi
7676858282 Merge pull request #21462 from edx/awais786/BOM-114 
Bom-114
 2019-08-30 17:50:22 +05:00
Albert (AJ) St. Aubin
e0e77d02d4 Merge pull request #21495 from edx/aj/ENT-2191 
Aj/ent 2191
 2019-08-30 08:32:07 -04:00
Uzair Rasheed
61ebdaf2cd Merge pull request #21478 from edx/PROD-611/edx-logo-not-loading-on-cert 
edX logo is not loading on invalid cert view
 2019-08-30 16:49:19 +05:00
aarif
38543006a3 python 3 fixes 
Added django's inbuilt support for object's string representation
 2019-08-30 14:32:49 +05:00
arbisoft
5a2114ac6c BOM-114 
python2 tests failures.
 2019-08-30 14:02:24 +05:00
aarif
ed8b9ea496 python 3 fixes 
changes made as suggested
 2019-08-30 14:02:04 +05:00
aarif
41a23a87e5 python 3 fixes 
changes made as suggested
 2019-08-30 13:57:35 +05:00
Aarif
36066458a4 Merge pull request #21482 from edx/BOM-274 
BOM-274 Python 3 fixes
 2019-08-30 11:28:48 +05:00
Aarif
efb5d1ad7f Merge pull request #21483 from edx/BOM-278 
BOM-278 Python 3 fixes
 2019-08-30 11:16:12 +05:00
Aarif
4cb616037e Merge pull request #21464 from edx/BOM-158 
BOM-158 Python 3 fixes
 2019-08-30 11:05:00 +05:00
Aarif
b4025d84a3 Merge pull request #21447 from edx/BOM-307 
BOM-307 - Python 3 fixes
 2019-08-30 11:03:51 +05:00
Awais Qureshi
50dde225d1 Merge pull request #21498 from edx/awais786/BOM-175 
BOM-175
 2019-08-30 09:25:54 +05:00