11117 Commits

Author	SHA1	Message	Date
Chris Dodge	46870f4391	be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling	2012-11-29 15:09:28 -05:00
Chris Dodge	050cb89cf7	fix crash with working with custom tags with XML filestore	2012-11-29 13:24:41 -05:00
Chris Dodge	021ed3bca6	fix crash with working with custom tags with XML filestore	2012-11-29 13:24:07 -05:00
chrisndodge	89ad8cc564	Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup ... Static tabs cleanup	2012-11-29 06:49:28 -08:00
Brian Wilson	9bfa800208	add non-ascii data to toy dataset	2012-11-28 18:28:40 -05:00
Brian Wilson	6a24ecebe7	decode utf-8 when reading html, and encode when writing.	2012-11-28 17:54:18 -05:00
Don Mitchell	c0da6e4249	Details done except for syllabus	2012-11-28 17:10:41 -05:00
Victor Shnayder	4b58cb9560	Fix attempt tracking, fix test ... - increments attempts on any transition to DONE state	2012-11-28 15:04:07 -05:00
Victor Shnayder	0a1b731dbc	properly reset answer area on module reset	2012-11-28 14:18:44 -05:00
Victor Shnayder	b41b459712	update docstring on x_module.get_score to match reality	2012-11-28 14:09:32 -05:00
Victor Shnayder	4fd1a2fa1a	Fix state tracking for self-assessment. ... now keep each set of responses in a separate dictionary	2012-11-28 14:09:09 -05:00
Victor Shnayder	e3b9238eef	reorder imports	2012-11-28 14:08:18 -05:00
Victor Shnayder	f8e45e0a8e	Add tests for old logic	2012-11-28 13:21:48 -05:00
Victor Shnayder	a0a5167207	Hook up testing for self assessment modules	2012-11-28 11:12:06 -05:00
Victor Shnayder	ba9280f3e0	Merge pull request #1010 from MITx/feature/alex/regions ... Feature/alex/regions	2012-11-28 07:09:14 -08:00
Victor Shnayder	b63a787a26	Merge pull request #1081 from MITx/feature/alex/crystallography-update-mitx ... Feature/alex/crystallography update mitx	2012-11-28 07:04:23 -08:00
Alexander Kryklia	74b30d8c20	removed no-longer relevant template params	2012-11-28 17:02:07 +02:00
Don Mitchell	a48a392eb2	Trying to get scss back	2012-11-28 10:02:01 -05:00
Alexander Kryklia	2865c7cad4	moved tests from miller to tests	2012-11-28 16:57:30 +02:00
Don Mitchell	5331ae055f	Got time change hooked up but gained a spurious call to change on date ... change.	2012-11-27 15:15:28 -05:00
Don Mitchell	2238019539	Details tab works except for file references	2012-11-27 11:32:03 -05:00
Alexander Kryklia	dcd52801ef	case when user sends less than 3 points, and tests for this case	2012-11-27 16:10:51 +02:00
Alexander Kryklia	b0a85fde54	fix line widths	2012-11-27 14:53:45 +02:00
Alexander Kryklia	95151ad33a	tests updates for imageresponse	2012-11-27 14:53:45 +02:00
Alexander Kryklia	896e922858	cleaning and documeting	2012-11-27 14:53:45 +02:00
Alexander Kryklia	adef5d6f7e	polygon is created from points via convex_hull	2012-11-27 14:53:45 +02:00
Alexander Kryklia	72f9358f64	tests for imageresponse regions	2012-11-27 14:53:44 +02:00
Alexander Kryklia	5723672e49	speed improvements	2012-11-27 14:53:44 +02:00
Alexander Kryklia	9ce51ec6cf	support for single list syntax in regions	2012-11-27 14:53:44 +02:00
Александр	647d1514aa	support both regions and rectangles	2012-11-27 14:53:44 +02:00
Александр	b4fb0cc463	fixed line length	2012-11-27 14:53:44 +02:00
Александр	88c98b9a56	added multiple regions support	2012-11-27 14:37:57 +02:00
John Jarvis	474f810b38	Adding lowest_passing_grade() to CourseDescriptor	2012-11-26 16:29:45 -05:00
Chris Dodge	b3dcc140b7	made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button	2012-11-26 14:22:13 -05:00
Calen Pennington	8e68573243	Merge pull request #1041 from MITx/fix/cdodge/video-captions ... wire through course asset path information to the video playback module ...	2012-11-26 08:29:05 -08:00
Chris Dodge	6d45445aef	assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility	2012-11-26 11:19:51 -05:00
Chris Dodge	2d7f1b73d7	consolidate logic to compute caption path to server-side, we don't need to do this client-side	2012-11-26 11:19:51 -05:00
Chris Dodge	71f16d40e1	wire through course asset path information to the video playback module and corresponding .coffee files	2012-11-26 11:19:51 -05:00
Calen Pennington	4e3da342d7	Merge pull request #1048 from MITx/feature/cdodge/xlint ... Feature/cdodge/xlint	2012-11-26 08:11:34 -08:00
Chris Dodge	fff3782884	cleave xlint entry point in xml_importer.py to be separate from the import method	2012-11-26 11:05:57 -05:00
Calen Pennington	2b6e2b5143	Merge pull request #1056 from MITx/bugfix/ichuang/xml_importer ... xml_importer bugfix - when importing without policy override use course_location	2012-11-26 06:54:22 -08:00
Александр	01b5992372	comment outputs	2012-11-22 18:53:35 +02:00
Александр	4b4b2c9927	added documentation, tests, and rounding to closes 0.05 value	2012-11-22 18:44:31 +02:00
Valera Rozuvan	3e8e576e28	Slight change in caption for lattice select.	2012-11-22 16:52:59 +02:00
Valera Rozuvan	37714d45ac	Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx	2012-11-22 13:56:00 +02:00
Valera Rozuvan	19c463b739	Removed radio buttons for selecting the intersection type from crystallography template.	2012-11-22 13:55:50 +02:00
Александр	166ff823a7	removed hidden parameter to template, style='hidden' is set by default for input	2012-11-22 12:53:21 +02:00
Don Mitchell	f0c94a2c7e	Beginning test of details tab.	2012-11-21 15:17:18 -05:00
Александр	111667defd	UI delta and tests:	2012-11-21 19:02:40 +02:00
Александр	33159824a5	added test for lattices	2012-11-21 18:02:48 +02:00