1495 Commits

Author	SHA1	Message	Date
Arthur Barrett	5bbb70ef8a	Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu.	2013-03-05 13:47:02 -05:00
Arthur Barrett	c9b2a6a203	updated CSS to use the new advanced icon	2013-03-05 10:52:39 -05:00
Arthur Barrett	fa3961d4dd	merged openended and advanced categories per discussion at today's standup	2013-03-05 10:51:59 -05:00
Brian Talbot	ef9f963f49	studio - advanced modules: added in advanced module button icon per artie/vik work	2013-03-05 10:39:21 -05:00
Brian Talbot	cc3b9557f9	studio - open ended and annotations: added in component button icon assets and styling	2013-03-04 17:02:59 -05:00
Vik Paruchuri	f8b0338dee	Change name of annotatable, add in sass for advanced module	2013-03-01 16:26:48 -05:00
Vik Paruchuri	a2c03fec15	Make parsing more robust	2013-03-01 16:19:16 -05:00
Vik Paruchuri	7a8e43a9c5	Json parsing fixes	2013-03-01 15:40:46 -05:00
Vik Paruchuri	386ab10edb	Apparently meld is weird at indenting	2013-03-01 15:31:42 -05:00
Vik Paruchuri	a09a4febce	Fix category generation	2013-03-01 15:30:22 -05:00
Vik Paruchuri	fb37d46bd8	Minor bugfixes	2013-03-01 15:28:33 -05:00
Vik Paruchuri	d039776218	Merge branch 'feature/vik/studio-oe' into feature/vik/advanced-studio ... Conflicts: cms/djangoapps/contentstore/views.py	2013-03-01 15:25:53 -05:00
Arthur Barrett	67b73242ea	added advanced component button with ability to specify components in course policy.	2013-03-01 15:11:42 -05:00
Vik Paruchuri	9f020e228b	Add in some dummy values	2013-03-01 14:50:40 -05:00
Vik Paruchuri	a818191297	Prelim support for combinedopenended and peergrading types	2013-03-01 14:12:04 -05:00
Christina Roberts	69ef622afd	Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor ... Fix latex high-level source editor in current version of cms / studio	2013-02-28 10:02:09 -08:00
Chris Dodge	8a7211da05	remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument.	2013-02-28 09:40:30 -05:00
ichuang	b75ccbdcce	address Christina's comments re js in latex2edx source-edit.html	2013-02-28 04:21:43 +00:00
Chris Dodge	905199b5eb	restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive.	2013-02-27 22:37:13 -05:00
Brian Talbot	73ae818958	studio - fixing padding of codeMirror fields to match height of others given new line height	2013-02-27 13:08:56 -05:00
Brian Talbot	cdd6ce708e	studio - reducing line height for codemirror JSON lines	2013-02-27 13:07:58 -05:00
Brian Talbot	524f48b68e	studio - fixing padding of codeMirror fields to match height of others given new line height	2013-02-27 13:03:36 -05:00
Brian Talbot	45520fe124	studio - fixing line heights not syncing with code mirror lines and cursor	2013-02-27 12:59:25 -05:00
Carlos Andrés Rocha	2ca303c95d	Merge pull request #1526 from MITx/feature/cas/manual-policy-merged ... Feature/cas/manual policy merged	2013-02-27 09:02:07 -08:00
Don Mitchell	d2e6f6dccb	Fixes for code review comments	2013-02-26 13:56:00 -05:00
Don Mitchell	bb0ad61f81	Somehow the saves changed to just sets w/ don't send data to the server.	2013-02-25 12:13:50 -05:00
ichuang	b6cf206fc7	fix latex high-level-source editor	2013-02-24 01:55:57 +00:00
Jay Zoldak	3a6f43f320	Create additional BDD spec tests for Course Advanced Settings editor	2013-02-22 16:27:05 -05:00
Jay Zoldak	85b75badd7	Refactor lettuce commands for navigation to the advanced settings page	2013-02-22 14:07:22 -05:00
Jay Zoldak	af2690fcaf	Update lettuce test framework to use a course factory instead of the studio UI for creating courses	2013-02-22 12:36:27 -05:00
Don Mitchell	c11d627c88	Chrome/Safari don't use keypress for backspace and delete.	2013-02-22 11:00:27 -05:00
Mark L. Chang	f1c8301e4f	added question marks	2013-02-21 22:47:48 -05:00
Jay Zoldak	e337292b5f	Fix existing advanced settings lettuce tests.	2013-02-21 18:20:42 -05:00
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	c10dc838b2	Fix tip on JSON key value pairs	2013-02-21 15:01:12 -05:00
Don Mitchell	e5efcf65d3	remove console.log	2013-02-21 13:34:11 -05:00
Don Mitchell	851a99cb13	remove commented out code	2013-02-21 13:32:29 -05:00
Don Mitchell	697bd5c97b	also this one	2013-02-21 13:28:43 -05:00
Don Mitchell	116c74c075	Highlighting of field labels and smarter decision as to when to show the ... save cancel bar.	2013-02-21 13:27:36 -05: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
cahrens	cc63f9c2db	Unique IDs, other cleanup.	2013-02-20 17:11:34 -05:00
Brian Talbot	8b5f088eb9	studio - fixed alignment of new section field and controls	2013-02-20 16:43:13 -05:00