Merge branch 'dev-v7' into temp8

Browse Source

# Conflicts:
#	docs/CONTRIBUTING_DETAILED.md
#	docs/README.md
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
#	src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
#	src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/LanguageTreeController.cs

...

This commit is contained in:

Sebastiaan Janssen

2018-06-06 20:48:52 +02:00

parent bc06d7b20c 5013c5f526

commit 9008e6af88

42 changed files with 541 additions and 241 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

tools/contributing/clonefork.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

BIN

tools/contributing/createpullrequest.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 26 KiB

BIN

tools/contributing/defaultbranch.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 18 KiB

BIN

tools/contributing/forkrepository.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

BIN

tools/contributing/gulpbuild.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 20 KiB