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

50800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
e3aa131f1c Merge pull request #21324 from edx/BOM-83 
BOM-83 Removed usages of bulk_assertion
 2019-08-12 09:54:37 -04:00
aarif
4da4749f84 removed bulk_assertions context manager 
removed usages of bulk_assertion

changes made to comply quality failure

removing test-bulk assertions.
 2019-08-10 12:27:23 +05:00
David Ormsbee
e612a9bca6 Merge pull request #21320 from edx/ormsbee/theme_by_qs 
Override theme with site_theme query param
 2019-08-09 13:27:29 -04:00
Feanil Patel
b599c807a9 Merge pull request #21325 from edx/awais786/BOM-84-version 
BOM-84
 2019-08-09 12:17:41 -04:00
Alex Dusenbery
fd539e4001 Don't jam LOGIN_REDIRECT_WHITELIST into devstack_docker settings, we already define it in devstack (and we read private.py from devstack). 2019-08-09 12:04:58 -04:00
Feanil Patel
a2e0acf1e0 Merge pull request #21317 from edx/feanil/upgrade_mongodb_proxy 
Feanil/upgrade mongodb proxy
 2019-08-09 11:56:18 -04:00
Ayub
45ab1fec53 Merge pull request #21316 from edx/BOM-70-1 
BOM-70
 2019-08-09 20:19:18 +05:00
arbisoft
ed1bdf31bd BOM-84 
Update the version.
 2019-08-09 19:44:32 +05:00
Feanil Patel
b8f8f072b4 Run make upgrade. 2019-08-09 10:02:17 -04:00
Feanil Patel
3cf42a692e Update mongodbproxy. 2019-08-09 09:44:58 -04:00
Ayub
1c730fecad Merge pull request #21315 from edx/BOM-79 
BOM-79
 2019-08-09 18:43:49 +05:00
Syed Muhammad Dawoud Sheraz Ali
5ac57c2a68 Merge pull request #21323 from edx/revert-19781-kshtij/problem-response-multi-root-and-fitler 
Revert "[BB-873] Support for filters, and multiple roots in problem response reports"
 2019-08-09 17:54:19 +05:00
Syed Muhammad Dawoud Sheraz Ali
22d3f802f2 Revert "[BB-873] Support for filters, and multiple roots in problem response reports" 2019-08-09 17:17:36 +05:00
Ayub khan
e2dc90966e dnt remove cookie-concent 2019-08-09 13:26:55 +05:00
David Ormsbee
7944e6b418 Override theme with site_theme query param 2019-08-08 20:36:21 -04:00
root
e2213b6712 BOM-79 updated codejail 2019-08-08 16:27:27 -04:00
Feanil Patel
20b7f96770 Merge pull request #21310 from edx/feanil/moar_test_collection_fixes 
More test collection fixes.
 2019-08-08 16:23:15 -04:00
Feanil Patel
189b135c37 Update linting threshold since master is broken. 2019-08-08 15:14:42 -04:00
David Ormsbee
98deba6ec3 Merge pull request #19781 from open-craft/kshtij/problem-response-multi-root-and-fitler 
[BB-873] Support for filters, and multiple roots in problem response reports
 2019-08-08 13:36:43 -04:00
