Claus 9e3db051c9 Merge remote-tracking branch 'origin/temp8' into temp-U4-11218 ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html
#	src/Umbraco.Web.UI/web.Template.config

2018-05-17 08:26:02 +02:00

..

assets/img

…

docs

…

lib

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

2018-04-30 23:25:07 +10:00

src

Merge remote-tracking branch 'origin/temp8' into temp-U4-11218

2018-05-17 08:26:02 +02:00

test

Merge pull request #2621 from umbraco/temp8-U4-11282

2018-05-15 20:29:10 +10:00

.eslintrc

…

.jshintignore

…

bower.json

wip animation experiments

2018-04-25 10:29:18 +02:00

gulpfile.js

adding the preview controller to project.

2018-02-28 08:58:16 +01:00

package-lock.json

Adds NPM package.json lock file - so we ensure dependencies are consistent for all

2018-03-29 20:11:14 +01:00

package.json

Fix build, still some weird csc.exe versionning

2018-04-04 17:41:55 +02:00

Umbraco.Web.UI.Client.proj.DotSettings

…