yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,221 Commits 4 Branches 7 Tags
549d8d83cef8a2f59e4d319ec501a34967fc815c
Commit Graph

8051 Commits

Author SHA1 Message Date
Shannon
549d8d83ce reverts changes that shouldn't have been made, will manually merge these ones 2018-10-01 14:39:28 +02:00
Shannon
b96ba05d22 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	build/NuSpecs/tools/Readme.txt
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Constants-Conventions.cs
#	src/Umbraco.Core/Constants-System.cs
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Core/Media/Exif/ImageFile.cs
#	src/Umbraco.Core/Models/Property.cs
#	src/Umbraco.Core/Models/PropertyTagBehavior.cs
#	src/Umbraco.Core/Models/PropertyTags.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Security/AuthenticationExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
#	src/Umbraco.Core/Services/ServerRegistrationService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/user.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/card.less
#	src/Umbraco.Web.UI.Client/src/less/navs.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/CanvasDesignerController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
#	src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
#	src/Umbraco.Web/Mvc/MasterControllerFactory.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
#	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
#	src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
#	src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
#	src/Umbraco.Web/Scheduling/KeepAlive.cs
#	src/Umbraco.Web/Scheduling/LogScrubber.cs
#	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
#	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
#	src/Umbraco.Web/Scheduling/Scheduler.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/_Legacy/Packager/Installer.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/umbraco.businesslogic/IO/IOHelper.cs
#	src/umbraco.cms/packages.config
#	src/umbraco.cms/umbraco.cms.csproj
#	src/umbraco.controls/packages.config
#	src/umbraco.controls/umbraco.controls.csproj
#	src/umbraco.editorControls/packages.config
#	src/umbraco.editorControls/umbraco.editorControls.csproj
 2018-10-01 14:32:46 +02:00
