Shannon
c6a67f79ac
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/UmbracoConfig.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/Models/IContentTypeBase.cs
# src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web.UI.Client/bower.json
# src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
# src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/buttons.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
# src/Umbraco.Web.UI.Client/src/less/forms.less
# src/Umbraco.Web.UI.Client/src/less/hacks.less
# src/Umbraco.Web.UI.Client/src/less/modals.less
# src/Umbraco.Web.UI.Client/src/less/panel.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
# src/Umbraco.Web.UI.Client/src/views/users/user.html
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
# src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
# src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
# src/Umbraco.Web.UI/config/EmbeddedMedia.config
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
# src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
# src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
# src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
# src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
# src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebServices/SaveFileController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
2018-10-22 16:03:01 +11:00
..
2018-07-20 10:59:25 +02:00
2018-07-20 10:59:25 +02:00
2018-05-08 16:41:30 +02:00
2018-10-15 14:44:26 +02:00
2018-10-08 10:23:53 +02:00
2018-10-22 16:03:01 +11:00
2018-06-29 19:52:40 +02:00
2018-10-03 14:27:48 +02:00
2018-09-30 13:09:44 +02:00
2018-09-27 10:51:29 +02:00
2018-08-29 01:15:46 +10:00
2018-10-21 10:41:17 +02:00
2018-10-01 14:39:28 +02:00
2018-10-17 15:11:00 +02:00
2018-10-22 16:03:01 +11:00
2018-08-17 15:41:58 +01:00
2018-10-22 16:03:01 +11:00
2018-06-29 19:52:40 +02:00
2018-10-09 08:19:36 +02:00
2018-08-17 15:41:58 +01:00
2018-10-17 15:11:00 +02:00
2018-08-14 15:08:32 +01:00
2018-10-02 11:14:04 +02:00
2018-06-29 19:52:40 +02:00
2018-10-17 15:11:00 +02:00
2018-07-31 10:41:15 +02:00
2018-10-01 14:32:46 +02:00
2018-07-31 15:27:27 +01:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-03-02 16:00:15 +01:00
2018-07-27 13:51:17 +01:00
2018-10-09 09:25:00 +01:00
2018-05-01 00:45:05 +10:00
2018-10-01 14:32:46 +02:00
2018-06-04 11:37:19 +02:00
2018-06-29 19:52:40 +02:00
2018-09-20 13:56:02 +01:00
2018-07-27 16:41:57 +01:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-08-06 21:39:30 +10:00
2018-05-31 23:05:35 +10:00
2018-10-01 14:32:46 +02:00
2018-05-01 01:27:25 +10:00
2018-06-29 19:52:40 +02:00
2018-09-07 11:43:57 +02:00
2018-07-31 14:48:30 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-03-22 11:25:22 +01:00
2018-06-29 19:52:40 +02:00
2018-09-20 13:14:16 +01:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-03-22 11:25:22 +01:00
2018-09-27 10:52:02 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-03-29 11:31:33 +02:00
2018-06-29 19:52:40 +02:00
2018-08-17 15:41:58 +01:00
2018-06-29 19:52:40 +02:00
2018-08-29 01:15:46 +10:00
2018-08-24 11:07:55 +02:00
2018-06-29 19:52:40 +02:00
2018-02-02 19:50:48 +01:00
2018-10-16 10:58:17 +02:00
2018-06-29 19:52:40 +02:00
2018-09-11 08:44:58 +01:00
2018-10-02 12:57:19 +02:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00
2018-05-01 00:45:05 +10:00
2018-05-01 00:45:05 +10:00
2018-10-17 15:11:00 +02:00
2018-08-30 19:08:55 +02:00
2018-06-29 19:52:40 +02:00
2018-09-11 08:54:04 +10:00
2018-06-29 19:52:40 +02:00
2018-06-29 19:52:40 +02:00