Jeremy Bowman
1835ee9a45 DEPR-33 Remove microsites from site_configuration (#20922) 2019-08-08 13:02:09 -04:00
Cory Lee
a8fd936d27 Delete enterprise reporting secret because I believe it is not used anywhere (#21309) 2019-08-08 13:00:57 -04:00
Ayub khan
3b074323b8 BOM-70 
-Remove Depricated View and tests
 2019-08-08 21:32:42 +05:00
Feanil Patel
b63d881462 Merge pull request #21303 from edx/BOM-80 
BOM-80
 2019-08-08 12:13:54 -04:00
Feanil Patel
1bb50088dc More test collection fixes. 2019-08-08 11:23:14 -04:00
Farhanah Sheets
41280621c1 Merge pull request #21314 from edx/revert-21229-BOM-70 
Revert "BOM-70"
 2019-08-08 09:18:33 -04:00
Ayub
26a1445c93 Revert "BOM-70" 2019-08-08 17:39:45 +05:00
Waheed Ahmed
43cbbfb026 Merge pull request #21312 from edx/waheed/downgrade-newrelic-version 
Downgrade newrelice version from 5.0.0.124 to 4.20.1.121.
 2019-08-08 15:32:07 +05:00
Kshitij Sobti
98af7496d7 Add support for generating problem response reports for multiple blocks, or filtered block types. 
This change adds support for specifying multiple root blocks while generating
problem response reports. It also allows specifying a block type filter so that
only blocks of the filtered types will be included in the report.

Finally, this change also consistenly uses absolute path for the location in the
report instead of relative paths.
 2019-08-08 15:02:46 +05:30
Waheed Ahmed
e81500a25e Downgrade newrelice version from 5.0.0.124 to 4.20.1.121. 
Getting 500 error on stage after upgrading to latest version
of newrelice.
 2019-08-08 14:15:19 +05:00
Awais Qureshi
16b80f5165 Merge pull request #21302 from edx/awais786/BOM-82 
BOM-82
 2019-08-08 12:36:31 +05:00
Awais Qureshi
4b22b06e7a Merge pull request #21304 from edx/awais786/BOM-81 
BOM-81
 2019-08-08 12:35:37 +05:00
Zainab Amir
6b78107081 Fix unregistered celery task (#21305) 
openedx.core.djangoapps.ccxcon.tasks.update_ccxcon is not get auto
discovered by celery. Adding it to CELERY_IMPORTS to be explicitly
added.

PROD-283
 2019-08-08 11:32:17 +05:00
Zainab Amir
adb2c672e4 Fix Unregistered Task (#21297) 
Fix Unregistered Task

openedx.core.djangoapps.bookmarks.tasks.update_xblock_cache task is not
getting autodiscovered by celery and needs to be imported explicitly

PROD-284
 2019-08-08 10:50:40 +05:00
adeelehsan
3cae1503e5 Merge pull request #21308 from edx/geoip2-bot-update-country-database2019-08-07 
geoip2: update maxmind geolite country database
 2019-08-08 03:27:50 +05:00
Feanil Patel
137c0cb3ea Merge pull request #21307 from edx/feanil/fix_some_test_collection 
Feanil/fix some test collection
 2019-08-07 16:37:40 -04:00
edX Transifex Bot
4538a65396 geoip2: update maxmind geolite country database 2019-08-07 20:33:14 +00:00
aarif
61800c619f replaced StringIO imports with import from six 
replaced cStringIO and StringIO imports with import from six

fixed StringIO imports

fixed StringIO imports

fixed XSS python-wrap warning
 2019-08-08 00:09:16 +05:00
Feanil Patel
ea7b0d2d0c Run make upgrade. 2019-08-07 15:04:58 -04:00
Feanil Patel
170c689506 Update to a version of crowdsourcehinter that supports python 3. 2019-08-07 15:04:26 -04:00
Calen Pennington
04c8290197 Merge pull request #21306 from cpennington/pytest-remote-context-name 
Change the name of the remote context plugin
 2019-08-07 14:13:03 -04:00
Calen Pennington
0cd3e193b5 Change the name of the remote context plugin 2019-08-07 12:45:22 -04:00
Feanil Patel
2c3e97dfbb Merge pull request #21301 from edx/feanil/fix_test_collection 
Fix some test collection in python 3.
 2019-08-07 10:12:10 -04:00
Simon Chen
1b9cba5cf1 EDUCATOR-4539 update program access so global staff and course staff related cases can be handled 2019-08-07 09:01:37 -04:00
arbisoft
9d87c3c83b python 2 and 3 compatible method. 2019-08-07 17:01:30 +05:00
arbisoft
538c74970d python 2 and 3 compatible method. 2019-08-07 16:18:29 +05:00
adeel khan
16a62de344 Merge pull request #21234 from edx/adeel/fix_linter_threshold 
Update linter threshold and add new violations.
 2019-08-07 03:59:49 +05:00
Adeel Khan
477963bcfc Update linter threshold and add new violations. 2019-08-07 02:34:25 +05:00
Alex Dusenbery
8a2bf2b60e EDUCATOR-4543 | Let the program_enrollments overview endpoint return course enrollment information for verified and masters mode enrollments, even if they are not directly tied to a ProgramCourseEnrollment. 2019-08-06 16:49:44 -04:00
Nimisha Asthagiri
d226c08b26 Merge pull request #21300 from edx/arch/depr-20-open-id-auth 
DEPR-20 Remove django-openid-auth
 2019-08-06 16:32:25 -04:00
Zachary Hancock
90c9103a89 command to remove social auth users (#21280) 
remove social auth users command
 2019-08-06 15:48:19 -04:00