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

51105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c0a666fcbb Merge pull request #21537 from edx/feanil/update_gitignore 
Ignore generated badge images.
 2019-09-03 11:06:14 -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
27dcc11ac6 Ignore generated badge images. 2019-09-03 09:34:33 -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
09fd8076f5 Merge pull request #21533 from edx/BOM-370 
BOM-370
 2019-09-03 16:47:26 +05:00
Ayub khan
6b884c98b6 BOM-370 
py3 unittest fix
 2019-09-03 16:06:48 +05: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
AmiT
4c01e204bc Merge pull request #3 from edx/master 
Update the repo
 2019-09-02 19:28:07 +05:30
Ayub
dd26f3bc12 Merge pull request #21477 from edx/make-unicode-fixes 
Remove unicode and use six.text_type
 2019-09-02 16:52:07 +05:00
Ayub khan
da9c71557b -Remove unicode and use six.text_type 2019-09-02 16:14:02 +05:00
Aarif
85f622f0e1 Merge pull request #21515 from edx/BOM-362 
BOM-362 Python 3 fixes
 2019-09-02 14:34:46 +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
bb83ab683b Merge pull request #21491 from edx/BOM-290 
BOM-290 Python 3 fixes
 2019-09-02 14:28:46 +05:00
edX Transifex Bot
774cfc109c fix(i18n): update translations 2019-09-02 05:27:48 -04: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
Aarif
40f4ab2b90 Merge pull request #21487 from edx/BOM-161 
BOM-161 Python 3 fixes
 2019-09-02 12:34:05 +05:00
edX cache uploader bot
37c599cbdc Updating Bokchoy testing database cache (#21519) 2019-08-30 16:29:46 -04: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
Brittney Exline
dfe8634632 Merge pull request #21510 from edx/bexline/upgrade_enterprise 
Upgrading edx-enterprise to the latest version (1.9.9)
 2019-08-30 10:50:39 -06:00
Calen Pennington
37c92fe8d4 Merge pull request #21354 from cpennington/specific-wtw-context-for-s3-files 
Set a specific WTW context to name coverage files to upload/download …
 2019-08-30 12:22:37 -04:00
Brittney Exline
7f727b4d65 Upgrading edx-enterprise to the latest version (1.9.9) 2019-08-30 08:57:17 -06:00
aarif
e60f767fc4 python 3 fixes 
minor fix
 2019-08-30 18:01:16 +05: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
Awais Qureshi
f1f6d2b257 Merge pull request #21506 from edx/awais786/BOM-349 
BOM-349
 2019-08-30 14:38:45 +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
0f4bc5a245 python 3 fixes 
changes made as suggested
 2019-08-30 13:53:31 +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
924a1d2171 Merge pull request #21499 from edx/BOM-379 
BOM-379 Python 3 fixes
 2019-08-30 11:18:27 +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
arbisoft
bcf1e781e2 BOM-349 
Fixing python3
 2019-08-29 23:26:41 +05:00