9424 Commits

Author	SHA1	Message	Date
Frances Botsford	e69b5c4792	adjusted width of header nav to prevent wrapping in PC FF, also put max-width on Org name and Course number in header to prevent the nav from getting bumped way over	2013-05-17 14:07:06 -04:00
Christina Roberts	f4044ed1e8	Merge pull request #2061 from edx/bug/christina/static-pages ... Make sure to get the correct modulestore on delete (static tabs do not e...	2013-05-17 09:59:59 -07:00
Carlos Andrés Rocha	35bd38d677	Add status app with simple view to check celery workers	2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha	c05efbc31e	Added base Celery settings	2013-05-17 11:33:14 -04:00
cahrens	1c9ebbc9ef	Put colon on Visibility back in.	2013-05-17 11:02:25 -04:00
Brian Talbot	85f2be44b5	studio - resolves line-height issue that core typography settings creates with tooltip rendering	2013-05-17 10:46:58 -04:00
marco	1f43fa163a	internationalization stripped out	2013-05-17 10:29:24 -04:00
marco	29b7778461	initial i18n changes to unit.html, component.html, and the individual setting type template files	2013-05-16 17:17:43 -04:00
cahrens	944d2d61f1	Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore). ... #324	2013-05-16 17:15:53 -04:00
Diana Huang	1c2175304e	Merge branch 'master' into drupal-new	2013-05-16 16:27:36 -04:00
marco	f58deb4c3c	removed latex compiler buttom from settings tab	2013-05-16 15:42:29 -04:00
Arthur Barrett	1fbe43a650	Merge branch 'master' into feature/abarrett/lms-notes-app	2013-05-16 13:23:12 -04:00
Arthur Barrett	430e009b5d	added TODO for open ended and notes tab advanced policy settings.	2013-05-16 13:22:40 -04:00
cahrens	01ff8396e3	Fix CodeMirror initialization problem.	2013-05-16 12:34:39 -04:00
Will Daly	1e1e6450df	Pep8 fixes	2013-05-16 11:33:50 -04:00
Will Daly	342b3bb0e9	Merge branch 'master' into feature/will/ci-lettuce-tests ... Resolved conflict with changes to Rakefile in master Conflicts: rakefile	2013-05-16 11:21:59 -04:00
cahrens	235ecff28b	In progress.	2013-05-16 10:40:48 -04:00
marco	ef14155306	cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill	2013-05-16 09:50:16 -04:00
Will Daly	e78436db18	Merge branch 'feature/will/ci-lettuce-tests' of https://github.com/edx/edx-platform into feature/will/ci-lettuce-tests	2013-05-15 17:07:24 -04:00
Will Daly	3a981cfa05	Removed COURSES_ROOT and DATA_DIR from cms/envs/acceptance.py	2013-05-15 17:06:44 -04:00
marco	bbb6a3c60d	resolved metadata-edit conflict, adding in latex item into settings	2013-05-15 16:27:04 -04:00
marco	12dae84a07	commented out firefox polyfill ad well as xmodule css editor changes	2013-05-15 16:07:45 -04:00
Will Daly	59f68c2179	Added comments for skipped tests	2013-05-15 15:45:12 -04:00
Brian Talbot	d1c629882c	studio - fixes Sass variable defintion to ensure the older -serif references the proper new -sans-serif variable	2013-05-15 15:42:59 -04:00
cahrens	c85cc5a3a7	Fix bad merge.	2013-05-15 15:35:18 -04:00
cahrens	d72b6b05bf	Merge branch 'master' into feature/christina/metadata-ui ... Conflicts: cms/static/sass/views/_static-pages.scss	2013-05-15 15:29:27 -04:00
cahrens	724678dd3e	Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui	2013-05-15 15:26:02 -04:00
cahrens	d35b29031f	Clean up editable_metadata_fields.	2013-05-15 14:01:18 -04:00
marco	ba11d37ba9	clear button to match help icon visually	2013-05-15 13:58:08 -04:00
marco	2f8e8f4881	border around course introduction which was lost in code mirror styling for component editors	2013-05-15 13:50:19 -04:00
marco	cbdadaee1d	updates moved slightly, will not use new styling	2013-05-15 13:39:38 -04:00
cahrens	305b555d63	Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui	2013-05-15 13:33:41 -04:00
marco	b3e41d19f6	styling for static pages updated	2013-05-15 13:29:35 -04:00
marco	0422350e8c	final changes to codemirror styling, and clean up style for settings button clearing	2013-05-15 12:05:43 -04:00
cahrens	06d315484f	Set "editing" name.	2013-05-15 11:52:38 -04:00
marco	5f4bded3db	Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui	2013-05-15 11:41:24 -04:00
marco	56df114edb	style changes to component header	2013-05-15 11:41:19 -04:00
Will Daly	1240c5ae92	Merge branch 'master' into feature/will/ci-lettuce-tests	2013-05-15 11:40:54 -04:00
cahrens	a16740691f	Minor update.	2013-05-15 11:39:07 -04:00
cahrens	4152e4602d	Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui ... Conflicts: cms/static/coffee/src/views/module_edit.coffee	2013-05-15 11:36:32 -04:00
cahrens	faf31d9728	Get toggling between Editor and Settings working.	2013-05-15 11:34:49 -04:00
Will Daly	b3e959773d	Disabled logging of warnings/errors for acceptance tests ... to make the logs readable	2013-05-15 11:31:52 -04:00
marco	63960ee4a2	style change for is-set	2013-05-15 11:26:34 -04:00
Chris Dodge	6cec66979a	fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test	2013-05-15 11:16:47 -04:00
Arthur Barrett	3a178bab1f	Merge branch 'master' into feature/abarrett/lms-notes-app	2013-05-15 11:12:42 -04:00
marco	e157173c11	styling adjustments to codemirror and wrapped polyfill into a function	2013-05-15 10:53:54 -04:00
Will Daly	3217989de5	Fixed/skipped CMS tests in subsection and signup.	2013-05-15 10:14:37 -04:00
Chris Dodge	ce52be1e57	Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master	2013-05-15 09:59:26 -04:00
Will Daly	8e069c1faa	Skip tests that break on Ubuntu due to alerts (which will be removed ... soon anyway). Removed @skip-phantom and @skip-firefox tags Fixed sign up test to work in Ubuntu Added comments	2013-05-15 09:39:07 -04:00
marco	b9fc3f9e07	updated styles for input type numbers	2013-05-15 00:04:41 -04:00