Sebastiaan Janssen 700fe9b787 Merge branch 'v7/dev' into v8/dev ...

# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js

2019-04-23 20:37:38 +02:00

..

assets/img

…

docs

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

gulp

publishes js test results to xml so that Azure DevOps can read the results, re-enables js test building, fixes an issue with one of the tests

2019-02-14 12:30:36 +11:00

lib

v8: Remove open sans font (#4613)

2019-02-18 20:52:18 +01:00

src

Merge branch 'v7/dev' into v8/dev

2019-04-23 20:37:38 +02:00

test

Fix JS unit tests

2019-04-22 12:10:53 +02:00

.babelrc

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

.eslintrc

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

gulpfile.js

Merge remote-tracking branch 'origin/temp8' into temp8-logviewer

2019-01-21 11:17:14 +00:00

package-lock.json

Missing injection

2019-03-18 10:14:23 +01:00

package.json

publishes js test results to xml so that Azure DevOps can read the results, re-enables js test building, fixes an issue with one of the tests

2019-02-14 12:30:36 +11:00

Umbraco.Web.UI.Client.proj.DotSettings

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00