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

50810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jansen Kantor
ecb65a4fff Jkantor/link program enrollments (#21330) 
* add management command to link program enrollments to users
 2019-08-13 13:37:11 -04:00
Kyle McCormick
fff69a9f58 Add course grade listing API for program_enrollments app 
This new API endpoint differs from the existing Grades API
in that (i) it only includes grades for users enrolled with a
ProgramCourseEnrollment and (ii) it alters its return code
depending on whether any student's grade failed to load.

EDUCATOR-4529
 2019-08-13 13:33:02 -04:00
Feanil Patel
9753eae441 Convert to using ExitStack instead of nested. (#21329) 
* Convert to using ExitStack instead of nested.

nested is not available in Python3.

* Use ExitStack from contextlib2.

ExitStack has not been backported to the Python 2.7 standard library and
contextlib.nested is no longer available in Python 3.5.  We need to be
able to use something in both 2 and 3 as we transition so we'll pull in
contextlib2 which has backports of the full python3 contextlib.
 2019-08-12 16:55:05 -04:00
Feanil Patel
1739e4b6b4 Merge pull request #21332 from edx/feanil/fix_more_test_collection 
Fix more test collection.
 2019-08-12 15:33:34 -04:00
Feanil Patel
890e119951 Remove import of nested. 
We stopped using it but forgot to remove it from the import.
 2019-08-12 14:34:48 -04:00
Feanil Patel
e66a7a90e5 Byte string doesn't have a format function in python 3 2019-08-12 14:34:52 -04:00
Dave St.Germain
05375b40fa Merge pull request #21318 from edx/dcs/missing-when 
Added edx-when's FieldData
 2019-08-12 12:41:51 -04:00
Dave St.Germain
267be29ab7 Added edx-when's FieldData 
EDUCATOR-4554
This fixes a bug where extended due dates were visible in the outline but not reflected on the courseware pages, resulting in problems not being submittable past the due date.
In order for edx-when to work on courseware pages, it has to be more careful about field inheritance, which version 0.2 achieves.
 2019-08-12 11:05:44 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85 
BOM-85
 2019-08-12 10:01:07 -04:00
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
arbisoft
9b87cb0172 BOM-85 
he builtin basestring abstract type was removed. Use str instead.
 2019-08-09 22:08:57 +05: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