756 Commits

Author	SHA1	Message	Date
Don Mitchell	5331ae055f	Got time change hooked up but gained a spurious call to change on date ... change.	2012-11-27 15:15:28 -05:00
Don Mitchell	d165da3f81	Merge branch 'feature/btalbot/cms-settings' of ... git@github.com:MITx/mitx.git into feature/dhm/cms-settings Conflicts: cms/static/sass/bourbon cms/templates/settings.html lms/static/sass/bourbon	2012-11-27 13:33:19 -05:00
Don Mitchell	5e2dba6bad	Minor cache to pull talbott's changes	2012-11-27 13:22:44 -05:00
Brian Talbot	bffd425562	settings - revised date and time picker markup to use already set conventions with the .datepair class	2012-11-27 13:05:00 -05:00
Don Mitchell	8a27e1776b	Merge branch 'feature/btalbot/cms-settings' of ... git@github.com:MITx/mitx.git into feature/dhm/cms-settings Conflicts: cms/static/sass/bourbon cms/templates/settings.html lms/static/sass/bourbon	2012-11-27 12:12:43 -05:00
Don Mitchell	2238019539	Details tab works except for file references	2012-11-27 11:32:03 -05:00
Brian Talbot	c3e11b4217	settings - added in additional time fields for course dates	2012-11-27 09:50:25 -05:00
Tom Giannattasio	153285c3ea	reset default tab	2012-11-26 16:28:52 -05:00
Tom Giannattasio	bb2e78ce30	reworked slider logic	2012-11-26 15:54:46 -05:00
Brian Talbot	be848023a2	settings - added in example of anon discussions disabled state	2012-11-26 14:21:01 -05:00
Brian Talbot	4027576e15	settings - resolved date and time picker UI bugs	2012-11-26 14:01:11 -05:00
Brian Talbot	4097bc1022	settings - revised grading slider UI cosmetics	2012-11-26 13:33:57 -05:00
Brian Talbot	ef95e1d95f	settings - added in controls for sorting discussion categories	2012-11-26 11:48:56 -05:00
Don Mitchell	f0c94a2c7e	Beginning test of details tab.	2012-11-21 15:17:18 -05:00
Brian Talbot	baf8b481c8	settings - added in drag and drop anchors - wip	2012-11-21 13:58:56 -05:00
Don Mitchell	f8ee5c2614	Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into ... feature/dhm/cms-settings Conflicts: cms/templates/settings.html	2012-11-20 11:55:19 -05:00
Don Mitchell	339949f934	Another checkpoint before pull/merge	2012-11-20 11:37:14 -05:00
Brian Talbot	6c3c377619	settings - general class/ID naming convention cleaning	2012-11-20 11:34:16 -05:00
Brian Talbot	a69d3cb064	settings - discussion UI revision	2012-11-20 09:32:13 -05:00
Brian Talbot	278c731aef	settings - made assignment types user-determined fields vs. pre-set types in UI	2012-11-20 09:26:40 -05:00
Brian Talbot	f29f605f62	settings - refactored radio/checkbox input formatting	2012-11-20 08:40:45 -05:00
Don Mitchell	7fecf1f212	Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into ... feature/dhm/cms-settings Conflicts: cms/static/sass/_settings.scss cms/templates/settings.html	2012-11-19 16:20:12 -05:00
Don Mitchell	241c9bb1ac	Checkpoint to rebase	2012-11-19 16:02:30 -05:00
Don Mitchell	a9233dfd44	Merge branch 'course-info' into feature/dhm/cms-settings ... Conflicts: cms/djangoapps/contentstore/views.py	2012-11-19 16:00:27 -05:00
Brian Talbot	d370307917	settings - simplified course details fields per Mark's feedback and radio/checkbox UI	2012-11-19 15:48:57 -05:00
Brian Talbot	c7784e30fd	settings - radio/checkbox UI - wip	2012-11-19 14:59:25 -05:00
Brian Talbot	ab87ff6b20	settings - field alignment, radio/checkbox formatting	2012-11-19 14:55:32 -05:00
Don Mitchell	88cc5a080b	Everything tested and ready for Tom to fix	2012-11-19 10:38:58 -05:00
Don Mitchell	91a91f4ddb	Hopefully the course-info changes I had made w/o link destruction	2012-11-19 10:38:58 -05:00
Victor Shnayder	b18136d0cd	remove (almost) all references to askbot.	2012-11-19 10:18:03 -05:00
Brian Talbot	bc4d5f413d	settings - various style/alignment tweaks to inline/existinf fields	2012-11-19 09:54:08 -05:00
Brian Talbot	14f668a41e	settings - revised assignment grace period text	2012-11-19 08:35:02 -05:00
Brian Talbot	cff581d5e6	settings - revised assignment due time field and provided UTC context/help	2012-11-19 08:16:48 -05:00
Brian Talbot	0114366c36	settings - revised discussion settings UI to include standard discussion categories and adding new ones	2012-11-19 08:05:52 -05:00
Brian Talbot	bf4f678bde	settings - revised faculty photo and syllabus states to either has or does not have	2012-11-19 07:38:59 -05:00
Brian Talbot	731ea22687	settings - added disabled states for course name/org/number	2012-11-19 07:19:13 -05:00
Don Mitchell	842bbe92d1	Everything tested and ready for Tom to fix	2012-11-16 12:53:49 -05:00
Don Mitchell	fbc48026f2	Hopefully the course-info changes I had made w/o link destruction	2012-11-16 12:51:31 -05:00
Brian Talbot	968b604b94	adding in datepicker functionality - wip	2012-11-16 12:25:06 -05:00
Brian Talbot	8918762493	roughed in all form fields - wip	2012-11-16 12:17:36 -05:00
Brian Talbot	6f52fea09c	added and wired in SymbolSet font icon library assets	2012-11-16 09:23:33 -05:00
Brian Talbot	74dec7f172	settings - wip	2012-11-16 09:14:18 -05:00
Brian Talbot	6014a7a299	Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings ... Conflicts: cms/djangoapps/contentstore/views.py	2012-11-15 16:51:53 -05:00
Brian Talbot	4c220ea420	in progress discussion work	2012-11-15 16:45:16 -05:00
Brian Talbot	1a297674ce	added in fields for problems and discussions portions of CMS settings	2012-11-15 14:31:16 -05:00
Brian Talbot	65869461f8	finalized layout and styling for course details and faculty settings	2012-11-14 14:50:48 -05:00
Chris Dodge	5c3db6f502	Change the Embed column in assest index page to just display the URL	2012-11-14 13:35:54 -05:00
Calen Pennington	eb92ad1fd8	Merge pull request #1032 from MITx/feature/jzoldak/cms-unit-testing ... Feature/jzoldak/cms unit testing	2012-11-13 07:08:52 -08:00
Jay Zoldak	a060b8de9c	Use xmodule.templates instead of hard coding them in the test	2012-11-13 08:35:22 -05:00
Jay Zoldak	5f926ebad0	Add better comments and modulestore cleanup.	2012-11-09 14:34:04 -05:00