Commit Graph

2914 Commits

Author SHA1 Message Date
Brian Talbot
eb6f2d8c09 studio - revising outline layout per date changes and gradable status UI issue 2013-04-03 15:22:27 -04:00
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04:00
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio
Fix due date bug.
2013-04-03 10:26:40 -07:00
Brian Talbot
2b749b9728 studio - tweaking the depth/shadow on the help sock UI 2013-04-03 09:00:56 -04:00
Brian Talbot
bf82af9db6 Merge branch 'master' into feature/btalbot/studio-helpsock 2013-04-02 15:40:41 -04:00
Brian Talbot
6952b8e63b studio - revising design, interaction, and FED of help sock 2013-04-02 15:37:49 -04:00
Brian Talbot
8b9ecd9367 studio - reverting footer UI to existing 2013-04-02 12:53:11 -04:00
Brian Talbot
899714a3c2 studio - resolving broken nav width 2013-04-02 10:19:17 -04:00
Brian Talbot
769e209091 resolving local merge 2013-04-01 16:56:11 -04:00
Brian Talbot
57e5eb683b studio - basic design, interaction, and content for static in-page help 2013-04-01 16:54:56 -04:00
Christina Roberts
ac180ca2b9 Merge pull request #1765 from MITx/feature/btalbot/studio-tenderwidget
Adding in reference and UI for Tender discussion submission widget
2013-04-01 13:17:06 -07:00
cahrens
42b4ffdcf9 Cleanup. 2013-04-01 13:40:32 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
Brian Talbot
9c2dbb91b4 studio - resolving a bug where JQUI sets the z-index of our datepickers to 1, which is less than our dynamic tooltips, causing visual display/access issues. 2013-04-01 10:34:31 -04:00
Brian Talbot
f85e18ed3b studio - resolving local merge 2013-03-29 10:20:08 -04:00
Brian Talbot
2cd8f448f7 studio - resolving merge with tender widget branch 2013-03-28 12:48:42 -04:00
Brian Talbot
bc248a1d4a studio - tender widget: revised styling with spam protection back in place 2013-03-28 12:47:08 -04:00
Brian Talbot
c8ab45cc57 studio - footer help ui revamp - animation, structure, styling - WIP 2013-03-27 17:40:24 -04:00
Brian Talbot
756f75951d studio - in progress work on help UI 2013-03-27 16:28:49 -04:00
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