1031 Commits

Author	SHA1	Message	Date
Don Mitchell	2d8ddb0dcb	Ever slightly more rigorous test. actually look for the markdown field ... in the model as well as the ancillary info	2013-01-09 10:47:03 -05:00
Don Mitchell	ae4e7815a9	CapaDescriptor new unit tests	2013-01-08 13:16:38 -05:00
Don Mitchell	6e2b4a07d8	Added is_empty to model presented to unit.html	2013-01-08 11:18:57 -05:00
Don Mitchell	76f2ef6f7c	Empty template now recognized as allowing markdown editing ... Save saves markdown and updates the xml	2013-01-08 10:53:45 -05:00
cahrens	e296d52c7d	merge	2013-01-07 12:06:12 -05:00
Don Mitchell	12abdbce73	Added 'has_markdown' property to templates in unit.html so that we can ... differentiate them in the drop down (just added MD to names for now--brian's doing the official differentiation)	2013-01-07 10:55:10 -05:00
Don Mitchell	2e527a6ae0	Fixed all regex's in toXml (I hope) and added 2 markdown templates	2013-01-04 17:15:44 -05:00
cahrens	6d732c217b	Tabs now showing.	2013-01-04 09:04:27 -05:00
cahrens	533f4876b5	Rename, add css file.	2013-01-03 14:27:32 -05:00
cahrens	b4312cbfef	Starting the markdown editor.	2013-01-03 13:39:01 -05:00
cahrens	e09a8e4a9b	Don't show markdown if it doesn't exist.	2013-01-03 12:50:38 -05:00
cahrens	1c886b33cd	Get buttons working again (with old behavior).	2013-01-03 12:24:17 -05:00
Brian Talbot	439addc130	resolving further Sass conflicts within unit editing view styling	2013-01-03 11:49:58 -05:00
Brian Talbot	7b75703556	resolving Sass issues caused by previous merge conflict resolution in branch	2013-01-03 11:44:09 -05:00
cahrens	e60230dd5a	More deletion	2013-01-03 11:21:01 -05:00
Don Mitchell	702636c00c	Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor	2013-01-03 11:01:56 -05:00
Don Mitchell	31141299e8	Cache to pull CR's cleanup of branch	2013-01-03 11:00:41 -05:00
cahrens	b91e85c09f	Remove tiny_mce.	2013-01-03 10:53:42 -05:00
Chris Dodge	e70db062b2	Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge ... Conflicts: requirements.txt	2013-01-03 10:46:24 -05:00
Chris Dodge	7229a9cdaf	perform a new merge from master, resolve conflicts	2013-01-03 10:43:03 -05:00
Don Mitchell	4f32d5f34d	Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor ... Conflicts: cms/static/sass/_assets.scss cms/static/sass/_base.scss cms/static/sass/_unit.scss cms/templates/unit.html	2013-01-02 17:39:27 -05:00
chrisndodge	edd9b2bc7b	Merge pull request #1220 from MITx/fix/cdodge/handout-links ... trigger another build	2013-01-02 12:02:24 -08:00
Chris Dodge	b5ccb4b8fc	trigger another build	2013-01-02 15:01:21 -05:00
chrisndodge	fa0fd4b50b	Merge pull request #1219 from MITx/fix/cdodge/handout-links ... another comment commit just to trigger a new build	2013-01-02 11:29:56 -08:00
Chris Dodge	d008cb9f3c	another comment commit just to trigger a new build	2013-01-02 14:25:35 -05:00
Brian Talbot	a5aafc42ad	studio - resolved unit editing bug where larger images would overflow out of editing visual area	2013-01-02 12:58:59 -05:00
Chris Dodge	cf3df23094	basically force another build by adding a comment	2012-12-28 16:48:02 -05:00
Chris Dodge	f343052711	add a comment. Namely we just want to trigger another build.	2012-12-28 14:26:52 -05:00
Chris Dodge	6d20292ae8	add unit test to make sure rewriting is occuring when querying the handouts	2012-12-28 12:21:14 -05:00
Chris Dodge	7a4d89b1ad	add in static asset link rewriting to the Course Handout section	2012-12-28 11:34:45 -05:00
Chris Dodge	507a1dc073	remove unused white space and imports	2012-12-27 16:33:10 -05:00
Chris Dodge	c0f12e69f7	fixes on the export. There's some attributes not being handled correctly	2012-12-27 16:15:52 -05:00
Chris Dodge	239b118abe	add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup.	2012-12-27 15:31:12 -05:00
Chris Dodge	8e5fc2917a	Merge branch 'feature/btalbot/cms-export' into feature/cdodge/export	2012-12-27 14:43:36 -05:00
Chris Dodge	3fa425c5d0	add unit test for import->export->import simple flow	2012-12-27 14:40:38 -05:00
Chris Dodge	625237601f	Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export ... Conflicts: common/lib/xmodule/xmodule/contentstore/content.py common/lib/xmodule/xmodule/contentstore/mongo.py	2012-12-27 14:16:40 -05:00
Don Mitchell	53b73ca3da	Merge pull request #1208 from MITx/feature/cdodge/clone-course ... fix up some thumbnail issues. Also we need to manage the user permission...	2012-12-27 09:26:51 -08:00
Chris Dodge	6951865229	add unit tests for course cloning and deleting	2012-12-27 12:20:45 -05:00
Chris Dodge	9dff39dd6d	start adding clone unit test	2012-12-27 11:25:04 -05:00
Don Mitchell	da343fd1d7	Finally! Details unit tests work and pass. Grading ones are fairly far ... along.	2012-12-27 11:22:15 -05:00
Chris Dodge	fe408be1cc	message edit	2012-12-27 10:32:07 -05:00
Chris Dodge	7088821233	fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message	2012-12-27 10:30:26 -05:00
Chris Dodge	28d9827468	fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course	2012-12-27 10:20:28 -05:00
Don Mitchell	83bc9d7bf8	Grader unit tests (partial)	2012-12-26 15:48:37 -05:00
Don Mitchell	8d9a221945	Delete not-yet-implemented file	2012-12-26 13:50:01 -05:00
Don Mitchell	88b2457c13	Bug 98: no unit tests b/c it's just text in hmtl	2012-12-26 11:47:42 -05:00
Don Mitchell	a35c1386f2	Bug 99: don't show date as 'Unset' but leave out altogether if not set ... plus commented out failing unit tests until I can get someone to help debug them.	2012-12-26 11:30:31 -05:00
Don Mitchell	58abb10c2d	Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12	2012-12-26 10:31:10 -05:00
Don Mitchell	ff490599fa	Debugging unit tests	2012-12-26 10:29:35 -05:00
Brian Talbot	c9e5c47b30	removed progress bar UI from export UI	2012-12-26 09:19:08 -05:00