Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,520 Commits 1 Branch 0 Tags
0c2dfd136eafaae88a71df4eecdcacc3845fca45
Commit Graph

53520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brittney Exline
d3f0b3dc7b Merge pull request #21132 from edx/bexline/fix_dependencies 
Fixing dependency issues so that make upgrade can run
 2019-07-16 08:37:18 -06:00
muhammad-ammar
cee2359141 pin edx-search==1.2.2 2019-07-16 19:06:19 +05:00
Mahyar Damavand
3d23ee436b Support a URL address as FOOTER_ORGANIZATION_LOGO 2019-07-16 18:04:01 +04:30
muhammad-ammar
67e69b9030 use edx-enterprise pkg instead of branch and then do make upgrade 2019-07-16 17:34:21 +05:00
Brittney Exline
2b8cb8cf9b Fixing dependency issues so that make upgrade can run 2019-07-16 17:34:20 +05:00
aarif
e39485d94d ran python-modernize and isort on files mentioned in INCR-343 
changes made to comply with quality
 2019-07-16 11:54:40 +00:00
Ayub khan
0069d7db33 INCR-419 python3 compatibility 2019-07-16 16:11:02 +05:00
Ayub khan
d5e9c130cd INCR-419 python3 compatibility 2019-07-16 16:08:49 +05:00
Ayub khan
ea8a197eb4 INCR-427 python3 compatibility 2019-07-16 16:02:21 +05:00
Ayub khan
af2e7705b1 INCR-434 python3 compatibility 2019-07-16 15:54:54 +05:00
Ayub khan
954ad2f75e INCR-430 python3 compatibility 2019-07-16 15:38:50 +05:00
Ayub khan
12cb1e93d1 INCR-438 python3 compatibility 2019-07-16 15:17:25 +05:00
aarif
fd3a83236a ran python-modernize and isort on files mentioned in INCR-446 
changes made to comply with quality

changes made to comply with quality

changes made to comply with quality
 2019-07-16 15:14:12 +05:00
aarif
642e3b8bfc ran python-modernize and isort on files mentioned in INCR-422 
changes made to comply with quality
 2019-07-16 10:09:08 +00:00
aarif
46fe6fdcea ran python-modernize and isort on files mentioned in INCR-415 
changes made to comply with quality

changes made to comply with quality

changes made to comply with quality
 2019-07-16 10:06:16 +00:00
aarif
cdfee4348f ran python-modernize and isort on files mentioned in INCR-367 
changes made to comply with pylint
 2019-07-16 09:58:17 +00:00
aarif
5f5b2ddc12 parent c89ecb384f 
author aarif <mraarif@outlook.com> 1562661182 +0500
committer root <root@lms.devstack.edx> 1563270070 +0000

ran python-modernize and isort on files mentioned in INCR-327

changes made to comply with pylint

changes made to comply with pylint and pass failing test

changes made to comply with pylint
 2019-07-16 09:46:20 +00:00
arbisoft
91aac28ca7 Fixing python-modernize issues. 2019-07-16 13:16:03 +05:00
Awais Qureshi
c89ecb384f Merge pull request #21026 from edx/awais786/INCR-368 
INCR-368
 2019-07-16 12:57:22 +05:00
Ayub
31ab0bed32 Merge pull request #21016 from edx/INCR-349 
INCR-349 python3 compatibility
 2019-07-16 12:36:54 +05:00
arbisoft
6c39ec43be Fixing python-modernize issues. 2019-07-16 12:34:28 +05:00
Awais Qureshi
66b7fdae0d Merge pull request #21024 from edx/awais786/INCR-363 
INCR-363
 2019-07-16 12:01:00 +05:00
Awais Qureshi
46b089c12c Merge pull request #21021 from edx/awais786/INCR-357 
INCR-357
 2019-07-16 11:48:01 +05:00
Ayub
f7d0b54940 Merge pull request #21012 from edx/INCR-345 
INCR-345 python3 compatibility
 2019-07-16 11:40:33 +05:00
Ayub
cc07c7c97f Merge pull request #20991 from edx/INCR-336 
INCR-336 python3 compatibility
 2019-07-16 11:39:10 +05:00
