2976 Commits

Author	SHA1	Message	Date
Don Mitchell	4ba7de3402	Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy	2013-02-06 09:56:19 -05:00
Christina Roberts	0d8cfb9baa	Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404 ... change from throwing a Http404 exception, which I believe will try to re...	2013-02-05 13:36:28 -08:00
Chris Dodge	3fa1fe0cd6	change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.	2013-02-05 16:26:07 -05:00
Christina Roberts	8c4b661292	Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote ... studio - resolved HTML display issue with bold and blockquote	2013-02-05 13:13:44 -08:00
Diana Huang	120aa3cd3b	Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule ... Feature/vik/peer grading xmodule	2013-02-05 12:55:48 -08:00
Brian Talbot	d713b288b5	studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style	2013-02-05 15:21:41 -05:00
Vik Paruchuri	ce87e6f221	Skip two tests	2013-02-05 14:57:59 -05:00
Vik Paruchuri	cae65706fd	Pare down on peer grading service	2013-02-05 14:37:08 -05:00
Vik Paruchuri	8027cc7024	Fix some issues with tests	2013-02-05 14:35:44 -05:00
Vik Paruchuri	e13de7543f	Test fixes, err response fixes, address review comments	2013-02-05 14:12:11 -05:00
Vik Paruchuri	34dc6e6320	Fix some issues with peer grading service	2013-02-05 13:37:55 -05:00
Vik Paruchuri	7984c4dfcb	Move over grading service to xmodule	2013-02-05 13:10:56 -05:00
Calen Pennington	0350d15e29	Make static_replace fall back to data_directory prefix, if it doesn't find the file anywhere else	2013-02-05 11:06:46 -05:00
Calen Pennington	90107fa88f	Import cache function correctly	2013-02-05 11:06:46 -05:00
Calen Pennington	10f8dbfa46	Handle options passed to clear_collectstatic_cache	2013-02-05 11:06:46 -05:00
Calen Pennington	ae5d3cbc57	Add admin command to flush the staticfiles cache	2013-02-05 11:06:46 -05:00
Calen Pennington	8592db92bf	Add more tests of static_replace	2013-02-05 11:06:46 -05:00
Calen Pennington	f1f2bd8fd2	Start adding tests for static replacement	2013-02-05 11:06:46 -05:00
Calen Pennington	ba7bd9022b	Replace the correct /course/ urls, rather than /courses/	2013-02-05 11:06:46 -05:00
Calen Pennington	0da1467a90	Pull out missing variable	2013-02-05 11:06:46 -05:00
Calen Pennington	88fc2e3756	Fix unbalanced paren in regex	2013-02-05 11:06:45 -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
Vik Paruchuri	e8a690df5e	Update peer grading tests	2013-02-05 10:46:00 -05:00
Don Mitchell	82b2dc7193	Merge pull request #1427 from MITx/feature/christina/misc2 ... Do not do finds within the event method. Decreases likelihood of hitting...	2013-02-05 07:19:40 -08:00
cahrens	286616e659	Do not do finds within the event method. Decreases likelihood of hitting bug in older versions of Chrome. ... https://edx.lighthouseapp.com/projects/102637/tickets/153	2013-02-05 09:50:34 -05:00
Victor Shnayder	82afc477fa	Merge pull request #1396 from MITx/feature/victor/randomization ... Feature/victor/randomization	2013-02-04 15:37:07 -08:00
Victor Shnayder	b6614f6939	add initial test that only tests the descriptor	2013-02-04 18:28:22 -05:00
Vik Paruchuri	725f0c632c	Remove get statements, fix module_render	2013-02-04 18:27:25 -05:00
Vik Paruchuri	009a8c5f63	Fix issue with passing rubric scores back to controller	2013-02-04 18:17:23 -05:00
Vik Paruchuri	bf97a6a9a9	Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule ... Conflicts: lms/djangoapps/open_ended_grading/peer_grading_service.py	2013-02-04 17:55:55 -05:00
Vik Paruchuri	f019225d16	Fix reloading	2013-02-04 17:23:34 -05:00
Vik Paruchuri	eb049bda9e	Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging	2013-02-04 17:18:59 -05:00
Victor Shnayder	d7570de5d7	Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display ... fix bug in conditional - videos were not playing, because a js function changed syntax	2013-02-04 14:14:18 -08:00
ichuang	0c07f03d68	XModule.loadModules only takes @el as argument now	2013-02-04 17:04:39 -05:00
Vik Paruchuri	5d8aade8e7	Explain django settings imports	2013-02-04 16:57:09 -05:00
Vik Paruchuri	cbd0895aad	Add in single peer grading problem view	2013-02-04 16:42:14 -05:00
Vik Paruchuri	c9f75f8b3c	Add in score return	2013-02-04 16:14:34 -05:00
Christina Roberts	2306e7c1e8	Merge pull request #1417 from MITx/feature/christina/misc2 ... Try, try again.	2013-02-04 12:56:26 -08:00
cahrens	aac179f135	Try, try again.	2013-02-04 15:48:05 -05:00
Sarina	25bede9005	Merge pull request #1414 from MITx/feature/victor/showanswer-past-due ... Feature/victor/showanswer past due	2013-02-04 12:39:13 -08:00
Victor Shnayder	fe42d8e9a8	fix typo, add comment	2013-02-04 15:04:20 -05:00
Vik Paruchuri	af6123a1ac	Add in methods to query data from the controller for student grading	2013-02-04 15:00:07 -05:00
Vik Paruchuri	4c5e59e84a	Start to fix up instance states	2013-02-04 14:52:41 -05:00
Vik Paruchuri	ed282c05d4	Proper handling of submissions	2013-02-04 14:33:46 -05:00
Vik Paruchuri	3380745692	About to trim some lines	2013-02-04 13:54:27 -05:00
Christina Roberts	517f756ffa	Merge pull request #1413 from MITx/feature/christina/misc2 ... See if this helps with the tab-changing race condition.	2013-02-04 10:34:37 -08:00
cahrens	39479d9e18	See if this helps with the tab-changing race condition.	2013-02-04 13:28:34 -05:00
Vik Paruchuri	c6c89e4216	Make peer grading xmodule work with notifications	2013-02-04 13:16:05 -05:00
cahrens	ca2a375c17	saving work	2013-02-04 12:50:16 -05:00