Shannon
b4f4d2cfe8 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-01 11:26:40 +02:00
Shannon
5c8fd56317 comment 2018-10-01 11:26:18 +02:00
Stephan
d56d39ee1a Fix nested content validation when null 2018-09-30 19:09:06 +02:00
Stephan
053e0e17a3 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-09-30 18:49:50 +02:00
Matthew-Wise
a33ccd15c6 Convertion of assigndomain2.aspx to angular (#2897) 2018-09-30 16:02:09 +02:00
agrath
63a2a155d1 User invite flow review (#3000) 2018-09-30 15:03:52 +02:00
imranhaidercogworks
5f1fb144e0 Uploading SVG's Causes Error (Depending on imageFileTypes Setting) (#3072) 2018-09-30 13:09:44 +02:00
Stephan
b572407084 Fix nested content when empty or null 2018-09-28 16:59:00 +02:00
Robert
442e0c93a5 Merge branch 'temp8' into temp8-p181 2018-09-27 15:17:56 +02:00
Shannon Deminick
2db32ef347 Merge pull request #3052 from umbraco/temp8-IDocumentEntity-updates 
IDocumentEntity updates
 2018-09-27 19:41:53 +10:00
Shannon
83501ba1eb Gets tree node states showing correctly for variants. 2018-09-27 19:30:31 +10:00
Marc Goodson
c021cc50ce U4-10669 7.8. Show 301 url redirects on info tab too (#2452) 2018-09-26 23:16:54 +02:00
Sebastiaan Janssen
85291b562e Merge pull request #2533 from ronaldbarendse/U4-10586 
Added property editor alias to PreValueDisplayResolver warning
 2018-09-26 23:03:57 +02:00
Sebastiaan Janssen
ca8c6248c1 Merge pull request #2561 from umbraco/temp-U4-10816 
fixes U4-10816 Umbraco V7.7.1 - Media - File upload taking full path
 2018-09-26 22:53:41 +02:00
Dave Woestenborghs
b0374695b1 Fixed udi's rendered in rte content (#2531) 2018-09-26 21:51:20 +02:00
Dave Woestenborghs
471bc7f116 U4-11458 - Fix multiple issues for angular logResource (#2719) 2018-09-26 20:48:54 +02:00
Sebastiaan Janssen
3940176f23 Just a bit of code cleanup 2018-09-26 18:01:50 +02:00
Dennis Adolfi
5832387484 Added the DefaultLabelDataTypeIdas a non-deletable datatype. 2018-09-26 17:55:28 +02:00
Stephan
ad8c309f3d Variant-contextual breadcrumb 2018-09-26 16:27:34 +02:00
Sebastiaan Janssen
a1224da5e1 Fixes #3036 
Removes WebClient completely except for in an old legacy class that is not used for anything
any more (umbraco.cms.businesslogic.packager.Installer.Fetch).
 2018-09-26 13:27:16 +02:00
Robert
230875f3cf Merge pull request #3030 from umbraco/temp8-rollback 
Temp8 rollback
 2018-09-26 12:38:48 +02:00
Sebastiaan Janssen
540e4f17d6 Fixes #3042 
Code comes from v8, commit: 9bfe9e6bbf
 2018-09-26 09:48:24 +02:00
Sebastiaan Janssen
f0fbc808f2 Merge pull request #3025 from WebCentrum/temp-#3024 
#3024: Removed unnecessary queries in MultiNodeTreePickerPropertyConv…
 2018-09-25 23:05:09 +02:00
Sebastiaan Janssen
c19bc0b296 Merge pull request #3007 from callumbwhyte/updating-macro-templates 
Updating macro templates for V8
 2018-09-25 22:48:58 +02:00
Sebastiaan Janssen
a531907853 Merge pull request #3008 from AnthonyCogworks/umbplfest-hachathon-remove-obsolete-phase3 
umbPLfest hackathon - Removed obsolete methods - phase 3
 2018-09-25 22:13:37 +02:00
Sebastiaan Janssen
a3ba3e9e8e Making MemberIdRuleType private so we won't expose it to people trying to use it somehow 2018-09-25 22:09:45 +02:00
Sebastiaan Janssen
75ab692955 Merge branch 'umbplfest-hackathon-remove-obsolete-phase2' of https://github.com/AnthonyCogworks/Umbraco-CMS into AnthonyCogworks-umbplfest-hackathon-remove-obsolete-phase2 2018-09-25 22:06:04 +02:00
Sebastiaan Janssen
197361721f Merge branch 'umbplfest-hackathon-remove-obsolete' of https://github.com/AnthonyCogworks/Umbraco-CMS into AnthonyCogworks-umbplfest-hackathon-remove-obsolete 2018-09-25 21:49:30 +02:00
Sebastiaan Janssen
dd7a4d262e Merge pull request #3019 from ed-parry/v8hackathon-remove-pageid-references 
Replaced references of PageID with the UmbracoContext calls. [v8hackathon]
 2018-09-25 21:45:06 +02:00
Sebastiaan Janssen
6dfb0f0711 Removes some unused code which relate to the pageID too 2018-09-25 21:37:00 +02:00
Sebastiaan Janssen
c3e85796d8 Merge branch 'v8hackathon-remove-pageid-references' of https://github.com/ed-parry/Umbraco-CMS into ed-parry-v8hackathon-remove-pageid-references 2018-09-25 20:59:43 +02:00
Stephan
14bd8a0851 Cleanup some DTOs 2018-09-25 18:05:14 +02:00
Sebastiaan Janssen
35ec07f970 Some tiny code style updates 2018-09-25 16:15:37 +02:00
Sebastiaan Janssen
917269a260 Merge branch 'temp2-U4-11570' of https://github.com/raduorleanu/Umbraco-CMS into raduorleanu-temp2-U4-11570 2018-09-25 16:09:58 +02:00
Sebastiaan Janssen
7c437998ec Merge pull request #2842 from leekelleher/U4-11555 
[v8] U4-11555 - Remove App_Browsers folder
 2018-09-25 16:06:54 +02:00
Mads Rasmussen
cfa4512f8c lazy load diff library in rollback dialog instead of loading it globally 2018-09-25 10:12:41 +02:00
Mads Rasmussen
a47ae2e5c3 add diff library + generate diff 2018-09-24 20:10:05 +02:00
Stephan
f4e87b9949 Merge branch temp8 into temp8-IDocumentEntity-updates 2018-09-24 19:12:56 +02:00
Pavel Budik
70a851dbf9 #3024: Removed unnecessary queries in MultiNodeTreePickerPropertyConverter 2018-09-24 14:23:00 +02:00
Mads Rasmussen
a00b510563 load angular dialog 2018-09-24 13:43:20 +02:00
Stephan
a1ee099987 Log content app duplicate aliases instead of throwing 2018-09-24 09:34:25 +02:00
Shannon
3189ce75ae throw exception if duplicate content app aliases are found 2018-09-24 13:50:42 +10:00
Ed Parry
22f25ee467 Replaced references of PageID with the UmbracoContext calls. 2018-09-23 13:39:51 +01:00
Stephan
681ef67653 Support ordering content apps 2018-09-21 09:42:36 +02:00
Stephan
c24f8810d8 Fix tests 2018-09-21 08:56:49 +02:00
Stephan
d6775aa79a Implement content apps code config and manifest 2018-09-21 08:09:53 +02:00
Shannon
a39e77d1cf Gets culture publishing info in IDocumentEntitySlim and has the tree showing the correct publish state, but missing 'edited' flag since i think that requires yet-another-query 2018-09-21 15:49:37 +10:00
Shannon Deminick
1cf5c6c89d Merge pull request #2995 from umbraco/temp8-p188 
Implement listviews variants sorting (p188)
 2018-09-21 00:30:41 +10:00