1386 Commits

Author	SHA1	Message	Date
Victor Shnayder	8d76556729	Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings ... Fix/cdodge/serializing ints as empty strings	2013-02-21 12:12:44 -08:00
Jay Zoldak	9eb2766943	Change test modulestore naming differentiation scheme to uuid	2013-02-21 13:07:14 -05:00
Chris Dodge	bc1ee3dbfa	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings	2013-02-21 12:56:20 -05:00
Chris Dodge	041d28f0e9	use better variable names to assert that the expected item was indeed loaded	2013-02-21 12:56:17 -05:00
Chris Dodge	fa3402a977	template name got changed. Need to reflect that on test.	2013-02-21 12:25:10 -05:00
Chris Dodge	bb75a23101	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings	2013-02-21 11:58:52 -05:00
David Ormsbee	3494d58450	Merge pull request #1532 from MITx/feature/ned/clean_up_tests ... Make sure temp directories are properly cleaned up so running tests does...	2013-02-21 08:52:09 -08:00
Ned Batchelder	c3b571bf9b	Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.	2013-02-21 11:38:45 -05:00
Don Mitchell	ba7959fc4d	Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling ... Feature/cdodge/metadata inheritence crawling	2013-02-21 08:29:54 -08:00
Chris Dodge	a7f6545cbc	add unit test	2013-02-21 11:22:20 -05:00
Brian Talbot	8b5f088eb9	studio - fixed alignment of new section field and controls	2013-02-20 16:43:13 -05:00
Chris Dodge	bd188f92ef	put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case	2013-02-20 16:20:39 -05:00
Christina Roberts	52caae2fee	Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome ... Adding in Studio Page headers and actions + help text	2013-02-20 06:44:16 -08:00
Jay Zoldak	30edc380e1	Change coverage report config to reflect refactoring of terrain files	2013-02-20 09:31:50 -05:00
Brian Talbot	266e8951a4	made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750	2013-02-19 17:18:09 -05:00
Jay Zoldak	db6fa9a3aa	Pep8fix lettuce test code	2013-02-19 16:46:32 -05:00
Jay Zoldak	8c423da6db	Updated test to reflect new class name for course titles.	2013-02-19 13:50:40 -05:00
Jay Zoldak	301d58d648	Update lettuce test with new button name for add new section.	2013-02-19 13:31:11 -05:00
Brian Talbot	585dff521a	Merge branch 'master' into feature/btalbot/studio-pagechrome	2013-02-19 12:27:49 -05:00
Brian Talbot	fca98c19a5	studio - adding in info icon to page intro help and making icon classes consistent in all new references	2013-02-19 12:13:08 -05:00
cahrens	596de8ab2c	Hook up "View Live" buttons and get "New Static Tab" working again.	2013-02-19 11:34:41 -05:00
Jay Zoldak	2e85ba1a27	Omit migrations from code coverage reports. ... Also omit portal and terrain, which are used for the lettuce testing framework.	2013-02-19 10:54:02 -05:00
Chris Dodge	1a2e794126	add test of inheritance on xmodule insert	2013-02-19 09:51:07 -05:00
Don Mitchell	cfa13922f5	Change url for login from login to signin.	2013-02-15 17:30:24 -05:00
Brian Talbot	9eb02a8a26	studio - resolving base.js spacing/conflicts	2013-02-15 16:57:42 -05:00
cahrens	5acf9cb3d2	Reformat to 4 spaces.	2013-02-15 14:46:41 -05:00
Brian Talbot	3c6caa611c	resolving local merge	2013-02-15 14:24:42 -05:00
Brian Talbot	93949ab342	resolving local merge problem	2013-02-15 14:12:46 -05:00
Brian Talbot	a5e2b5c53a	resolving merge conflict and missing Sass mixin	2013-02-15 14:10:52 -05:00
Jay Zoldak	34a4b35e66	Fix lettuce acceptance tests to reflect the new soft landing page changes.	2013-02-15 14:07:46 -05:00
Brian Talbot	cb127d473d	studio - page headers: revised where new course form fields are placed in dashboard	2013-02-15 11:40:06 -05:00
Brian Talbot	20553b00d3	resolving merge conflict with master	2013-02-15 09:32:38 -05:00
Brian Talbot	6c95460761	studio - resolving merge from master	2013-02-15 09:15:06 -05:00
Don Mitchell	bfcc0559a7	Merge pull request #1503 from MITx/fix/cdodge/export-policy-json ... add exporting of policy.json	2013-02-14 12:47:37 -08:00
Chris Dodge	ea068d4aa8	add exporting of policy.json	2013-02-14 14:19:38 -05:00
Brian Talbot	9feb810006	studio - final prep of introduction areas (with fix for current page content margins)	2013-02-14 13:16:10 -05:00
Brian Talbot	bd98b2726a	resolving local merge conflict	2013-02-14 13:00:51 -05:00
Brian Talbot	c81f958788	studio - final prep of introduction areas (with fix for current page content margins)	2013-02-14 13:00:14 -05:00
Brian Talbot	9b09d043bd	studio - adding introduction areas to all templates and infrastructure for its contnet	2013-02-14 12:49:58 -05:00
Mark L. Chang	859cfff870	updated modal copy and alt text	2013-02-14 12:42:17 -05:00
Brian Talbot	47c117bf03	studio - page headers: resolved new course update creation JS issue caused by new markup	2013-02-14 10:52:25 -05:00
Brian Talbot	1a1be106ae	studio - page headers: added in view live links to course dashboard	2013-02-14 10:14:10 -05:00
Brian Talbot	2024f9eeca	studio - page headers: added view course button to course outline	2013-02-14 09:48:19 -05:00
Brian Talbot	6ade6983ae	studio - page headers: added in logic to style page actions' height based on title having a subtitle or not	2013-02-14 09:38:32 -05:00
Brian Talbot	41dc655cce	resolving local merge conflict	2013-02-14 09:03:46 -05:00
Brian Talbot	54cc51bccf	studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature	2013-02-14 09:02:51 -05:00
Brian Talbot	557beea31f	studio - hiding mast area for subsections	2013-02-14 09:00:57 -05:00
Mark L. Chang	b7e8335a19	switched taxonomy back to section/subsection/unit	2013-02-13 22:53:46 -05:00
Brian Talbot	d571c7791a	studio - resetting Unit UI HTML back to prev version for now	2013-02-13 17:01:45 -05:00
Brian Talbot	c250bc8b59	studio - page headers: setting up needed future CSS	2013-02-13 16:59:56 -05:00