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

31 Commits

Author SHA1 Message Date
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
Usman Khalid
41c6236e0a Convert CapaModule to ProblemBlock. 
* Minimum possible changes were made to merge CapaModule & CapaDescriptor into
  one ProblemBlock class.
* There are no known changes in behavior.
* CapaModule and CapaDescriptor inherited from a number of classes which inherit
  from XModule or XModuleDescriptor but did not depend on them. For all these
  classes the methods were moved to mixins which did not inherit from either and
  then these mixins were added to ProblemBlock in the order which maintains MRO.
 2019-05-01 20:08:36 +05:00
Andrés González
26b3a40133 INCR-108 (#20058) 
* INCR-108: Run python-modernize on openedx/core/lib

* Fixed urlencode import

* Fixed diff quality warnings and six.string_types error

* Fixed pickle import

* Fixed iteritems import

* Fixed ungrouped imports

* Fixed six.moves import issues
 2019-04-02 10:26:00 -04:00
Matthew Piatetsky
444799fb0e fix unicode strings in openedx/ part 2 2019-02-15 10:15:51 -05: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
Calen Pennington
cc7f692c09 Mark xblocks with data-graded and data-has-score 2018-09-14 15:05:22 -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
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
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
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
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
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
d08e199f79 Load XBlocks with webpack rather than RequireJS 2018-05-29 12:19:05 -04:00
noraiz-anwar
0dd4978f37 permit staff role to rescore, override and delete problem scores for individual learners 2018-04-05 18:40:55 +05:00
Jeremy Bowman
f8e5e38cc4 PLAT-1884 Replace deprecated xblock.fragment usage 2018-01-11 14:20:12 -05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
David Ormsbee
a6752b7c4d Consolidate collected XBlock static assets. 
Before this commit, XBlock static assets were extracted during the
collectstatic process by iterating through all installed XBlock classes
and creating a separate directory for each. However, some packages
install many XBlocks that actually share the same static assets. The
most notable example is problem_builder, though we also see this with
schoolyourself and google_drive.

This commit uses the parent module name to do package asset lookup,
collapsing those cases down and eliminating duplicates. For a default
install of edx-platform XBlocks, this reduces assets generated from 31M
to 14M.
 2017-11-13 11:09:09 -05:00
John Eskew
7dfb6cc681 Change all UTC timezones to import from pytz instead of Django. 2017-10-05 11:12:52 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
J. Cliff Dyer
9ee79a5729 Ensure ScorableXBlocks have rescore button. 2017-03-17 12:40:19 -04:00
J. Cliff Dyer
1cfff02f06 Add tests for scoring of diverse problem types. 
Includes:
* CAPA
* ORA
* LTI
* LTI-Consumer
* SGA
* Randomized Content Block

TNL-5692
TNL-5464
 2016-10-20 09:29:55 -04:00
Eric Fischer
e24915d286 Revert "Merge pull request #13614 from edx/efischer/revert_grades" 
This reverts commit 9aa35cd8ad.
 2016-10-06 14:25:27 -04:00
Adam
9aa35cd8ad Merge pull request #13614 from edx/efischer/revert_grades 
Potential Grades revert PR
 2016-09-30 14:08:58 -04:00
J. Cliff Dyer
ddb383c3c2 Test different problem types. 2016-09-28 16:38:38 -04:00