6426 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
arjun810	f627c9e9c1	Merge pull request #791 from MITx/kimth/js-refactor ... Kimth/js refactor	2012-10-02 19:47:20 -07:00
David Ormsbee	0ed735b7b6	Merge pull request #808 from MITx/bugfix/victor/fix-anon-user-access-check ... fix a bug: can_load() should check for the 'load' permission.	2012-10-02 16:27:00 -07:00
Victor Shnayder	227cc58d30	fix a bug: can_load() should check for the 'load' permission. ... - triggered by anon users when all courses have started (or start dates are off).	2012-10-02 18:59:04 -04:00
David Ormsbee	13c8cbf5af	Merge pull request #807 from MITx/feature/victor/status-banner ... Feature/victor/status banner	2012-10-02 14:19:36 -07:00
Victor Shnayder	f4623bf155	address comments on #807	2012-10-02 17:17:15 -04:00
Victor Shnayder	2f30a717a5	only display site status inside the courseware	2012-10-02 16:54:03 -04:00
David Ormsbee	13bfbc820d	Prevent caching of block showing top status bar (used for system alert notifications).	2012-10-02 16:38:28 -04:00
Victor Shnayder	8b0f1a0305	get rid of caching--unneeded complexity.	2012-10-02 15:03:06 -04:00
Tom Giannattasio	671f2af387	added image	2012-10-02 13:39:42 -04:00
Tom Giannattasio	18a66a0b9c	styled site status banner	2012-10-02 13:36:36 -04:00
Victor Shnayder	21d5abd824	Merge pull request #801 from MITx/feature/cale/allow-static-python-files ... Don't ignore .py files in static files dirs	2012-10-02 09:20:26 -07:00
Victor Shnayder	8ad1e7fba1	Add framework for a site status banner. ... - still needs style - will cache for 10 seconds	2012-10-02 11:48:16 -04:00
kimth	845b921ca1	Missing comma	2012-10-02 15:42:22 +00:00
kimth	ed55e4ae2f	Move collapsible back into xmodule	2012-10-02 15:41:38 +00:00
Calen Pennington	258a210556	Don't ignore .py files in static files dirs	2012-10-02 11:04:43 -04:00
Calen Pennington	fbba883c26	Merge pull request #794 from MITx/feature/cdodge/cms-permissions-management ... Feature/cdodge/cms permissions management	2012-10-02 06:56:13 -07:00
Chris Dodge	f17b48fff3	fix problem introduced when rebasing master and manually resolving conflicts	2012-10-01 15:19:05 -04:00
Chris Dodge	116c7ed31d	fix typo bug on PermissionDenied exception raising	2012-10-01 15:14:16 -04:00
Chris Dodge	d241d5553c	add error response when trying to remove a user which does not exist	2012-10-01 15:14:16 -04:00
Chris Dodge	ea8e875d7d	fix url mapping bug in url.py and include import reference to remove_user_from_course_group	2012-10-01 15:14:16 -04:00
Chris Dodge	580e620b22	add distinct 'admin' role separate from 'editors'. Only 'admins' should be able to add/remove editors.	2012-10-01 15:13:20 -04:00
Chris Dodge	27016465f4	support some simple authorization scheme to view/edit courses	2012-10-01 15:13:19 -04:00
kimth	d6d5f48094	Merge pull request #793 from MITx/bug/tomg/custom-tab-ff ... fixed custom tab box-sizing glitch in firefox	2012-10-01 10:54:11 -07:00
Tom Giannattasio	1870db5fb1	fixed custom tab box-sizing glitch in firefox	2012-10-01 10:09:56 -04:00
Arjun Singh	a8acb7ff30	Renamed jsloader to match up with the content more explicitly; refactored Collapsible out into its own library	2012-10-01 03:03:33 -07:00
David Ormsbee	67fb486f88	Merge pull request #792 from MITx/victor/cm-visible-tabs ... make codemirror use visible tabs	2012-09-30 19:21:20 -07:00
David Ormsbee	cd0991469e	Merge pull request #786 from MITx/feature/tomg/moderator-tag ... added moderator label styles	2012-09-30 19:10:19 -07:00
David Ormsbee	1c823b375c	Merge pull request #790 from MITx/feature/bridger/max_grade_cache_fix ... Fix to update the max_grade cache on StudentModule	2012-09-30 19:08:50 -07:00
Victor Shnayder	d424fb8332	make codemirror use visible tabs ... * this may not be optimal (compared to e.g. replacing tabs with spaces), but it's a lot better than mystery 'bad indentation' errors	2012-09-30 19:18:56 -04:00
Victor Shnayder	af6dd84af0	Merge pull request #789 from MITx/feature/bridger/course_grading ... Feature/bridger/course grading	2012-09-30 11:52:36 -07:00
Bridger Maxwell	4ee0e258ea	Refactored a bit of the generating scores code.	2012-09-30 14:48:20 -04:00
kimth	680934045f	Adjust comments	2012-09-29 21:39:48 -07:00
kimth	c3abeff8d4	Another TODO comment	2012-09-29 21:28:04 -07:00
kimth	7b8750ab69	HTML modules can also run script_placeholder	2012-09-29 19:05:48 -07:00
kimth	4acd8b9fe1	Further explanation to TODO	2012-09-29 18:54:17 -07:00
kimth	faa35f95cc	Move executeProblemScripts into executeModuleScripts	2012-09-29 18:53:24 -07:00
kimth	77af860445	Begin transplant of executeProblemScripts	2012-09-29 18:31:06 -07:00
kimth	8956e5bcb1	Update comment: jsloader works at module-scope	2012-09-29 18:03:59 -07:00
kimth	46598b659c	HTML module also uses jsloader	2012-09-29 17:27:06 -07:00
kimth	65b3f58338	jsloader works at module-level	2012-09-29 16:57:23 -07:00
kimth	cbd602b40d	Moving toggle code. wip	2012-09-29 16:03:17 -07:00
kimth	c8964b800b	Create jsloader.coffee	2012-09-29 15:14:18 -07:00
Calen Pennington	9c859fd925	Merge pull request #780 from MITx/feature/cdodge/cms-static-content-management ... Feature/cdodge/cms static content management	2012-09-29 07:39:50 -07:00
Bridger Maxwell	fd43e94318	If an problem was updated and had a new max score it wasn't recached. Now it is fixed.	2012-09-28 23:38:49 -04:00
Bridger Maxwell	2e4ea1d49c	Added docstring for show_only_average parameter.	2012-09-28 23:19:46 -04:00
Bridger Maxwell	fc73916e05	Removed django.conf.settings dependency from graders.	2012-09-28 23:14:55 -04:00
Bridger Maxwell	a99d7f7c4a	Fixed settings.GENERATE_PROFILE_SCORES for debugging progress graph.	2012-09-28 21:48:41 -04:00
kimth	7750bb471c	Merge pull request #788 from MITx/bug/tomg/new-collapsibles ... Added HTML and Problem collapsibles	2012-09-28 10:03:50 -07:00
Bridger Maxwell	8ba8504466	Added option to only show average of a section format grader.	2012-09-28 12:47:12 -04:00
Tom Giannattasio	04119cce3f	remove collapsible from problem template	2012-09-28 12:37:25 -04:00