10630 Commits

Author	SHA1	Message	Date
Chris Dodge	cdc353b61c	add back dropped import	2013-03-28 14:07:13 -04:00
Chris Dodge	8fdeee06ed	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements ... Conflicts: cms/one_time_startup.py common/lib/xmodule/xmodule/modulestore/mongo.py	2013-03-28 13:27:29 -04:00
Brian Talbot	2cd8f448f7	studio - resolving merge with tender widget branch	2013-03-28 12:48:42 -04:00
Brian Talbot	bc248a1d4a	studio - tender widget: revised styling with spam protection back in place	2013-03-28 12:47:08 -04:00
Brian Talbot	653369e3cf	resolving local stash merge	2013-03-28 12:37:58 -04:00
Will Daly	6f8c9b4a9f	Optimized ModuleStoreTestCase to reload templates only once ... over all test runs.	2013-03-28 12:31:46 -04:00
Chris Dodge	1c2a8a97cd	remove unnecessary debug log message	2013-03-28 11:38:22 -04:00
Chris Dodge	197f52539f	add some unit tests	2013-03-28 11:37:53 -04:00
cahrens	b2bda10435	Merge branch 'master' into bug/christina/studio ... Conflicts: cms/djangoapps/contentstore/features/common.py cms/djangoapps/contentstore/features/section.py cms/djangoapps/contentstore/features/subsection.feature	2013-03-28 11:17:47 -04:00
cahrens	7279f9c460	Bug fix for grading type not showing on course outline (#258).	2013-03-28 10:54:10 -04:00
Jay Zoldak	c9a7be6b9b	Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers ... Feature/will/lettuce test helpers	2013-03-28 07:26:14 -07:00
cahrens	2d677a834c	Test for due dates.	2013-03-28 10:24:31 -04:00
Don Mitchell	fece937669	Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata ... Fix/cdodge/use request scoped cache for metadata inheritance	2013-03-28 06:51:20 -07:00
Chris Dodge	3cdd973af4	get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore	2013-03-28 09:28:19 -04:00
Chris Dodge	6c67ed1f57	Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/course-overview-perf ... Conflicts: common/lib/xmodule/xmodule/modulestore/mongo.py	2013-03-28 09:28:12 -04:00
Chris Dodge	b609a96902	ummm. forgot to commit stuff	2013-03-27 22:51:52 -04:00
Brian Talbot	c8ab45cc57	studio - footer help ui revamp - animation, structure, styling - WIP	2013-03-27 17:40:24 -04:00
Will Daly	9c671163fd	Added exc_info=True to log.warning ... Changed log.exception to log.warning	2013-03-27 17:11:02 -04:00
Will Daly	f038237ee9	Changed log.exception to log.warning	2013-03-27 16:34:08 -04:00
Jay Zoldak	6564cc57e6	Fix typo with hyphen in cms lettuce feature files	2013-03-27 16:29:55 -04:00
Brian Talbot	756f75951d	studio - in progress work on help UI	2013-03-27 16:28:49 -04:00
Will Daly	df1be87739	* Changed 404 errors to 400 errors ... * Removed duplicate traceback log message * Now provide string, not Exception, as second tuple item to raise	2013-03-27 15:20:40 -04:00
cahrens	5c78218b13	Don't need to convert to milliseconds.	2013-03-27 14:52:27 -04:00
cahrens	22537ffd3b	Don't need to convert to milliseconds.	2013-03-27 14:51:39 -04:00
Will Daly	99cd3fafdb	Added error handling of XModule processing errors to CMS ... Added tests for SchematicResponse error handling	2013-03-27 14:48:44 -04:00
cahrens	227a5e8266	Delete converters, move unit tests to test_fields, add new additional test cases.	2013-03-27 12:56:06 -04:00
Brian Talbot	3a4bdf19fb	studio - tweaking footer navigation for tender widget label	2013-03-27 12:26:49 -04:00
Brian Talbot	754e30240d	studio - adjusting tender widget window height based on field removal	2013-03-27 11:01:25 -04:00
Victor Shnayder	68902b8039	Merge pull request #1747 from MITx/fix/cdodge/should-return-404-on-bad-asset-request ... if we parse an invalid location in the content store middleware, then re...	2013-03-27 07:09:38 -07:00
Brian Talbot	e3c646492c	studio - made provide feedback conditional for logged in users	2013-03-27 01:39:24 -04:00
Brian Talbot	74439746cc	studio - made provide feedback conditional for logged in users	2013-03-27 01:38:36 -04:00
Brian Talbot	2120481738	studio - corrected JQ selector for smoothscrolling in-page links	2013-03-27 01:34:25 -04:00
Brian Talbot	25acab497e	studio - corrected JQ selector for smoothscrolling in-page links	2013-03-27 01:33:04 -04:00
Brian Talbot	6889b2015b	studio - added in revised footer styles and fix for smoothscroll	2013-03-27 01:24:31 -04:00
Chris Dodge	b0e2c82ad3	actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test.	2013-03-26 20:02:29 -04:00
Calen Pennington	b975d4d90c	Fix tests	2013-03-26 16:43:58 -04:00
Chris Dodge	7a23893557	wip	2013-03-26 16:40:28 -04:00
Brian Talbot	4f7e09e936	Merge branch 'master' into feature/btalbot/studio-tenderwidget	2013-03-26 14:49:14 -04:00
Brian Talbot	7e56e98c58	firming up behavior/styling for tender widget - including errors	2013-03-26 14:46:38 -04:00
Will Daly	6298a4ceab	Fixed lettuce tests in cms that were broken in the last rebase	2013-03-26 13:05:09 -04:00
Brian Talbot	8a4047d5dd	studio - added smoothscroll to top of view and wired footer tender widget link	2013-03-26 12:48:51 -04:00
Brian Talbot	7c68508b85	studio - finalized tender widget styling	2013-03-26 12:42:30 -04:00
Will Daly	0500ba4dd5	Disabled pylint warnings for lettuce steps: ... * Missing docstring * Redefining name from outer scope	2013-03-26 11:46:31 -04:00
Will Daly	27d5ebf027	pep8 fixes	2013-03-26 11:44:57 -04:00
Will Daly	00d25b684c	Moved modulestore flush code into terrain/course_helpers	2013-03-26 11:44:57 -04:00
Will Daly	a58ae9b62d	Refactored studio lettuce test section.py to use more of ui helpers	2013-03-26 11:44:57 -04:00
Will Daly	e69931ec5a	Refactored studio lettuce tests to use terrain/ui_helpers for ui ... manipulation	2013-03-26 11:44:56 -04:00
Brian Talbot	87f545329a	studio - adding in tender-widget sass file	2013-03-26 11:05:33 -04:00
cahrens	f681d4300d	More cleanup in base.js.	2013-03-26 10:42:44 -04:00
cahrens	83eda6ac93	Merge branch 'master' into bug/christina/studio	2013-03-26 10:34:37 -04:00