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

50260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Zarecor
ecb5d000a3 Merge pull request #20931 from edx/e0d/fix-circuit-js 
Adding changes from CT to fix circuit simulator on moder chrome.
 2019-07-10 12:28:24 -04:00
Awais Qureshi
421b0c9280 Merge pull request #20992 from edx/awais786/INCR-338 
INCR-338
 2019-07-10 21:11:07 +05:00
David Ormsbee
a480b6ad52 Merge pull request #21049 from edx/revert-20742-jill/inline-discussion-underscore 
Revert "SE-1151 Campus.il Inlines all 36 discussion underscore templates"
 2019-07-10 12:07:48 -04:00
Awais Qureshi
d72b4e3eb8 Merge pull request #21041 from edx/awais786/INCR-373 
INCR-373
 2019-07-10 20:59:42 +05:00
David Ormsbee
930d7f2867 Revert "SE-1151 Campus.il Inlines all 36 discussion underscore templates (#20742)" 
This reverts commit 44562a1592.
 2019-07-10 11:45:28 -04:00
jansenk
8e7b647a4f tests for extra columns 2019-07-10 11:16:25 -04:00
Uzair Rasheed
8c8de6c372 Merge pull request #21047 from edx/INCR-439/python-modernize-336-of-380 
Python-modernize on edx-platform (336 of 380)
 2019-07-10 20:05:32 +05:00
