Commit Graph

63 Commits

Author SHA1 Message Date
Ned Batchelder
de7d2cd08c Properly convert files from Webob to pure files.
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
2013-11-22 11:09:11 -05:00
Will Daly
4e9de855d1 Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline
Acceptance tests use asset pipeline
2013-11-08 09:39:19 -08:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
2013-11-08 11:08:48 -05:00
Will Daly
7830bb203f Acceptance tests use asset pipeline 2013-11-04 14:04:04 -05:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution
Add an XBlock javascript runtime, and use it to run XModules
2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules
[LMS-57]
2013-10-18 16:31:32 -04:00
Will Daly
7c15edf686 Use js-test-tool v0.1.4 2013-10-18 14:03:45 -04:00
Gabe Mulley
d2b03e28fb add course_id to event context 2013-10-17 17:44:01 -04:00
Will Daly
7316a3dc3b js-test-tool generates xunit reports. 2013-10-17 14:22:09 -04:00
Brian Wilson
7abd4e363d Switch to 0.2.6 version of diff-cover. 2013-10-10 15:34:16 -04:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Will Daly
c820ca4888 Merge pull request #1200 from edx/will/efficient-diff-quality
Use pre-generated reports for pep8/pylint when running diff-quality
2013-10-07 13:05:47 -07:00
Will Daly
e11bd1d96f Merge pull request #1226 from edx/will/use-lettuce-fork
Use a forked version of lettuce that fixes a bug with tag inheritance
2013-10-04 12:07:34 -07:00
Will Daly
cb511ee476 Use pre-generated reports for pep8/pylint when running diff-quality 2013-10-04 14:56:57 -04:00
Will Daly
b7b8a2da8a Use a forked version of lettuce that fixes a bug with tag inheritence 2013-10-04 14:20:05 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Ned Batchelder
a1d464aed9 Update XBlock requirement to new XML code. 2013-09-30 21:09:43 -04:00
Calen Pennington
f500b72290 Make sure that we have the right set of fields available during xml parsing
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.

The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
2013-09-27 10:57:39 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Julian Arni
9d3395ea06 Bump diff-cover version 2013-09-12 15:48:00 -04:00
Don Mitchell
0848360436 Merge pull request #844 from edx/dhm/editable_metadata
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
2013-09-06 11:58:36 -07:00
David Ormsbee
ed508f8400 Merge pull request #556 from edx/ormsbee/requirments_notice
Dependency warning message on requirements files
2013-09-06 08:35:36 -07:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Will Daly
93656a253d Incremented diff cover version to fix 100% coverage bug. 2013-09-03 07:51:49 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Sarina Canelake
d6e06e441f Upgrade diff-cover to newest version 2013-08-09 15:55:43 -04:00
Sarina Canelake
2401fa2e65 Update the XBlock version to fix save bugs 2013-08-08 16:53:13 -04:00
Sarina Canelake
b6bab0a121 Update XBlock version 2013-08-07 13:14:30 -04:00
David Ormsbee
b6b4f0f987 Dependency warning message on requirements files 2013-08-01 14:49:49 -04:00
David Ormsbee
3d8b32bb69 Reverting 89c48f4a30 to unbreak codejail for this release. 2013-07-29 17:18:52 -04:00
David Baumgold
f9387506b4 Merge pull request #495 from dangtrinh/vi_branch
Change git clone protocal to https
2013-07-29 12:00:17 -07:00
Trinh Nguyen
fd304c4681 Change git clone protocal to https 2013-07-25 07:49:31 +07:00
Sarina Canelake
4cd99c192c Update diff-cover to latest version 2013-07-22 12:02:31 -04:00
Calen Pennington
679b118ed3 Merge pull request #271 from edx/dhm/next-gen-modulestore
Next gen modulestore
2013-07-20 04:51:11 -07:00
Don Mitchell
913c601ac1 Move default set_many impl to xblock 2013-07-19 15:08:24 -04:00
Adam Palay
7165acc499 set django-wiki to its most recent version 2013-07-19 14:40:41 -04:00
Ned Batchelder
89c48f4a30 Use CodeJail with FSIZE support, and default to 50k 2013-07-18 17:25:05 -04:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules.
Update existing tests and provide new ones to test new paradigm.
2013-07-18 16:37:34 -04:00
Sarina Canelake
f0c9aa3916 Provide set_many methods for Lms and Mongo KeyValueStores
Refactor new set_many and update XBlock version number.
2013-07-18 15:30:13 -04:00
Will Daly
c0805c334d Updated diff-cover to version 0.1.3 to fix a bug 2013-06-25 13:23:13 -04:00
Will Daly
b82eedbefd Merge pull request #184 from edx/will/fix-diff-cover-bug
Fix a bug in diff-cover
2013-06-18 14:32:46 -07:00
Calen Pennington
c5dc404b01 Merge pull request #150 from edx/fix/cale/update-django-wiki
Cherry pick change to url matching regular expression. Fixes LMS-37
2013-06-18 10:29:33 -07:00
Will Daly
b2bc39fa09 Updated diff-cover to version 0.1.2, which fixes a bug
in which missing lines were over-reported
2013-06-17 11:17:58 -04:00
cahrens
c01041938c Upgrade xblock version to get strict ModelTypes. 2013-06-13 13:33:30 -04:00
cahrens
dac174e448 Merge cleanup. 2013-06-13 11:31:18 -04:00
Calen Pennington
2fab945340 Cherry pick change to url matching regular expression. Fixes LMS-37 2013-06-13 10:20:43 -04:00
cahrens
89d0003603 Be strict about ModelType expected types, rename Object as Dict. 2013-06-12 14:59:17 -04:00
cahrens
86d952bf91 Change to putting serialize/de-serialize directly in xml_module. 2013-06-12 13:34:38 -04:00
Ned Batchelder
413202e7d6 Merged ned/whitelistable-sandbox 2013-06-11 16:49:45 -04:00
cahrens
17c9c104d9 Update version of xblock. 2013-06-10 12:29:49 -04:00