1595 Commits

Author	SHA1	Message	Date
Brian Talbot	754e30240d	studio - adjusting tender widget window height based on field removal	2013-03-27 11:01:25 -04:00
Brian Talbot	2120481738	studio - corrected JQ selector for smoothscrolling in-page links	2013-03-27 01:34:25 -04:00
Brian Talbot	25acab497e	studio - corrected JQ selector for smoothscrolling in-page links	2013-03-27 01:33:04 -04:00
Brian Talbot	6889b2015b	studio - added in revised footer styles and fix for smoothscroll	2013-03-27 01:24:31 -04:00
Brian Talbot	4f7e09e936	Merge branch 'master' into feature/btalbot/studio-tenderwidget	2013-03-26 14:49:14 -04:00
Brian Talbot	7e56e98c58	firming up behavior/styling for tender widget - including errors	2013-03-26 14:46:38 -04:00
Brian Talbot	8a4047d5dd	studio - added smoothscroll to top of view and wired footer tender widget link	2013-03-26 12:48:51 -04:00
Brian Talbot	7c68508b85	studio - finalized tender widget styling	2013-03-26 12:42:30 -04:00
Brian Talbot	87f545329a	studio - adding in tender-widget sass file	2013-03-26 11:05:33 -04:00
cahrens	f681d4300d	More cleanup in base.js.	2013-03-26 10:42:44 -04:00
cahrens	69c95ca785	Newline cleanup.	2013-03-26 09:51:24 -04:00
Brian Talbot	175e1b46e9	studio - in progress styling of tender help widget	2013-03-26 08:32:49 -04:00
cahrens	fa63bcce94	Allow clearing of dates (except for course start date). ... https://edx.lighthouseapp.com/projects/102637/tickets/231	2013-03-25 17:25:49 -04:00
cahrens	ccd4db9ac3	Writing test.	2013-03-25 15:24:53 -04:00
Brian Talbot	66ba0f9b81	studio - resolving local merge with master	2013-03-25 15:21:25 -04:00
cahrens	c39ff353ea	Don't assume input fields will be within a div. ... https://edx.lighthouseapp.com/projects/102637/tickets/232	2013-03-25 11:09:33 -04:00
cahrens	dfdc2cb7d8	Remove console.log.	2013-03-22 16:11:43 -04:00
cahrens	39714a17d9	Merge branch 'master' into bug/christina/cursor-move ... Conflicts: cms/static/js/base.js	2013-03-22 16:03:52 -04:00
cahrens	eebef1e647	Don't save subsection and unit names until the change event. Fixes bugs #18 and #228.	2013-03-22 15:32:13 -04:00
cahrens	a2a1478d92	Fix caching bug on back button.	2013-03-22 09:51:45 -04:00
Brian Talbot	7051a94e7b	resolved local master merge conflicts with studio sass	2013-03-21 16:15:19 -04:00
cahrens	0a063342cf	Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists	2013-03-21 13:56:32 -04:00
cahrens	1ae9e9bde3	Tests for opening action links.	2013-03-21 13:56:11 -04:00
cahrens	8ca6e324af	Merge branch 'master' into feature/btalbot/studio-checklists ... Conflicts: cms/djangoapps/contentstore/views.py cms/static/sass/base-style.scss cms/urls.py	2013-03-21 12:23:13 -04:00
Christina Roberts	e8401cf2bb	Merge pull request #1643 from MITx/fix/btalbot/studio-sasscleanup ... Studio Sass Cleanup	2013-03-21 08:45:48 -07:00
cahrens	f44989e516	Use Brian's open external method.	2013-03-21 11:17:31 -04:00
chrisndodge	37a673012f	Merge pull request #1701 from MITx/bug/orphan ... Fix bug 249 the ugly way (decerebrate the moronically impotent model)	2013-03-21 07:21:16 -07:00
Brian Talbot	67c6852b5c	studio - checklists: removing not needed sass variable for animating height	2013-03-21 10:01:39 -04:00
Don Mitchell	3ea70eac9d	Also clean up children after sort saved.	2013-03-20 17:59:24 -04:00
Brian Talbot	481aa063c4	Merge branch 'master' into feature/btalbot/studio-checklists	2013-03-20 17:10:07 -04:00
Brian Talbot	2876554cd7	Merge branch 'master' into fix/btalbot/studio-sasscleanup	2013-03-20 17:09:38 -04:00
Brian Talbot	3b80a90bd0	studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss	2013-03-20 16:54:14 -04:00
cahrens	fd9c29f449	Merge branch 'master' into feature/btalbot/studio-checklists	2013-03-20 16:37:56 -04:00
cahrens	284cfcc941	Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists	2013-03-20 16:37:26 -04:00
cahrens	6d6e144c35	Urls working.	2013-03-20 16:37:08 -04:00
Brian Talbot	994ced3c61	studio - notifications: organizing base variables	2013-03-20 16:34:21 -04:00
Brian Talbot	38df54dc53	studio - moved handling scrollable and new window links into their own functions for use throughout the app and not just on doc.ready + removed unused js plugin reference	2013-03-20 16:19:45 -04:00
Brian Talbot	f181a454e4	studio - added in basic JS confirm UI when deleting course updates	2013-03-20 11:20:16 -04:00
Brian Talbot	99cf432390	Merge branch 'master' into feature/btalbot/studio-alerts	2013-03-20 10:45:01 -04:00
Brian Talbot	8cf2cc6f78	studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles	2013-03-20 10:42:35 -04:00
Brian Talbot	9069d822a4	Merge branch 'master' into fix/btalbot/studio-sasscleanup	2013-03-20 10:38:07 -04:00
Don Mitchell	af136e75ca	Fix bug 249 the ugly way (decerebrate the moronically impotent model)	2013-03-19 18:07:46 -04:00
cahrens	a03f6c3bf1	More Selenium test, code cleanup.	2013-03-19 14:02:07 -04:00
cahrens	dc89a4b3d5	Beginning of Selenium test, updates to work with master.	2013-03-18 21:25:44 -04:00
Brian Talbot	c901cecdea	studio - tender widget: added compromise of style given iframe and clunky DOM elements that tender is using. meh.	2013-03-18 16:23:30 -04:00
cahrens	49ee903eda	Merge branch 'master' into feature/btalbot/studio-checklists ... Conflicts: cms/djangoapps/contentstore/views.py cms/static/js/template_loader.js	2013-03-18 15:30:19 -04:00
cahrens	f6fb64f130	Saving checkbox state, client template for individual checklist.	2013-03-18 15:03:54 -04:00
Jay Zoldak	b6e82afb0e	Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests ... Fix/will/fix broken jasmine lms tests	2013-03-18 11:53:22 -07:00
Brian Talbot	16f9f6ef4f	studio - tender widget: added initial reference and behavior	2013-03-18 13:15:01 -04:00
Brian Talbot	cdcdfd49e0	studio - alerts: resolving local master merge conflcits	2013-03-18 10:58:16 -04:00