Amit
f31a894900 INCR-457: Make compatible with Python 3.x (#21011) 2019-07-10 10:22:47 -04:00
Amit
adc91f786f INCR-462: Make compatible with Python 3.x and disable: import-error (#20983) 2019-07-10 10:15:17 -04:00
Amit
15dc31ba6d INCR-456: Make compatible with Python 3.x (#21018) 2019-07-10 10:14:43 -04:00
Edward Zarecor
2596b67664 updating to ensureHTML 2019-07-10 10:07:52 -04:00
Uzair Rasheed
a917f109ec Merge pull request #20972 from edx/INCR-463/python-modernize-360-of-380 
Python-modernize on edx-platform (360 of 380)
 2019-07-10 19:03:43 +05:00
Amit
9a1bb49910 INCR-466: Updates on Python 3.x and fix line over length limit (#20915) 2019-07-10 09:52:51 -04:00
uzairr
64fa5041f2 Python-modernize on edx-platform (336 of 380) 
After executing python-modernize and isort, few changes
occurred in import sequence as well as unicode func is
replaced by six.text_type func.

INCR-439
 2019-07-10 18:27:23 +05:00
uzairr
a0629f4f14 Python-modernize on edx-platform (360 of 380) 
After executing python-modernize and isort, few changes
occurred in import sequence as well as unicode func is
replaced by six.text_type func.

INCR-463
 2019-07-10 16:31:20 +05:00
arbisoft
6155f2c81f Fixing python-modernize issues. 2019-07-10 15:41:27 +05:00
adeel khan
c5d5ed9dcd Merge pull request #20647 from edx/adeel/part2_xss_vulnerability 
Fix edx-platform templates
 2019-07-10 14:37:25 +05:00
Adeel Khan
30d8dfb5dd Fix edx-platform templates for xss. 
This is part 2 of a multiple PR to escape
edx-platform templates to prevent xss attack.

PROD-465
 2019-07-10 13:31:02 +05:00
Zainab Amir
92c7a43011 Add system_wide_roles app and roles classes (#20935) 
* New system_wide_roles app added in openedx/core/djangoapps
* Added SystemWideRole and SystemWideRoleAssignment classes to govern
  non-enterprise system wide roles

PROD-424
 2019-07-10 11:33:33 +05:00
edX cache uploader bot
a72198d915 Updating Bokchoy testing database cache (#21006) 2019-07-09 13:03:53 -04:00
Cory Lee
1b4d66fe69 Removing another FK needed for CSM id exhaustion migrations (#20971) 
* Removing FK because it is needed to deal with CSM key exhaution migration
 2019-07-09 12:36:01 -04:00
Feanil Patel
2514b0c8a8 Increase the number of concurrent renovate PRs. (#21001) 2019-07-09 12:02:51 -04:00
Edward Zarecor
9153703212 Adding changes from CT to fix circuit simulator on moder chrome. 2019-07-09 10:04:42 -04:00
Usama Sadiq
30b194c7b6 Merge pull request #20998 from edx/usama/INCR-461 
INCR-461
 2019-07-09 18:34:24 +05:00
usama sadiq
92d3a9672c Python3 Update 
Added Absolute_import for compatibility
 2019-07-09 16:55:11 +05:00
arbisoft
32e89b48bc Fixing python-modernize issues. 2019-07-09 16:25:08 +05:00
Zia Fazal
9d856c4cec Merge pull request #20973 from edx/ziafazal/WL-1946 
Bumped edx-enterprise version
 2019-07-09 12:44:03 +05:00
Aarif
831be7d7e6 Merge pull request #20963 from mraarif/INCR-319 
INCR-319 - python 3 compatibility
 2019-07-09 12:03:24 +05:00
Ayub
7291d8409b Merge pull request #20961 from Ayub-Khan/INCR-320 
INCR-320 python 3 compatibility
 2019-07-09 12:01:43 +05:00
Awais Qureshi
a566c0a05f Merge pull request #20960 from awais786/awais786/INCR-321 
INCR-321 python3 compatibilty
 2019-07-09 11:55:27 +05:00
Zia Fazal
98bfd092ce Bumped edx-enterprise version 2019-07-09 11:47:37 +05:00
Usama Sadiq
88a574b14c Merge pull request #20965 from edx/usama/INCR-468 
INCR-468
 2019-07-09 11:42:41 +05:00
Andytr1
aec8c0057f Merge pull request #20968 from edx/andytr1/grade-override-update-sorting 
updated sorting
 2019-07-08 15:23:00 -04:00
Brian Mesick
e462b0b824 Merge pull request #20741 from edx/pwnage101/add-history-to-courseoverviews 
Add history to CourseOverview
 2019-07-08 14:46:55 -04:00
atesker
b553501c5d updated sorting 2019-07-08 14:45:54 -04:00
Amit
2c8c3b8a74 INCR-469: Updates on Python 3.x, disable: import-error and fix line over length (#20962) 2019-07-08 13:57:26 -04:00
Matt Hughes
42a986cb97 Merge pull request #20940 from edx/matthugs/add-grade-bulk-management-history-endpoint 
LMS bulk grade endpoint hygiene & CSM key exhaustion updates
 2019-07-08 13:39:02 -04:00
Matt Hughes
1da56ac768 Add endpoint for history of bulk management operations to LMS 
JIRA:EDUCATOR-4367
 2019-07-08 13:09:59 -04:00
Jillian Vogel
44562a1592 SE-1151 Campus.il Inlines all 36 discussion underscore templates (#20742) 
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-08 11:26:43 -04:00
Ayub khan
9fb5c146e8 -python 3 compatibility 2019-07-08 20:02:10 +05:00
Zachary Hancock
b6b04a4551 sync courses command (#20946) 2019-07-08 10:45:36 -04:00
usama sadiq
eef3b65535 Python3 Update 
Added future absolute_import
Changed unicode() with six.text_type()
 2019-07-08 19:41:58 +05:00
Andytr1
e8ca657d78 Merge pull request #20943 from edx/andytr1/grade-override-history-limit-and-simple-history-tweaks 
EDUCATOR-4353 updated history override backend
 2019-07-08 09:05:33 -04:00
atesker
b1e8dbe2d4 EDUCATOR-4353 updated history override backend 
unit test fixes

code review comments
 2019-07-08 08:35:16 -04:00
root
0f22c9ff9b python 3 compatibility 2019-07-08 12:16:46 +00:00
arbisoft
ebcd75965b python3 compatibilty 2019-07-08 16:25:58 +05:00
edX Transifex Bot
dc9974cede fix(i18n): update translations 2019-07-08 04:06:37 -04:00
edX cache uploader bot
f0d1d39135 Updating Bokchoy testing database cache (#20952) 2019-07-05 12:28:09 -04:00
Cory Lee
de7486e589 Merge pull request #20873 from edx/coryleeio/drop_csm_fk 
Drop CSM FK on history
 2019-07-05 11:49:15 -04:00
Cory Lee
09bc3c0714 Add CSM drop FK migration 2019-07-05 11:02:09 -04:00