1268 Commits

Author	SHA1	Message	Date
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
Brian Talbot	ed3f3b02d6	studio - course export UI alpha - roughing in states/views	2012-12-26 09:10:05 -05:00
Don Mitchell	866ce8d2ae	Merge pull request #1194 from MITx/feature/christina/misc ... Feature/christina/misc	2012-12-20 13:45:27 -08:00
cahrens	91ce214964	Fix for Studio #96.	2012-12-20 14:59:21 -05:00
cahrens	90ce6967aa	Fix for Studio #96.	2012-12-20 14:58:02 -05:00
Don Mitchell	90e12ff46b	Merge pull request #1192 from MITx/feature/cdodge/clone-course ... implement course clone and delete functionality from the command line	2012-12-20 11:29:49 -08:00
Chris Dodge	b40a8a3e9e	implement course clone and delete functionality from the command line	2012-12-20 13:55:15 -05:00
Don Mitchell	17a1e281b1	Unit tests now work!!!	2012-12-20 13:42:57 -05:00
Don Mitchell	683535d913	Another bug for when the content for an update is more than one element.	2012-12-20 11:09:10 -05:00
Don Mitchell	d66f33956e	Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12	2012-12-19 17:31:30 -05:00
Don Mitchell	e37180e074	Generalized the grader drop down and applied to edit_subsection	2012-12-19 17:31:06 -05:00
Don Mitchell	14330ebc4a	Merge pull request #1187 from MITx/feature/christina/misc ... Fix for Studio #87, plus some cleanup.	2012-12-19 14:03:05 -08:00
cahrens	61c19dbc70	Fix for Studio #87, plus some cleanup.	2012-12-19 16:55:39 -05:00
Chris Dodge	91b0fddfce	malformed url generation for User's tab	2012-12-19 13:49:47 -05:00