Commit Graph

51366 Commits

Author SHA1 Message Date
Feanil Patel
f43fd893f2 Merge pull request #21688 from edx/feanil/unpin-pip-tools
Feanil/unpin pip tools
2019-09-18 08:23:28 -04: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
Aarif
02570e9b29 Merge pull request #21686 from edx/BOM-486
BOM-486
2019-09-18 16:12:33 +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
Michael Terry
d16bf75777 Merge pull request #21689 from edx/mikix/show-upgrade-deadline
Show Upgrade Deadline in Studio
2019-09-17 15:31:51 -04:00
Michael Terry
578a910260 Show Upgrade Deadline in Studio
This shows the verified upgrade deadline for the course, as a
read-only field.

DISCO-1345
2019-09-17 14:58:19 -04:00
Awais Qureshi
8997ba5fbb Merge pull request #21685 from edx/awais786/BOM-422
BOM-422
2019-09-17 22:58:34 +05:00
Awais Qureshi
269180d256 Merge pull request #21679 from edx/awais786/PROD-692
Awais786/prod 692
2019-09-17 22:57:04 +05:00
Ayub
78a22371c5 Merge pull request #21668 from edx/BOM-438
BOM-438
2019-09-17 22:42:22 +05:00
David Ormsbee
993e9630b4 Merge pull request #21677 from open-craft/samuel/fix-migration-crash
SE-1553 conditionally run migration on CSMH Extended table
2019-09-17 13:19:40 -04:00
Stu Young
13bbf85257 clean up toggle annotations (#21673)
clean up toggle annotations and lint when running feature toggle report
2019-09-17 11:11:20 -04:00
Feanil Patel
94cf0d3db8 Run make upgrade 2019-09-17 10:44:36 -04:00
Feanil Patel
dc99d61b9c pip-tools 4.x seems to have made this less of a problem.
Issue 851 seems to have been resolved and issue 8.5.2 while still open is
not occuring with the latest version of pip-tools.
2019-09-17 10:27:16 -04:00
Feanil Patel
b8f60c5752 Merge pull request #21676 from edx/ormsbee/upgrade_post_opqk
Update edx-platform dependencies.
2019-09-17 10:25:58 -04:00
aarif
13f9609386 python 3 fixes 2019-09-17 19:13:16 +05:00
edX Transifex Bot
832ed2748b fix(i18n): update translations 2019-09-17 10:04:28 -04:00
Awais Qureshi
a4428d751d BOM-422
Fixing python3
2019-09-17 19:00:05 +05:00
edX cache uploader bot
4bdf59a0d1 Updating Bokchoy testing database cache (#21675) 2019-09-17 08:05:16 -04:00
Awais Qureshi
40d9a683e5 PROD-692
Fixing python3
2019-09-17 17:03:56 +05:00
Ayub
11a9a4b953 Merge pull request #21665 from edx/BOM-448
BOM-448
2019-09-17 16:22:52 +05:00
Ayub khan
d34eba0e9c BOM-438
Python3 compatibility.
2019-09-17 16:08:32 +05:00
Aarif
9370492005 Merge pull request #21652 from edx/BOM-474
BOM-474
2019-09-17 14:47:21 +05:00
Aarif
c4796b1269 Merge pull request #21661 from edx/BOM-481
BOM-481
2019-09-17 13:47:24 +05:00
Aarif
12eaf050dc Merge pull request #21658 from edx/BOM-480
BOM-480
2019-09-17 13:46:41 +05:00
Aarif
ba3a7e733d Merge pull request #21651 from edx/BOM-473
BOM-473
2019-09-17 13:45:07 +05:00
Aarif
0225162c67 Merge pull request #21654 from edx/BOM-476
BOM-476
2019-09-17 12:37:22 +05:00
Ayub
eefa0092d0 Merge pull request #21669 from edx/BOM-450
BOM-450
2019-09-17 10:12:05 +05:00
Samuel Walladge
eeedc39b3e conditionally run migration on CSMH Extended table
CSMH_EXTENDED is optional, so this table is not guaranteed to exist.
2019-09-17 11:00:17 +09:30
Hassan
f96c71143e Merge pull request #21639 from edx/hassan/initial-history
Added management command to populate initial history.
2019-09-17 03:54:19 +05:00
David Ormsbee
e34bb6ea2e Update edx-platform dependencies. 2019-09-16 18:32:44 -04:00
Douglas Hall
bd4db303d6 Upgrading various packages. (#21674) 2019-09-16 18:27:24 -04:00
Hassan Javeed
092da8c5f4 Management command to insert initial historical records. 2019-09-17 03:13:07 +05:00
Feanil Patel
9c0bd39e67 Merge pull request #21671 from edx/feanil/more_bokchoy_fixes
Feanil/more bokchoy fixes
2019-09-16 17:01:09 -04:00
aarif
18ac219171 python 3 fixes
made changes as requested

minor fixes

quality fixes
2019-09-16 22:09:49 +05:00
Feanil Patel
fb59752c75 Need to return a unicode string in the xml factory.
The underlying data is put into json documents that expect unicode
strings not byte strings.  In python2 lxml provided strings that were
auto coerced but in python3 it provides byte strings.
2019-09-16 11:30:05 -04:00
Feanil Patel
a3d39eaeb6 JSON takes unicode as input.
In python2 there would be some auto coercion done so that the orginal
code here works but that's not the case in python 3.
2019-09-16 11:30:05 -04:00
Feanil Patel
f8129721d9 Fix failure during cms startup. 2019-09-16 11:30:05 -04:00
aarif
76706553bf python 3 fixes
test fixes
2019-09-16 17:19:18 +05:00
Ayub khan
89b48d3723 BOM-450
python3 compatibility
2019-09-16 17:06:39 +05:00
aarif
e791325f6c quality fixes 2019-09-16 17:02:33 +05:00
aarif
38ad965c2e test fixes 2019-09-16 16:36:12 +05:00
aarif
602b6d4607 minor fixes 2019-09-16 15:59:02 +05:00
Ned Batchelder
a4f03620a4 Merge pull request #21645 from edx/nedbat/no-pipes-on-logout
Remove extraneous pipes
2019-09-16 06:41:27 -04:00
Aarif
04758b47b3 Merge pull request #21558 from edx/BOM-366
BOM-366
2019-09-16 13:52:02 +05:00
aarif
cde8a2a62a python 3 fixes
changes made as suggested

minor change

changes made as suggested

test fixes for python 2

removed debug statement

quality fixes

quality fix

quality fix
2019-09-16 13:13:45 +05:00
Aarif
7012bcea94 Merge pull request #21653 from edx/BOM-475
BOM-475
2019-09-16 12:55:12 +05:00
Ayub
7b186b2f52 Merge pull request #21656 from edx/BOM-420
BOM-420
2019-09-16 12:26:46 +05:00
Ayub khan
f70bc1a03c BOM-448
python3 compatibility, tests fixes
2019-09-16 12:19:26 +05:00
Awais Qureshi
851702e09e Merge pull request #21660 from edx/awais786/BOM-479
BOM-479
2019-09-16 11:18:48 +05:00
Ayub
71a593f68c Merge pull request #21641 from edx/BOM-435
BOM-435
2019-09-16 09:58:50 +05:00