Shannon e10698532b Merge branch 'dev-v8' into temp-U4-11127 ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js

2018-04-06 13:56:07 +10:00

..

assets/img

…

docs

…

lib

Port v7@2aa0dfb2c5 - WIP

2018-03-22 11:25:08 +01:00

src

Merge branch 'dev-v8' into temp-U4-11127

2018-04-06 13:56:07 +10:00

test

Merge remote-tracking branch 'origin/temp-v8-UI' into dev-v8

2018-03-29 22:42:18 +11:00

.eslintrc

Port 7.7 - WIP

2017-09-15 18:22:19 +02:00

.jshintignore

…

bower.json

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

2018-03-29 20:01:14 +11: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

…