Jillian Vogel
d3ce0b759e SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) (#21094) 
Inlines all 36 discussion underscore templates

imported by lms/templates/discussion/_underscore_templates.html
to reduce file system load when displaying inline discussion blocks.

Ignored error where fix required changing the translated text string,
due to differences between underscore and HtmlUtils format strings.
 2019-07-15 20:51:42 -04:00
Michael Roytman
ed602ab7ca Merge pull request #21129 from edx/mroytman/edx-proctoring-2.0.6 
update edx-proctoring package version to 2.0.6
 2019-07-15 15:18:12 -04:00
Amit
e96a789baf INCR-450: Make compatible with Python 3.x (#21097) 2019-07-15 11:57:37 -04:00
Michael Roytman
86eb5069e0 update edx-proctoring package version to 2.0.6 2019-07-15 10:42:39 -04:00
Muhammad Zaid Bamber
fa693d1aa0 Merge pull request #21090 from edx/zaid-prod-449 
Added logs for XQueue Information
 2019-07-15 18:12:10 +05:00
Ayub
ac0f7f8e20 Merge pull request #21127 from edx/revert-21014-INCR-343 
Revert "INCR-343 Python 3 compatibility"
 2019-07-15 17:04:20 +05:00
Ayub
1a9648a07e Revert "ran python-modernize and isort on files mentioned in INCR-343 (#21014)" 
This reverts commit 87e58c86cc.
 2019-07-15 16:44:13 +05:00
Awais Qureshi
bc542728b7 Merge pull request #21010 from edx/awais786/INCR-346 
INCR-346
 2019-07-15 15:54:48 +05:00
zaidbamber161
d4c41008b4 Updated logs information 2019-07-15 15:50:37 +05:00
zaidbamber161
f02b34c1a1 Updated logs information 2019-07-15 15:50:37 +05:00
zaidbamber161
f86d0c8e16 Fixed quality test 2019-07-15 15:50:37 +05:00
zaidbamber161
bc7e2a900c Added logs for XQueue 2019-07-15 15:50:37 +05:00
Aarif
cc831f8fbd ran python-modernize and isort on files mentioned in INCR-348 (#21017) 2019-07-15 15:16:52 +05:00
Aarif
87e58c86cc ran python-modernize and isort on files mentioned in INCR-343 (#21014) 2019-07-15 14:39:27 +05:00
Aarif
8bdd2b29d2 INCR-337 Python 3 compatibility (#20993) 
* ran python-modernize and isort on files specified in INCR-337

* changes made to comply with pylint
 2019-07-15 14:12:52 +05:00
Uzair Rasheed
d9e8713077 Merge pull request #21103 from edx/INCR-453/python-modernize-350-of-380 
Python-modernize on edx-platform (350 of 380)
 2019-07-15 13:39:04 +05:00
Uzair Rasheed
b48dae74ca Merge pull request #21101 from edx/INCR-441/python-modernize-338-of-380 
Python-modernize on edx-platform (338 of 380)
 2019-07-15 13:38:43 +05:00
Ayub khan
07f907ec56 INCR-388 python3 compatibility 2019-07-15 13:15:11 +05:00
Ayub
56170466f1 Merge pull request #20988 from edx/INCR-335 
INCR-335 python3 compatibility
 2019-07-15 12:29:55 +05:00
Ayub
30aaeb7d4e Merge pull request #20986 from edx/INCR-334 
INCR-334 python3 compatibility
 2019-07-15 12:29:15 +05:00
Ayub
1709ec0d87 Merge pull request #20984 from edx/INCR-333 
INCR-333 python3 compatibility
 2019-07-15 12:26:29 +05:00
Awais Qureshi
9d29856976 Merge pull request #21000 from edx/awais786/INCR-342 
INCR-342
 2019-07-15 12:22:46 +05:00
Awais Qureshi
ea317028fe Merge pull request #20999 from edx/awais786/INCR-341 
INCR-341
 2019-07-15 12:05:31 +05:00
edX Transifex Bot
3fcc55e414 fix(i18n): update translations 2019-07-14 17:17:24 -04:00
edX Transifex Bot
155a32c797 fix(i18n): update translations 2019-07-12 18:35:43 -04:00