Sebastiaan Janssen dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 ...

Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config

2014-08-04 13:32:44 +02:00

..

angular

Improves media drag n drop sorting

2013-11-18 14:58:29 +01:00

angular-bootstrap

uSkyTuning into Umbraco core, first approach

2014-05-09 18:18:08 +02:00

bootstrap

Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky

2014-05-09 18:22:37 +02:00

cssparser

Initial commit of the grid

2014-05-09 12:23:59 +02:00

datetimepicker

Fixes datetimepicker once and for all, fixes user model to return the culture not just the language, adds ability to localize the datetimepicker - will default to english but is easy to add other versions, currently the only custom one in there is brazilian (since it was already made).

2013-11-15 12:26:29 +11:00

jquery

uSkyTuning into Umbraco core, first approach

2014-05-09 18:18:08 +02:00

less

uSkyTuning into Umbraco core, first approach

2014-05-09 18:18:08 +02:00

markdown

merge

2013-11-07 17:16:22 +01:00

slider

merge

2013-11-07 17:16:22 +01:00

spectrum

Gets the new color spectrum pre-value editor working.

2014-03-19 17:45:21 +11:00

tinymce

Updated the Umbraco TinyMCE skin to use the templates icon for visual blocks,

2014-08-01 11:58:33 -05:00

umbraco

adds rootscope access to umb.clientmgr

2014-05-20 12:14:10 +02:00

underscore

Added events.Service and xmlhelper.service

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