656 Commits

Author	SHA1	Message	Date
Brian Wilson	b5378b04b3	change timer to calculate relative duration in javascript	2013-02-12 12:25:11 -05:00
Ned Batchelder	aa2d0ecaf2	We no longer need override_settings, Django has a better one.	2013-02-11 17:06:35 -05:00
Brian Wilson	f51876da6a	cosmetic changes	2013-02-08 13:42:54 -05:00
Brian Wilson	290368ef0d	merge out from master	2013-02-07 17:40:54 -05:00
Brian Wilson	80e4944314	minor cleanup	2013-02-07 16:12:02 -05:00
Brian Wilson	cc11dc2aa3	switch to using timelimit module for Pearson test	2013-02-07 15:57:43 -05:00
Brian Wilson	bfc4527590	Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.	2013-02-06 15:23:11 -05:00
Calen Pennington	cfae1cdf62	Pep8 autofixes	2013-02-06 11:13:50 -05:00
Brian Wilson	1b465d1beb	implement testcenter_login	2013-02-05 18:01:55 -05:00
Calen Pennington	4d8165b2b6	Remove bad import of replace_urls	2013-02-05 11:06:46 -05:00
Calen Pennington	401f564e6a	Fix data directory passed to replace_static_urls	2013-02-05 11:06:46 -05:00
Calen Pennington	04879a83d3	Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible	2013-02-05 11:06:45 -05:00
Calen Pennington	b05ead864f	Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" ... This reverts commit c4f56620df.	2013-02-05 11:06:45 -05:00
Brian Wilson	f8b7d5fad6	have timer redirect when it expires	2013-02-04 15:13:14 -05:00
Brian Wilson	1685f302ab	add TimerModule to courseware	2013-02-04 02:22:24 -05:00
ichuang	19051e40d2	use ajax for doing conditional_module	2013-02-03 18:53:51 -05:00
Brian Wilson	9d98b7055d	add course navigation back into timed exam. Add initial timer styling.	2013-02-01 17:52:14 -05:00
Brian Wilson	07638440ac	rename testcenter_exam to timed_exam, and read duration from metadata (policy.json)	2013-01-31 18:33:22 -05:00
Vik Paruchuri	b22bad7fa1	Add in some removed imports (fix tests)	2013-01-31 17:11:44 -05:00
Vik Paruchuri	01cdc6e7f8	Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes ... Conflicts: common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee	2013-01-31 16:50:10 -05:00
Brian Wilson	9b3d7efb3f	add first pass at testcenter exam	2013-01-30 18:14:53 -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
Victor Shnayder	f2944334ab	Merge pull request #1387 from MITx/feature/zoldak/courseware-unit-tests ... Add unit tests for lms courseware access	2013-01-30 12:51:50 -08: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
Jay Zoldak	91b8a95ed7	Add unit tests for lms courseware access	2013-01-30 15:03:43 -05: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
Christina Roberts	fd4b3f9489	Merge pull request #1332 from MITx/fix/cdodge/unit-test-of-draft-store ... add unit test to test DraftModuleStore.get_items() fix	2013-01-30 06:49:53 -08:00
Chris Dodge	dbf15fc2ac	add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id	2013-01-30 09:46:38 -05:00
cahrens	3c1c61fb19	Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating).	2013-01-30 09:23:07 -05:00
Calen Pennington	2854d7d066	Point course_image.jpg at the correct place in the /static url space	2013-01-30 09:12:50 -05:00
Calen Pennington	07487a8d8f	Use descriptor when setting up replace_urls, as it's been created at that point	2013-01-30 09:12:50 -05:00
Calen Pennington	e773b8e7b1	Fix import error	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
Calen Pennington	89f984c08b	Prefix courseware urls with /static, since they are no longer served through collectstatic	2013-01-30 09:12:50 -05:00
Vik Paruchuri	01f218b7f8	Fix some tab issues from the rebase	2013-01-29 21:36:55 -05:00
Vik Paruchuri	fde370bd92	Fix notification issue, sanitize input html	2013-01-29 21:24:04 -05:00
Vik Paruchuri	bd0b933ff2	Highlight the correct tab	2013-01-29 21:24:04 -05:00
Vik Paruchuri	665fb707b1	Cache notifications for 5 mins so that we don't hit the grading server on every web request	2013-01-29 21:24:03 -05:00
Vik Paruchuri	6412eb4080	Fix naming for overall need to check	2013-01-29 19:39:24 -05:00
Vik Paruchuri	d3d4e557d6	Fix notification display	2013-01-29 19:31:03 -05:00
Vik Paruchuri	457afaaeda	Making tab render properly for open ended notifications	2013-01-29 19:31:03 -05:00
Vik Paruchuri	0f212cc8f2	Fix course id passing, template rendering	2013-01-29 19:31:02 -05:00
Vik Paruchuri	22a2bdaa3d	Disable student problem list caching, build out notifications	2013-01-29 19:30:04 -05:00
Vik Paruchuri	4112f8ad8e	Pass back dictionaries where needed from notifications functions	2013-01-29 19:30:04 -05:00
Vik Paruchuri	68db8b0d77	Refactor tab logic, start adding in combined notifications view	2013-01-29 19:30:04 -05:00
Vik Paruchuri	693337593e	Properly parse url for grading controller	2013-01-29 19:30:03 -05:00
Vik Paruchuri	b0599ea133	Fix queries and some controller query stuff	2013-01-29 19:30:03 -05:00
Vik Paruchuri	2191f3e228	Add in open ended problems view	2013-01-29 19:30:03 -05:00
Vik Paruchuri	fe77bb00c4	Fix naming for overall need to check	2013-01-29 19:25:56 -05:00
Vik Paruchuri	5e63a4690b	Work on getting combined notifications	2013-01-29 19:25:56 -05:00