Shannon f6c99f2bbc Merge remote-tracking branch 'origin/temp8' into temp-tinymce ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html

2018-10-11 13:33:18 +02:00

..

assets/img

…

docs

Renormalize

2018-06-29 19:52:40 +02:00

lib

Merge remote-tracking branch 'origin/temp8' into temp-tinymce

2018-10-11 13:33:18 +02:00

src

Merge remote-tracking branch 'origin/temp8' into temp-tinymce

2018-10-11 13:33:18 +02:00

test

fixes boolean checks and problems with removed angular.lowercase deprecated method

2018-08-22 14:15:23 +10: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

bower.json

Merge remote-tracking branch 'origin/temp8' into temp-tinymce

2018-10-11 13:33:18 +02:00

gulpfile.js

Merge branch 'temp8' into temp8-babel

2018-10-09 15:35:59 +02:00

package-lock.json

package lock JSON update post babel merge

2018-10-09 15:20:31 +01:00

package.json

Merge branch 'temp8' into temp8-babel

2018-10-09 15:35:59 +02:00

setupgulp.bat

Adds a quick start to setup a gulp environment - when you have NPM in the path the pre-requisites get taken care of

2018-05-04 10:33:35 +02:00

Umbraco.Web.UI.Client.proj.DotSettings

All projects use C# 7.0

2017-04-20 19:16:41 +02:00