Shannon 42e8e9442e Merge remote-tracking branch 'origin/7.0.0' into 7.0.0

2013-09-24 13:34:36 +10:00

..

ace/noconflict

delete fontawesome

2013-09-02 15:40:14 +02:00

angular

delete fontawesome

2013-09-02 15:40:14 +02:00

bootstrap

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

grunt

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

jquery

WIP on image uploading

2013-09-23 21:24:34 +02:00

signalr

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

slider

delete fontawesome

2013-09-02 15:40:14 +02:00

tinymce

Got macro content loading in editor async updated more of the macro plugin to ensure the macro contents cannot be edited.

2013-09-24 13:34:29 +10:00

umbraco

Got macro parameter editors inserting macros into the template editor for both webforms and mvc, created unit tests for macro syntax in macroservice. Removed the hard coded span8 for input elements for property editors - need to figure out a different way to set their width.

2013-09-20 14:24:39 +10:00

underscore

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

yepnope

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00