1251 Commits

Author	SHA1	Message	Date
cahrens	044a8a5cf6	CodeMirror.	2013-02-11 12:37:31 -05:00
cahrens	039160f50c	Beginning of CodeMirror.	2013-02-11 11:20:14 -05:00
cahrens	ac732f6b07	Beginnings of feedback regarding unsaved and saved changes.	2013-02-08 17:19:19 -05:00
Don Mitchell	09e8628037	add editor to new entries and when key changes	2013-02-08 16:58:50 -05:00
Don Mitchell	5254af2918	Letting render do its thing. The wrap confused the this pointer.	2013-02-08 15:36:42 -05:00
cahrens	4718c9a51a	Forgot to define self when I moved code.	2013-02-08 11:17:02 -05:00
cahrens	950f5de3ca	Move getSession() call out of render method to avoid crash on Chrome.	2013-02-08 08:26:24 -05:00
cahrens	287715c6ff	Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy	2013-02-07 13:05:52 -05:00
cahrens	c907cf756c	Add ACE Editors.	2013-02-07 13:05:39 -05:00
Don Mitchell	277bd0dba6	Documentation update	2013-02-07 09:50:16 -05:00
Don Mitchell	1e68834e03	Remove from to-be-deleted list any readded keys w/ same name.	2013-02-06 17:42:00 -05:00
Don Mitchell	253bc10d9f	did other test cleanups which Christina mentioned (should have read the ... note first)	2013-02-06 17:31:17 -05:00
Don Mitchell	7b3c81ca53	blacklist violations now properly trigger violation error ... delete keys only after save completes	2013-02-06 17:25:12 -05:00
Don Mitchell	7668c70f62	Update test now updates existing attrs	2013-02-06 17:01:00 -05:00
cahrens	3f15b3b8ff	Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy	2013-02-06 15:29:36 -05:00
cahrens	c243eec604	Move to view file.	2013-02-06 15:29:17 -05:00
Brian Talbot	d8a6010d0f	studio - manual policy editor: added in example messages for confirm, error, warning	2013-02-06 15:13:44 -05:00
Brian Talbot	571e1106a4	studio - manual policy editor: styled error states to appear inline with row actions visually	2013-02-06 14:57:18 -05:00
Don Mitchell	8f18522d58	Unit tests for edit metadata	2013-02-06 12:01:22 -05:00
cahrens	08ce212bd5	Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy ... Conflicts: cms/static/js/models/settings/advanced.js	2013-02-06 10:35:12 -05:00
Don Mitchell	1cc62fae75	Catch null pointer for uninitialized dates	2013-02-06 10:23:29 -05:00
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
cahrens	8093de1d93	Set size of ACE Editor.	2013-02-06 09:49:27 -05:00
Don Mitchell	05ec0c11c6	Oops, when i alphabetized i got the value incorrectly. ... Fixed cancel to not retain new entries.	2013-02-06 09:08:28 -05:00
Don Mitchell	592d7e532b	Keys are sorted now	2013-02-06 08:58:20 -05:00
Don Mitchell	5275db9ab9	Cancel kind of works (reverts but leaves in new fields :-( ) ... Filter out system metadata fields	2013-02-05 19:17:43 -05:00
Don Mitchell	74d37327b2	Also this	2013-02-05 17:21:49 -05:00
Don Mitchell	8f16d639b7	CRUD on policy fields w/ some validation	2013-02-05 17:21:02 -05:00
Christina Roberts	3222e083eb	Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix ... Fix bug where we imported two functions w/ the same name	2013-02-05 13:36:56 -08: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
Calen Pennington	8360a7a7f5	Fix bug where we imported two functions w/ the same name	2013-02-05 16:23:10 -05:00
David Ormsbee	e50652e733	Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic ... Free courses from the confines of collectstatic	2013-02-05 10:32:54 -08:00
John Jarvis	bff477e8d3	Removing repos.json import	2013-02-05 11:35:12 -05:00
Calen Pennington	2551243dfa	Install the static_replace app for the management command	2013-02-05 11:06:46 -05:00
Calen Pennington	5eae9c3a40	Make lms and cms coverage reports cover common/djangoapps	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
Don Mitchell	07f87d4729	Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy	2013-02-04 15:34:19 -05:00
Don Mitchell	f48af8b80c	Server side controller and model stubbed in. Now to wire to view.	2013-02-04 15:34:05 -05:00
Brian Talbot	ffd585ae56	studio - resolved safari/webkit display issue with unit editing window's wrapper background color	2013-02-04 14:44:17 -05:00
Brian Talbot	6ca55b8458	studio - overview drag and drop: removed unused scss and hid new unit button while dragging	2013-02-04 14:35:04 -05:00
cahrens	ca2a375c17	saving work	2013-02-04 12:50:16 -05:00
Don Mitchell	902cdefefa	Added comments for unused 2nd arg on generateCheckHoverState	2013-02-04 12:05:49 -05:00
Don Mitchell	50eced5b32	Attempt to patch the dnd hesitation fixes onto master	2013-02-04 11:34:59 -05:00
cahrens	8f3e8024b9	Merge branch 'master' into feature/cas/manual-policy	2013-02-04 10:54:22 -05:00
Don Mitchell	1595bd9b0e	Move dnd code from base.js to a js file only loaded by overview.html	2013-02-01 17:20:58 -05:00
John Jarvis	f525b17b1a	pep8 cleanup	2013-02-01 13:13:16 -05:00
Christina Roberts	14ca42a5dc	Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists ... temporary style sync up for course info lists	2013-02-01 06:51:35 -08:00