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

9424 Commits

Author SHA1 Message Date
noraiz-anwar
67af4b8eb1 fix course import issue 2019-09-26 18:00:21 +05:00
aarif
f39e6c5914 minor fixes 2019-09-26 16:18:31 +05:00
aarif
7eef705bbe python 3 fixes 
minor fixes
 2019-09-26 15:42:07 +05:00
Aarif
53e6f7ce8d Merge pull request #21757 from edx/BOM-531 
BOM-531
 2019-09-26 12:34:40 +05:00
Ayub
846a12939e Merge pull request #21735 from edx/BOM-update_str_method 
BOM Project __unicode__ to __str__
 2019-09-26 10:47:14 +05:00
Samuel Walladge
518060fc51 Include djangoapps.heartbeat by default 
If this isn't installed, the sample_task provided by
openedx.core.djangoapps.heartbeat isn't imported, and thus are never
registered with the celery workers.  This sample_task is used for the
extended heartbeat api call. Since the celery heartbeat check is turned
on by default, we should also make sure this djangoapp and thus
sample_task is registered by default. Otherwise the extended heartbeat
check fails with the default configuration.
 2019-09-26 11:13:43 +09:30
Cory Lee
0befab339b Always run CSMH migrations in all contexts (#21776) 
* Always run CSMHE migrations for every application in all contexts
 2019-09-25 13:27:26 -04:00
aarif
00f42fbd9a python 3 fixes 
python 3 fixes

python 3 fixes

python 3 fixes

minor changes
 2019-09-25 18:47:37 +05:00
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05:00
uzairr
930bf84188 DjangoTranslation object doesn't have ugettext attribute 
Some of the tests are failing because DjangoTranslation object is
behaving differently with py2 and py3.With py2, it has 'ugettext'
attribute but with py3 it doesn't have.To make it compliant with
both versions modifications in the tests have been added so that
build will not fail.

PROD-664
 2019-09-25 13:31:39 +05:00
aarif
07b5c954b0 python 3 fixes 
test fixes

python 3 fixes

minor fixes

python 3 fixes

quality fixes

quality fixes
 2019-09-24 12:01:02 +05:00
noraiz-anwar
a596579e62 patch jquery's extend 2019-09-24 10:53:10 +05:00
Ayub
1ac77d8a85 Merge pull request #21691 from edx/BOM-376 
BOM-376
 2019-09-20 18:34:11 +05:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2 
Python3 swarm 2
 2019-09-20 08:48:19 -04:00
Ayub khan
6f1d379a0f BOM-376 
python3 compatibility fixes all tests
 2019-09-20 16:01:06 +05:00
Nicholas D'Alfonso
039b7aed29 DISCO-1342 hide fields 
hide course card image, course about page image, and course
display name when publisher flag is turned on
 2019-09-19 11:56:00 -04:00
Jeremy Bowman
fc57bf9763 Use bytes with GridFS when not specifying an encoding - BOM-157 2019-09-19 11:17:01 -04:00
Feanil Patel
dab38a5ef3 Merge pull request #21701 from edx/python3-swarm 
Python3 swarm
 2019-09-19 10:23:04 -04:00
Michael Terry
3dcc2bdcfe Merge pull request #21700 from edx/mikix/delay-msg 
Add Studio note about mktg site delay
 2019-09-19 09:47:52 -04:00
Michael Terry
1f024c406b Add Studio note about mktg site delay 
Add a note when marketing site is enabled that there is a delay
from changes in Studio appearing on the marketing site.

DISCO-1356
 2019-09-18 16:31:36 -04:00
Feanil Patel
cb64fed1af BOM-489 Studio tests with byte/str mismatch. 2019-09-18 14:21:16 -04:00
Ned Batchelder
d585a8f71d URLs and settings for OpenAPI generation 
API docs are now always available, no more toggle to enable them.
 2019-09-17 16:54:27 -04: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
269180d256 Merge pull request #21679 from edx/awais786/PROD-692 
Awais786/prod 692
 2019-09-17 22:57:04 +05: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
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
Ayub khan
f70bc1a03c BOM-448 
python3 compatibility, tests fixes
 2019-09-16 12:19:26 +05:00
Aarif
072f878b90 Merge pull request #21637 from edx/BOM-446 
BOM-446
 2019-09-13 14:40:36 +05:00
Feanil Patel
dfe77a968e Remove the mongo plugin for the djnago-debug-toolbar. 
We are currently running this plugin from a has directly off of master
to get support for a newer version of DJDT.  However even on master
there is not yet support for python 3.  We're running into this when
running runserver and when collecting static assets.

A quick survey of the development team at edX shows that people are no
longer actively using this debug panel.(14 responders all saying no to
the question "In the last year have you used the mongo portion of the
django-debug-toolbar in edx-platform?")

This makes sense since the module store and courseware related
developement is not very active right now.  Given all this, I'm removing
this toolbar for now and if we need it again we can survey what's
available at that time to choose the best tool.
 2019-09-12 10:18:46 -04:00
aarif
9301ec38f3 python 3 fixes 2019-09-12 17:29:34 +05:00
Ayub
6a221274f0 Merge pull request #21622 from edx/BOM-455 
BOM-455
 2019-09-12 12:33:08 +05:00
Awais Qureshi
d355f83bde Merge pull request #21625 from edx/awais786/BOM-444 
BOM-444
 2019-09-11 18:18:08 +05:00
Awais Qureshi
e4b737cf97 BOM-426 
Fixing python3
 2019-09-11 17:29:46 +05:00
Ayub khan
d7d1f9ddaf BOM-455 
python3 compatibility
 2019-09-11 17:01:25 +05:00
Aarif
c3e866cc28 Merge pull request #21577 from edx/BOM-377 
BOM-377
 2019-09-11 15:18:07 +05:00
Ayub
bcad9519bc Merge pull request #21528 from edx/BOM-398 
BOM-398
 2019-09-11 12:29:24 +05:00
Awais Qureshi
5ba09930f8 Merge pull request #21602 from edx/awais786/PROD-662 
PROD-662
 2019-09-10 14:00:56 +05:00
Awais Qureshi
4fab1b4490 Merge pull request #21601 from edx/awais786/PROD-670 
PROD-670
 2019-09-10 13:59:35 +05:00
Feanil Patel
6fa25509c9 Merge pull request #21592 from edx/feanil/fix_jenkins_tests 
Feanil/fix jenkins tests in python 3
 2019-09-09 13:43:39 -04:00
Feanil Patel
a5b279c702 Merge pull request #21598 from amitvadhel/BOM-447 
BOM-447 | Updates for TypeError in Python 3
 2019-09-09 10:58:41 -04:00
Awais Qureshi
b8b6dc4883 PROD-662 
Photo verification Fixing python3
 2019-09-08 20:35:52 +05:00
Awais Qureshi
2ca2a39973 PROD-661 
Photo verification Fixing python3
 2019-09-08 19:22:11 +05:00
amitvadhel
77ac61212b Updates for TypeError in Python 3 2019-09-08 13:02:55 +03:00
Feanil Patel
f2445cfe36 Turn off hash randomization on the xdist workers as well. 2019-09-06 17:04:17 -04:00
edx-pipeline-bot
38cc1f0ab7 Merge pull request #21586 from edx/private_to_public_f98c819 
Mergeback PR from private to public.
 2019-09-06 12:32:38 +05:00
Awais Jibran
f98c819f74 Merge pull request #160 from edx/aj/add-noopener-to-new-window-urls 
Update hyperlinks in platfrom
 2019-09-06 11:43:38 +05:00
aarif
e7a9e4cf1f python 3 fixes 2019-09-05 17:19:41 +05:00
Ayub khan
52f9544b6a BOM-368 
python3 compatibility
 2019-09-05 12:40:39 +05:00