4005 Commits

Author	SHA1	Message	Date
Calen Pennington	401f564e6a	Fix data directory passed to replace_static_urls	2013-02-05 11:06:46 -05:00
Calen Pennington	04879a83d3	Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible	2013-02-05 11:06:45 -05:00
Calen Pennington	b05ead864f	Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" ... This reverts commit c4f56620df.	2013-02-05 11:06:45 -05:00
Brian Talbot	b654ee4006	studio - soft landing: further styling and modal set-up - WIP	2013-02-04 20:25:58 -05:00
Brian Talbot	db21156d40	studio - soft landing: added in hover/active states for elements	2013-02-04 17:18:12 -05:00
Don Mitchell	07f87d4729	Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy	2013-02-04 15:34:19 -05:00
Don Mitchell	f48af8b80c	Server side controller and model stubbed in. Now to wire to view.	2013-02-04 15:34:05 -05:00
Brian Talbot	ffd585ae56	studio - resolved safari/webkit display issue with unit editing window's wrapper background color	2013-02-04 14:44:17 -05:00
Brian Talbot	6ca55b8458	studio - overview drag and drop: removed unused scss and hid new unit button while dragging	2013-02-04 14:35:04 -05:00
Brian Talbot	71ae45fd0e	studio - soft landing UI: how it works styling - wip	2013-02-04 14:23:44 -05:00
cahrens	ca2a375c17	saving work	2013-02-04 12:50:16 -05:00
Don Mitchell	902cdefefa	Added comments for unused 2nd arg on generateCheckHoverState	2013-02-04 12:05:49 -05:00
Don Mitchell	50eced5b32	Attempt to patch the dnd hesitation fixes onto master	2013-02-04 11:34:59 -05:00
cahrens	8f3e8024b9	Merge branch 'master' into feature/cas/manual-policy	2013-02-04 10:54:22 -05:00
Brian Talbot	c9dc762a2b	studio - soft landing UI: how it works basic layout styling	2013-02-04 09:54:14 -05:00
Brian Talbot	ecbe297936	studio - soft landing UI: how it works pathing, html and basic layout styling	2013-02-04 09:39:36 -05:00
Brian Talbot	79e3482265	studio - soft landing UI: initial how it works plumbing	2013-02-04 08:25:58 -05:00
Brian Talbot	e207881b50	studio - soft landing UI: button tweaks	2013-02-04 08:21:32 -05:00
Brian Talbot	4946eace2a	studio - soft landing UI: sign in and basic styling/layout tweaks	2013-02-04 00:43:24 -05:00
Brian Talbot	5a1795db85	studio - soft landing UI: basic signin/sign up styling and sign up markup/templating	2013-02-04 00:19:26 -05:00
Brian Talbot	1144b0eeed	studio - soft landing UI: initial header and templating work	2013-02-03 22:22:11 -05:00
Brian Talbot	604bfcc04a	studio - course nav - fixing width of course name for now	2013-02-03 20:20:35 -05:00
Brian Talbot	22444f6dfe	studio - revised course nav: fixed placeholder login link text	2013-02-01 20:50:29 -05:00
Brian Talbot	83ad950887	studio - revised course nav: plumbed in current html and scss progress into header	2013-02-01 20:48:59 -05:00
Brian Talbot	d0d0296310	studio - revising course-based navigation - initial scss setup	2013-02-01 19:57:17 -05:00
Don Mitchell	1595bd9b0e	Move dnd code from base.js to a js file only loaded by overview.html	2013-02-01 17:20:58 -05:00
Deena Wang	1a6fc1b505	Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing ... Conflicts: cms/djangoapps/contentstore/tests/test_views.py	2013-02-01 16:05:44 -05:00
Deena Wang	c144b2519a	more tests in test_views.py	2013-02-01 15:57:11 -05:00
John Jarvis	f525b17b1a	pep8 cleanup	2013-02-01 13:13:16 -05:00
Deena Wang	25aca5866d	Merge branch 'master' into feature/deena/testing ... Conflicts: lms/djangoapps/courseware/tests/test_access.py	2013-02-01 10:19:40 -05:00
Christina Roberts	14ca42a5dc	Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists ... temporary style sync up for course info lists	2013-02-01 06:51:35 -08:00
Brian Talbot	61de4c028a	temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog)	2013-02-01 09:41:51 -05:00
e0d	969737c58e	service variant code for loading different config	2013-01-31 21:43:35 -05:00
Deena Wang	7908d87902	more tests for views.py	2013-01-31 15:58:14 -05:00
Deena Wang	abc3e5b09d	more tests in test_views.py	2013-01-31 14:47:59 -05:00
Don Mitchell	aad5015a82	Merge pull request #1398 from MITx/feature/christina/misc2 ... Fixes date bug (#149).	2013-01-31 10:59:07 -08:00
Don Mitchell	fbd9a126ba	Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs ... add exporting of course info	2013-01-31 10:55:45 -08:00
Christina Roberts	5f170d118f	Merge pull request #1395 from MITx/bug/dhm/mar13 ... Remove format field as it's the one for grading type.	2013-01-31 10:51:44 -08:00
Jay Zoldak	c590c24e25	Add vendor files to files.json for the cms jasmine tests to work.	2013-01-31 13:48:38 -05:00
cahrens	b613bdc336	Fixes date bug (#149).	2013-01-31 13:37:45 -05:00
Don Mitchell	f257f12124	Meant to add the file here	2013-01-31 12:56:18 -05:00
Don Mitchell	279747ab14	Fixed missing jasmine includes	2013-01-31 12:40:05 -05:00
Don Mitchell	6491363647	Remove format field as it's the one for grading type.	2013-01-31 12:11:11 -05:00
Brian Talbot	7d871ddfc9	studio - revised manual policy UI: added key tips on focus, moved error messages to bottom of pairings	2013-01-31 11:50:07 -05:00
Chris Dodge	ab9d30cbc6	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs	2013-01-31 10:51:24 -05:00
Chris Dodge	fc57e7afdb	add testing for course info export. Plus DRY things out a bit	2013-01-31 10:51:20 -05:00
Brian Talbot	0e17d16dbe	studio - advanced settings - added in several more static states and firmed up key/value pair styling specifically	2013-01-30 20:02:45 -05:00
Brian Talbot	06439c7b9b	studio - advanced settings - initial HTML stubbing	2013-01-30 19:27:47 -05:00
Calen Pennington	76b367e062	Merge pull request #1388 from MITx/bug/dhm/mar13 ... Swallow event calls to squash 404 errors (and remove an unused var in	2013-01-30 14:10:02 -08:00
Don Mitchell	756a071634	misspelled request (altho as an unused identifier)	2013-01-30 17:08:21 -05:00