Commit Graph

975 Commits

Author SHA1 Message Date
David Baumgold
d09e93142f Merge pull request #1980 from edx/backbone-1.0.0
Upgrade to Backbone 1.0.0
2013-05-09 09:34:35 -07:00
Brian Talbot
25dd2c7d67 studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins 2013-05-08 15:30:17 -04:00
David Baumgold
7f69e45b9e whitespace changes 2013-05-08 09:29:20 -04:00
Christina Roberts
729ca900e6 Merge pull request #1920 from edx/feature/christina/fields
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
2013-05-07 09:38:34 -07:00
cahrens
c01410626f Jasmine test for changedMetadata method. 2013-05-02 13:39:20 -04:00
cahrens
c7713b6211 Merge branch 'master' into feature/christina/fields 2013-05-02 12:32:56 -04:00
cahrens
46100fd258 Cleanup. 2013-05-02 12:32:32 -04:00
cahrens
93f10ae8a0 Only save changed metadata fields. 2013-05-02 11:41:38 -04:00
Steve Strassmann
c9a80ded25 formatted using sublime/formatjs 2013-05-02 10:59:02 -04:00
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -04:00
Steve Strassmann
485d07a722 tabbing 2013-05-02 09:31:53 -04:00
Steve Strassmann
7c972ebf6e fix date interpolation 2013-05-02 09:29:27 -04:00
Jay Zoldak
aa4e29d2f1 Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs 2013-04-30 15:22:08 -04:00
Calen Pennington
8dc0df3e6b Don't ignore the old directories for xmodule sass and coffeescript 2013-04-29 07:32:16 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server
Speed up local development
2013-04-24 12:12:05 -07:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
Steve Strassmann
6f10348836 addressed comments from pull request 2013-04-23 10:07:51 -04:00
Calen Pennington
729daf5cbf Move xmodule asset gathering out of server startup
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Steve Strassmann
6e34c668bb introduce i18n 2013-04-17 11:30:29 -04:00
cahrens
40adfa950d Get the "Edit High Level Source" link back in. Broken with xblock work.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
2013-04-10 14:53:26 -04:00
Brian Talbot
97e893b2ed Merge branch 'master' into feature/btalbot/studio-courselink 2013-04-10 10:48:33 -04:00
Brian Talbot
01b2fefdd0 studio - revised course URL link label to match wording used elsewhere in the view/app 2013-04-10 10:48:12 -04:00
Christina Roberts
81f94fc4e2 Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin
studio - fixing a visual margin issue with the sign up/in views
2013-04-09 12:51:09 -07:00
cahrens
f36494e5dd Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way. 2013-04-09 09:41:52 -04:00
Brian Talbot
12784e3fb8 studio - course link final styling 2013-04-08 17:35:16 -04:00
Brian Talbot
b51e57eddf studio - refining style and presentation of course link and invitation button on details settings 2013-04-08 17:31:14 -04:00
Brian Talbot
606469cd46 studio - fixing a visual margin issue with the sign up/in views header/content areas 2013-04-08 17:14:41 -04:00
Brian Talbot
27871ac9c9 studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake 2013-04-08 16:55:06 -04:00
Brian Talbot
3f22826e26 studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification 2013-04-08 16:28:31 -04:00
Brian Talbot
4e331a2c6a studio - restyling course basic details and adding in a course's URL more prominently WIP 2013-04-08 15:39:01 -04:00
Brian Talbot
aaf95ddbba studio - course link: roughed in new markup/location of course link to share 2013-04-08 14:09:18 -04:00
Brian Talbot
bcf4775610 studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling 2013-04-08 13:47:01 -04:00
Brian Talbot
4d0d3d3ad4 studio - alerts: refactored some alert and notification show/hide js added back to base.js 2013-04-08 11:35:27 -04:00
Brian Talbot
28334064ab studio - alerts: reducing the animation time for notification slide downs 2013-04-08 11:30:49 -04:00
Brian Talbot
4f71f53826 studio - alerts: adding back in manual close behavior to base.js (needed across app) 2013-04-08 11:18:10 -04:00
cahrens
cea0f9252c Make sure we don't mark the message bar as hiding if it is not shown. 2013-04-08 11:02:06 -04:00
cahrens
7f1c89b492 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-08 10:28:52 -04:00
Brian Talbot
a6c35fb2ce studio - addressing pull request to merge to master feedback 2013-04-08 09:30:09 -04:00
Brian Talbot
d41f5042a5 studio - resolving margin-top issue with views that don't have a masthead 2013-04-05 16:30:51 -04:00
Brian Talbot
1a68d516fb resolving local merge with master 2013-04-05 15:27:08 -04:00
Brian Talbot
512e4fe3bd resolving local merge with master and sprucing style and templates for merge with master 2013-04-05 15:13:21 -04:00
Christina Roberts
33d39a85a9 Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock
Studio Help Sock
2013-04-05 11:37:57 -07:00
Brian Talbot
275826d4ff studio - resolving help sock PR comments 2013-04-05 11:29:46 -04:00
Brian Talbot
4e8f01b88c studio - adjusted abbr cursor displays 2013-04-05 11:18:16 -04:00
Brian Talbot
7ff975e0b6 studio - removing default styling for abbreviation elements, fixing typo in title attribute for timepickers 2013-04-05 11:06:34 -04:00
cahrens
2ad3fce27a Show UTC at end of string. 2013-04-05 09:13:17 -04:00
Brian Talbot
c26593df5b studio - added in labels and UTC reference for subsection release date UI 2013-04-04 18:27:19 -04:00
Brian Talbot
da6ac54d1a studio - added in labels and UTC reference for section release date modal forms 2013-04-04 18:00:08 -04:00
Brian Talbot
52a2fc7114 changing timeFormat for settings views 2013-04-04 17:45:40 -04:00
Brian Talbot
530f9a87bb studio - minor design tweaks to alert/notification chrome 2013-04-04 16:53:16 -04:00