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

378 Commits

Author SHA1 Message Date
cclauss
8fca11b85c Use print() function in both Python 2 and Python 3 2019-01-13 17:16:37 +01:00
Gavin Sidebottom
3dad2be55d Refactored XBlockAside rendering and added support for student view 2018-12-11 12:27:03 +05:00
Braden MacDonald
1e4dc51ac7 Allow calling xblock_view API with OAuth creds 2018-11-28 09:25:30 -08:00
noraiz-anwar
e0d19d6871 escape json for use in js 2018-11-28 17:31:27 +05:00
nadeemshahzad
9d95c2e632 upgrade gunicorn 19.0 2018-11-28 08:08:21 +00:00
Bill Filler
1b60dea806 modify completion percentage calculation to account for single component that is excluded/ignored 2018-11-15 16:21:52 -05:00
Ned Batchelder
63d84d65e5 Merge pull request #19215 from edx/nedbat/remove-unused-imports 
Remove unused imports
 2018-11-06 13:57:46 -05:00
Shadi Naif
4df2073376 Fix exceptions raised when a lazy text is used in json dump 2018-11-05 12:24:45 +02:00
Ned Batchelder
3353e7425e Remove unused imports 2018-11-03 16:07:05 -04:00
Nimisha Asthagiri
dc56a63e03 Remove deprecated JwtBuilder 
ARCH-248
 2018-10-17 07:43:59 -04:00
Robert Raposa
fbc59231fc Update edx-drf-extensions to 2.0.0. 
Note: this version update is backward incompatible.

ARCH-255
 2018-10-17 01:00:34 -04:00
Michael Youngstrom
fa8e920fe1 Fix sharding for unittests to avoid skipped tests 2018-10-11 11:00:30 -04:00
Hammad Ahmad Waqas
db73d99da6 Merge pull request #19033 from edx/hammad/WL-1798 
Hammad/WL-1798 Participants not able to move on to course assignments from pre-assessment
 2018-10-03 19:11:44 +05:00
Hammad Ahmad Waqas
c7a8ddedea excluding html blocks form adding in computable blocks for completion 2018-10-03 17:18:23 +05:00
Nimisha Asthagiri
31a1ad4a09 Merge pull request #18999 from edx/arch/refactor-jwt-builder 
JWT Cookies
 2018-10-01 13:45:15 -04:00
Nimisha Asthagiri
02ba5fb0e8 Login service support for JWT Cookies 2018-10-01 13:08:40 -04:00
Ahsan Ulhaq
ee7555e85f update usage of SessionAuthenticationAllowInactiveUser 
LEARNER-6469
 2018-10-01 17:52:52 +05:00
Nimisha Asthagiri
b7deedfb36 Refactor Login Cookies 2018-09-25 09:12:08 -04:00
Calen Pennington
cc7f692c09 Mark xblocks with data-graded and data-has-score 2018-09-14 15:05:22 -04:00
Ned Batchelder
b30e46a2e3 Merge pull request #18880 from edx/nedbat/coverage-parallel-everywhere 
Make coverage parallel everywhere
 2018-09-13 21:44:17 -04:00
Calen Pennington
5b71d4408b Merge pull request #18902 from cpennington/fix-educator-3262-v3 
Load all webpack chunks into fragments as correctly-typed resources
 2018-09-13 10:11:26 -04:00
Nimisha Asthagiri
700a902b68 Cleanup and remove deprecated RequestCache Django app 
ARCH-223
 2018-09-12 14:39:11 -04:00
