Shannon 96d7cca68d Merge remote-tracking branch 'origin/dev-v7' into temp8 ...

# Conflicts:
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js

2018-11-20 14:12:26 +11:00

..

assets/img

…

docs

…

lib

delete angular-bootstrap file. It is never loaded anyway

2018-11-15 13:18:15 +01:00

src

Merge remote-tracking branch 'origin/dev-v7' into temp8

2018-11-20 14:12:26 +11:00

test

Update HasChildren, on removeNode in treeService

2018-11-06 14:51:51 +01:00

.babelrc

add babel + babel config

2018-10-07 20:01:20 +02:00

.eslintrc

add babel + babel config

2018-10-07 20:01:20 +02:00

gulpfile.js

Include the rest of the CSS assets for the ACE editor

2018-11-01 13:31:31 +01:00

package-lock.json

Manual merging

2018-10-23 16:12:23 +11:00

package.json

Manual merging

2018-10-22 17:04:58 +11:00

setupgulp.bat

Don't need to globally install bower anymore in this helper batch script

2018-10-11 10:54:45 +01:00

Umbraco.Web.UI.Client.proj.DotSettings

…