14212 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chris Dodge	bb3b7cb3a9	add back the course info tab in the CMS	2012-12-13 16:28:47 -05:00
chrisndodge	5709ee014b	Merge pull request #1150 from MITx/bug/btalbot/cms-placeholdit ... bug - removed placeholdit image references in template HTML	2012-12-13 12:50:33 -08:00
Brian Talbot	fb47f30918	bug - removed placeholdit image references in template HTML	2012-12-13 15:48:39 -05:00
chrisndodge	094856e229	Merge pull request #1149 from MITx/style/studio/tom/ui-cleanups ... Various Style/UI Tweaks	2012-12-13 12:41:10 -08:00
David Ormsbee	97ab513a10	Merge pull request #1130 from MITx/feature/cale/fix-discussion-breakage ... Ignore discussion modules with missing keys when building the global dis...	2012-12-13 12:20:57 -08:00
David Ormsbee	85f198e36a	Merge pull request #1148 from MITx/fix/rocha/divide-create-dev-env-script ... Extract installation of system dependencies from create dev script	2012-12-13 12:17:32 -08:00
Brian Talbot	59f1b1d1f5	styling - re-aligned unit controls for unit editing and styled standard delete button	2012-12-13 15:15:30 -05:00
Carlos Andrés Rocha	3025a88d73	Extract installation of system dependencies from create dev script	2012-12-13 15:11:53 -05:00
Brian Talbot	15942aae05	styling - re-aligned unit edit controls and added visual divider	2012-12-13 15:02:38 -05:00
David Ormsbee	8fdf7f6cfd	Merge pull request #1138 from MITx/bug/tom/pearson-ie7 ... Bug/tom/pearson ie7	2012-12-13 11:31:26 -08:00
Carlos Andrés Rocha	ede96d777d	Add member services job descriptions ... [#40869383]	2012-12-13 14:27:04 -05:00
Jay Zoldak	c485e441a9	Do not copy already compiled coffee to js files from xmodule video and also do not save them in git	2012-12-13 14:26:27 -05:00
Brian Talbot	2524992965	styling - settings UI tweaks	2012-12-13 14:24:09 -05:00
Brian Talbot	090e83b709	styling - resolved FF top whitespace bug	2012-12-13 14:16:51 -05:00
Christina Roberts	c182b8ef08	Merge pull request #1145 from MITx/feature/dhm/cms-settings ... Feature/dhm/cms settings	2012-12-13 11:12:04 -08:00
Brian Talbot	f33efe3dde	settings - debugged height issue with new/manipulated grade bars and moved solution back to CSS layer	2012-12-13 13:45:57 -05:00
Brian Talbot	34441759dd	settings - added in preventDefault() for all grading controls that needed it	2012-12-13 13:44:03 -05:00
Don Mitchell	62f544479c	Merge pull request #1143 from MITx/feature/christina/misc ... Protect against graceperiodjson being null.	2012-12-13 10:42:18 -08:00
cahrens	e77a67a93a	Protect against graceperiodjson being null. ... r.don	2012-12-13 13:36:37 -05:00
Brian Talbot	6b17659195	styling - settings layout and delete buttons	2012-12-13 13:35:58 -05:00
Brian Talbot	3b784f2145	styling - setting form field layout	2012-12-13 13:21:43 -05:00
Brian Talbot	69c26a08e3	settings/style - general UI clean up - wip	2012-12-13 13:06:56 -05:00
Don Mitchell	9cc1b348fa	Merge branch 'feature/dhm/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings	2012-12-13 13:02:03 -05:00
Don Mitchell	9b9bdb44a3	Fix video string parse for empty and completely malformed strings	2012-12-13 12:58:59 -05:00
Don Mitchell	a39d609eea	more	2012-12-13 12:35:17 -05:00
Don Mitchell	595edac4c2	Caching changes to fix critical bug on other branch	2012-12-13 12:33:22 -05:00
Chris Dodge	10b417c85e	initial checkin of export	2012-12-13 11:53:52 -05:00
Brian Talbot	7d823d9ed9	resolving styling merge conflicts	2012-12-13 11:43:48 -05:00
Brian Talbot	9f863fd96e	styling - adjusting collapse button CSS lost in cms-master rebase	2012-12-13 11:37:51 -05:00
chrisndodge	aee4fd912c	Merge pull request #1142 from MITx/feature/dhm/cms-settings ... fix up some test failures	2012-12-13 08:30:58 -08:00
Chris Dodge	4ebc9a589d	fix up some test failures	2012-12-13 11:29:00 -05:00
Tom Giannattasio	2be1f852e7	clean up of users page	2012-12-13 11:28:59 -05:00
Tom Giannattasio	75c4909785	added modal cover for editors	2012-12-13 11:28:59 -05:00
Tom Giannattasio	d7b3f28d17	reworked add component steps	2012-12-13 11:28:59 -05:00
Tom Giannattasio	66004aeb2d	pulled out component types from behind add component button	2012-12-13 11:28:59 -05:00
Tom Giannattasio	5b81d6b8cc	cleaned up subsection and unit page	2012-12-13 11:28:59 -05:00
Tom Giannattasio	052b6f695a	cleaned up editor styles; cleaned up static tabs page	2012-12-13 11:26:10 -05:00
Tom Giannattasio	39a882e278	more defined header, new icons, cleaner static tabs page	2012-12-13 11:25:15 -05:00
Tom Giannattasio	95dfc730dc	new header styles; collapse all button added to courseware	2012-12-13 11:20:30 -05:00
Tom Giannattasio	8294b05802	style tweaks to tabs and static pages; key bindings for new user form	2012-12-13 11:20:30 -05:00
Tom Giannattasio	197ea33235	tweaked body color and window styles; adjusting new buttons	2012-12-13 11:20:30 -05:00
Tom Giannattasio	74ce3d225f	removed new course button on click to prevent multiple instantiations	2012-12-13 11:19:22 -05:00
Tom Giannattasio	131f475156	headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style	2012-12-13 11:19:22 -05:00
Tom Giannattasio	128a402b7f	fixed long header bug	2012-12-13 11:19:22 -05:00
Don Mitchell	909fd93c80	Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable ... Conflicts: cms/static/sass/_variables.scss	2012-12-13 10:40:49 -05:00
chrisndodge	6ab97b6fd9	Merge pull request #1125 from MITx/feature/dhm/cms-settings ... Feature/dhm/cms settings	2012-12-13 06:52:49 -08:00
Don Mitchell	41ca47edfc	Add flag to turn template caching on/off (default to off)	2012-12-13 09:47:51 -05:00
Brian Talbot	57385b8d3f	grading - resolved rebase/merge conflicts	2012-12-13 09:45:11 -05:00
Christina Roberts	113c99e0b1	Merge pull request #1141 from MITx/feature/christina/misc ... Try running xmodule Jasmine tests on Jenkins (again!).	2012-12-13 06:28:27 -08:00
Christina Roberts	c4e86140c1	Try running xmodule Jasmine tests on Jenkins (again!).	2012-12-13 09:26:46 -05:00