Ned Batchelder
e5f5f50a1c Always use parallel for coverage measurement 2018-09-10 11:29:54 -04:00
Calen Pennington
41c71505e3 Load all webpack chunks into fragments as correctly-typed resources 2018-09-06 15:47:13 -04:00
Jeremy Bowman
3ff3eee2f2 TE-2689 Remove useless pylint suppressions part 4 2018-08-20 12:54:22 -04:00
Jeremy Bowman
713d64e1e2 TE-2702 Update Read the Docs links to HTTPS 2018-08-15 17:34:01 -04:00
Jeremy Bowman
17f54fbaff TE-2525 Finish removing nose.tools usage 2018-08-07 21:39:02 -04:00
Zia Fazal
a5691b7cb6 Merge pull request #18727 from edx/ziafazal/gating-exclude-non-completable 
exclude non completable blocks when calculating completion percentage
 2018-08-07 16:39:58 +05:00
Zia Fazal
1d4b62ad6c exclude non completable blocks when calculating completion percentage 
Fixed typo
 2018-08-06 12:03:23 +05:00
Jeremy Bowman
c290bf8a07 TE-2524 Stop using nose.plugins - openedx 2018-08-02 14:54:50 -04:00
Jeremy Bowman
4241249119 TE-2524 Stop using nose.plugins 2018-07-30 21:11:05 -04:00
Nimisha Asthagiri
ae9b8956e0 Management command: generate_jwt_signing_key 2018-07-30 16:09:46 -04:00
Nimisha Asthagiri
eac1ce7bfd Asymmetric JWT support 2018-07-30 07:17:08 -04:00
Nimisha Asthagiri
ce4cb53672 Update Permissions to use latest edx-drf-extensions and rest_condition 2018-06-28 18:37:53 -04:00
Calen Pennington
b85d6f031c Merge pull request #18417 from cpennington/cale/fix-ora-webpack 
Cale/fix ora webpack
 2018-06-28 12:47:53 -04:00
Douglas Hall
db22939193 Add OAuth2 Scopes and Filters to JWTs. 2018-06-28 10:30:09 -04:00
Calen Pennington
07a15c681f Reapply the XBlock RequireJS -> Webpack changes 
This reverts commit 105db2cf59, reversing
changes made to 447457594f.
 2018-06-27 22:27:07 -04:00
Usman Khalid
8b1aad080a Add complete on view support to render_xblock view. 2018-06-22 14:46:03 -04:00
John Eskew
b94ea6b4b1 Import XBlockMixin from the correct location. 2018-06-21 11:41:06 -04:00
Eric Fischer
e72549cdbe Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering" 
This reverts commit 9a70ca78a5, reversing
changes made to efd5b9abbd.

Hopefully fixes EDUCATOR-3053
 2018-06-15 13:18:27 -04:00
Nimisha Asthagiri
62266fd936 Merge pull request #18325 from edx/hack/course-validation-api 
Course Validation and Course Quality APIs
 2018-06-13 21:33:22 -04:00
Nimisha Asthagiri
8db2dd47dd Course Validation and Course Quality APIs 2018-06-13 20:33:45 -04:00
Calen Pennington
be3c7e05c5 Reapply "Switch container factory to webpack" 
This reverts commit 18d93b00ba.
 2018-06-07 15:52:05 -04:00
Calen Pennington
18d93b00ba Revert "Switch container factory to webpack" 2018-06-07 13:46:47 -04:00
Calen Pennington
85a375a38f Add webpack assets directly to xmodule fragments, rather than injecting them in fragment contents 2018-06-06 12:52:12 -04:00
Calen Pennington
0abe75a7c6 Re-apply the changes to convert XBlocks to Webpack 
Reapplies edx/edx-platform#17509

This reverts commit 0f7e2373d0.
 2018-06-06 12:52:12 -04:00
Brian Mesick
832f6a7157 Merge pull request #18320 from edx/bmedx/remove_111_test_marks 
Remove unused pytest markers for Django 1.11 upgrade
 2018-06-06 11:15:26 -04:00
bmedx
c125ff6a57 Remove unused pytest markers for Django 1.11 upgrade 2018-06-06 09:58:38 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
Zia Fazal
90633c0956 Merge pull request #17974 from edx/ziafazal/WL-1239 
WL-1239: Ability to gate section based on completion percentage
 2018-05-30 12:52:43 +05:00