Brian Talbot
6952b8e63b
studio - revising design, interaction, and FED of help sock
2013-04-02 15:37:49 -04:00
Brian Talbot
57e5eb683b
studio - basic design, interaction, and content for static in-page help
2013-04-01 16:54:56 -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
f85e18ed3b
studio - resolving local merge
2013-03-29 10:20: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
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
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
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
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
f44989e516
Use Brian's open external method.
2013-03-21 11:17:31 -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
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
cahrens
a03f6c3bf1
More Selenium test, code cleanup.
2013-03-19 14:02:07 -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
Brian Talbot
cdcdfd49e0
studio - alerts: resolving local master merge conflcits
2013-03-18 10:58:16 -04:00
Brian Talbot
1aa8786b53
studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently
2013-03-14 19:07:03 -04:00
cahrens
ac25b02ce6
Minor updates.
2013-03-14 13:48:17 -04:00
cahrens
017fd06bfc
Pre-merge.
2013-03-14 13:37:22 -04:00
cahrens
54156b7ac1
Saving work.
2013-03-14 09:22:58 -04:00
Brian Talbot
36746fb729
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-12 16:05:54 -04:00
cahrens
99f55266f5
Do not need to pass blacklist keys to client.
2013-03-12 09:27:46 -04:00
cahrens
7e8fcb85ff
Updated Selenium test, deleted dead code related to Advanced Settings.
2013-03-11 16:56:24 -04:00
cahrens
f5dd5d35e9
Need to trigger invalid instead of error, after changes for new version of Backbone.
2013-03-08 14:51:29 -05:00
cahrens
98e410816e
New version of Backbone has separate invalid event.
2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce
New version of Backbone has separate invalid event.
2013-03-07 13:37:10 -05:00
Brian Talbot
62514d85a3
studio - alerts: loosely wired advanced settings with new notification and alert messages
2013-03-06 15:36:38 -05:00
Brian Talbot
156a702e08
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-05 09:57:35 -05:00
Christina Roberts
d0eefc6a67
Merge pull request #1580 from MITx/bug/dhm/course_update_js
...
Fix for script tags w/in json objects being oddly evaluated on html page
2013-03-04 12:42:42 -08:00
Don Mitchell
de3a75d29d
Don't prepopulate models which may have script tags in their payloads
...
but fetch async via json get.
2013-03-04 12:54:58 -05:00
Brian Talbot
ec90d349e2
studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP
2013-03-04 12:47:07 -05:00
Brian Talbot
72c58cd454
studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use
2013-03-03 20:44:48 -05:00
Brian Talbot
47aacc70b7
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-02 22:11:16 -05:00
Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
Brian Talbot
8552b2d614
local merge with master - WIP
2013-03-01 15:47:23 -05:00
