Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
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
Joseph Mulloy
f9e9b72d97 Add CSM primary key to bigint migration 2019-08-29 17:17:16 -04:00
Brandon Baker
5012ed6ea4 Fix padding on discount banner for small screens (#21509) 
REV-918
 2019-08-29 16:00:26 -04:00
Albert (AJ) St. Aubin
920f0dcf45 Upgrading the edx-enterprise version in support of new 
feature roles and permissions
 2019-08-29 14:50:17 -04:00
Aarif
f365bd888d Merge pull request #21481 from edx/BOM-259 
BOM-259 Python 3 fixes
 2019-08-29 17:42:52 +05:00
Aarif
4b0f528ca4 Merge pull request #21467 from edx/BOM-191 
BOM-191 Python 3 fixes
 2019-08-29 17:06:39 +05:00
arbisoft
641ba0215a BOM-296 
Fixing python3
 2019-08-29 16:58:25 +05:00
aarif
30c61ba907 fixed range function float input failure 
changes made as suggested
 2019-08-29 14:45:45 +05:00
Jansen Kantor
9e97e5107e Jkantor/overview active (#21494) 
* filter for active course enrollments
 2019-08-28 13:16:09 -04:00
Kyle McCormick
a8e4461ef7 Return absolute URIs from program_enrollments API responses (#21474) 
Issues were caused in Learner Portal from inconsistency
in whether URLs returned by API calls were absolute
or relative. This commit standardizes them to all be
absolute.
 2019-08-28 12:57:46 -04:00
Zachary Hancock
b9a2646e4d log all social auth creation failures (#21470) 
logging on social auth creation failures
 2019-08-28 11:39:24 -04:00
Awais Jibran
1a4eb7d2e8 Pervent reverse tabnabbing in edx platform 2019-08-28 16:08:34 +05:00
Ayub khan
eef343d212 BOM-264 
py3 unit test fix
 2019-08-28 15:49:58 +05:00
aarif
ee264b38e9 python 3 fixes 2019-08-28 15:44:35 +05:00
aarif
fb256b53b0 python 3 fixes 2019-08-28 15:38:10 +05:00
aarif
b4f1da25ee python 3 fixes 2019-08-28 15:29:12 +05:00
Ayub khan
f7d528eee4 BOM-289 
py3 unittest fix
 2019-08-28 15:09:48 +05:00
Ayub khan
70b4004be8 BOM-335 
py3 unittest fix
 2019-08-28 15:07:29 +05:00
Ayub
fb2595e783 Merge pull request #21465 from edx/BOM-117 
BOM-117
 2019-08-28 14:43:33 +05:00
uzairr
1f531571ff edX logo is not loading on invalid cert view 
edX logo image is not loading on invalid certificate view because
context is not been updated with the logo image for invalid cert view.
To overcome it, context is updated before rendering invalid cert.

PROD-611
 2019-08-28 14:37:36 +05:00
aarif
4584f4becb fixed tests for python 3 
quality fixes

changes made as suggested
 2019-08-28 13:17:04 +05:00
Awais Qureshi
33e5d01c54 Merge pull request #21466 from edx/awais786/BOM-172 
BOM-172
 2019-08-28 11:06:30 +05:00
Awais Qureshi
a2acc97b96 Merge pull request #21446 from edx/awais786/BOM-291 
BOM-291
 2019-08-28 09:37:22 +05:00
Joseph Mulloy
0c3d0544b5 Merge pull request #21473 from edx/jdmulloy/refactor_csmh_bigint 
Refactor CSME id, CSMH_EXTENDED default true
 2019-08-27 15:15:13 -06:00
Cory Lee
8eddb822ab Refactor CSME id, CSMH_EXTENDED default true 2019-08-27 16:47:47 -04:00
Jansen Kantor
1febfa047c make link_program_enrollments atomic per user (#21439) 
* make link_program_enrollments atomic per user
 2019-08-27 16:26:26 -04:00
Kyle McCormick
708e08930f Fix program course enrollment overview docstring (#21472) 
The program course enrollment overview endpoint says
it has a field 'course_status' with a possible value 'in-progress'.
Update it to say it has a field 'course_run_status with a
possible value 'in_progress'.
 2019-08-27 16:23:06 -04:00