Shannon 3eba5e5c19 Merge branch 'dev-v7.7' into user-group-permissions ...

# Conflicts:
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Tests/Services/UserServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/util.service.js
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web/Umbraco.Web.csproj

2017-06-23 16:37:56 +10:00

..

ace-razor-mode/theme

Basic editor + macro dialog implemented

2016-06-12 18:48:46 +02:00

angular

U4-7496 Backoffice dropdowns quit working in Chrome after update to v47.0.2526.73

2015-12-08 13:54:56 +01:00

angular-bootstrap

uSkyTuning into Umbraco core, first approach

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

bootstrap

Update forms.less

2014-12-18 11:08:44 +00:00

bootstrap-tabdrop

Fixes tabdrop memory leak U4-6907 Bootstrap tab drop has memory leaks, fixes tab/header to use the correct bootstrap tab api, simplifies the header code dramatically and speeds up processing. Fixes mem leak with delayedMouseLeave.directive

2015-08-04 11:59:57 +02:00

codemirror/mode/razor

Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror

2015-06-24 19:06:42 +02:00

cssparser

Initial commit of the grid

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

datetimepicker

Fixes API compatibility issues with new date picker, moves moment to it's own folder since it might be used for other things.

2014-10-28 16:16:00 +10:00

jquery-ui

Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it.

2015-02-11 18:39:53 +11:00

jquery-ui-touch-punch

Fixes: U4-7447 Grid - Touch support

2015-12-01 11:23:10 +01: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

Change margin-top for triangle and re-order config properties

2015-12-15 15:42:14 +01:00

spectrum

Gets the new color spectrum pre-value editor working.

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

tinymce

Merge branch 'U4-8664' of https://github.com/DoctaJonez/Umbraco-CMS into temp-U4-8664

2017-06-20 12:59:28 +02:00

umbraco

removes userResource and adds the disableUser to the usersResource

2017-05-18 15:53:54 +10:00