2830 Commits

Author	SHA1	Message	Date
Diana Huang	2b764eebad	Make the rubric for self-assessment selectable and remove the ... separate grade selection.	2013-02-01 11:27:53 -05:00
Diana Huang	0ec3be1815	Calculate the total score from the rubric.	2013-02-01 10:17:16 -05:00
Diana Huang	6575386d69	Refactor rubric JS so that we don't have to keep duplicating this code.	2013-02-01 08:43:55 -05:00
Diana Huang	683976d7ad	Add scores to the top of the rubric, remove from individual cells	2013-01-31 13:28:19 -05:00
Diana Huang	309ac7aa5c	Refactor rubric CSS into a single file.	2013-01-31 13:27:46 -05:00
Jay Zoldak	6fe209b0cf	Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests ... New tests for OpenEndedGrading	2013-01-31 08:34:06 -08:00
Diana Huang	8144a1dfaf	Add in next_problem jasmine tests	2013-01-30 17:25:13 -05:00
Calen Pennington	c4f56620df	Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" ... This reverts commit ab437b9463, reversing changes made to 7a8e87c789.	2013-01-30 16:49:49 -05:00
Diana Huang	36d8b8768c	Merge branch 'master' into tests/diana/update-oe-unit-tests	2013-01-30 16:41:18 -05:00
Diana Huang	6322263c90	New Jasmine tests	2013-01-30 16:40:55 -05:00
Diana Huang	e873da76d5	Wrap reload to allow us to mock it. Add in some polling testing.	2013-01-30 16:01:28 -05:00
chrisndodge	676e80bd9d	Merge pull request #1389 from MITx/fix/cdodge/export-static-tabs ... add new tab file	2013-01-30 12:26:12 -08:00
Chris Dodge	a9da761b18	add new tab file	2013-01-30 15:25:00 -05:00
Calen Pennington	ab437b9463	Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic ... Don't run collectstatic on course content	2013-01-30 12:07:47 -08:00
Christina Roberts	54c1fe9c67	Merge pull request #1384 from MITx/fix/cdodge/export-static-tabs ... adding exporting of tabs and custom_tags. Also added unit tests	2013-01-30 10:52:31 -08:00
Chris Dodge	cc09a90245	DRY things up a bit	2013-01-30 13:50:30 -05:00
Chris Dodge	c676046341	adding exporting of tabs and custom_tags. Also added unit tests	2013-01-30 13:25:17 -05:00
David Ormsbee	fecad2a3e1	Merge pull request #1382 from MITx/feature/brian/pearson-status ... pearson_dump: prettify, add missing error, provide default filename	2013-01-30 09:55:45 -08:00
Brian Wilson	a6a58d0e2a	pearson_dump: prettify, add missing error, provide default filename	2013-01-30 12:15:12 -05:00
Christina Roberts	91b3a220b8	Merge pull request #1367 from MITx/fix/cdodge/static-tab-reordering ... support reordering of static tabs in studio	2013-01-30 08:51:36 -08:00
chrisndodge	67775fbfa9	Merge pull request #1377 from MITx/feature/christina/misc ... Bug fixes for problem progress not updating.	2013-01-30 08:24:38 -08:00
Diana Huang	b38595f115	Fix the fixtures, add new tests, remove useless code ... from the original JS	2013-01-30 10:50:47 -05:00
Diana Huang	4df62d968d	Fix up new jasmine tests	2013-01-30 09:31:42 -05:00
Diana Huang	ce8a48405b	Clean up some JS errors showing up in the xmodule jasmine tests	2013-01-30 09:31:20 -05:00
Calen Pennington	9ae83338c6	Whitespace cleanup	2013-01-30 09:12:50 -05:00
Calen Pennington	95f2c9e275	Standardize how static urls are replaced by modules in their own html	2013-01-30 09:12:50 -05:00
Diana Huang	f1973dc660	minor update to new jasmine test	2013-01-29 17:34:54 -05:00
David Ormsbee	40d59faa68	Merge pull request #1330 from MITx/diana/open-ended-ui-updates ... Rubric Integration and other UI improvements	2013-01-29 14:10:18 -08:00
Diana Huang	f7424eb8d6	Merge branch 'master' into tests/diana/update-oe-unit-tests	2013-01-29 16:44:15 -05:00
cahrens	26cb1c5a25	Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating).	2013-01-29 16:30:41 -05:00
Jay Zoldak	3669ea5c97	Merge pull request #1375 from MITx/diana/fix-requirejs-jasmine-xmodule ... Add missing requirejs for xmodule jasmine tests	2013-01-29 13:26:36 -08:00
jarv	877f757f94	Merge pull request #1369 from MITx/feature/jarv/certificate-restriction ... Feature/jarv/certificate restriction	2013-01-29 13:14:41 -08:00
Diana Huang	cb77209d3c	Add missing requirejs for xmodule jasmine tests	2013-01-29 16:09:27 -05:00
Diana Huang	585f1c41d6	New jasmine tests for combined open ended problems.	2013-01-29 16:04:43 -05:00
Chris Dodge	855c8bb7e7	add unit test for tab reordering	2013-01-29 13:44:42 -05:00
Don Mitchell	b3d7dc779d	Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag	2013-01-29 13:17:15 -05:00
Don Mitchell	ba95cf2385	Auto expand on hover of drag&drop unit	2013-01-29 13:10:23 -05:00
Victor Shnayder	39a9c47512	make links look like links	2013-01-29 11:33:26 -05:00
David Ormsbee	0a1f5bc154	Merge pull request #1368 from MITx/feature/brian/pearson-status ... add pearson_dump command.	2013-01-29 08:19:41 -08:00
Brian Wilson	15a11e9cb7	add validation of accommodation codes	2013-01-29 11:16:23 -05:00
Brian Wilson	69ff879e95	add more validation for countries	2013-01-29 10:41:41 -05:00
John Jarvis	0f39e04697	Adding certificate restriction lookup ... If certificate status is 'restricted' the grade and survey link will be shown, the download link will not	2013-01-29 10:27:53 -05:00
Brian Wilson	09ab52bc94	fix log message in pearson import	2013-01-29 10:21:41 -05:00
Chris Dodge	5a4c0fb907	imports should have a marketing video. Treat it as a warning as every course might not have one.	2013-01-29 09:38:59 -05:00
John Jarvis	289301e0ea	adding more to help string	2013-01-28 19:38:51 -05:00
John Jarvis	0c43e69c00	command for certificate restriction (embargoed countries)	2013-01-28 19:30:40 -05:00
John Jarvis	7e033d0265	django command for certificate restriction	2013-01-28 19:28:24 -05:00
Brian Wilson	bae2162fa0	add pearson_dump command. Modify rule for determining authorization transaction type.	2013-01-28 18:29:34 -05:00
John Jarvis	fba88db5fa	Adding django-admin command for certificate_restriction	2013-01-28 15:10:35 -05:00
Victor Shnayder	734a8bd6e5	make tests pass with cms config as well as lms	2013-01-28 15:07:44 -05:00