Shannon
|
39458017ec
|
removes old tag API
|
2018-10-02 15:29:17 +02:00 |
|
Shannon
|
7196c855b2
|
Fixes tests
|
2018-10-02 15:19:01 +02:00 |
|
Shannon
|
0c5cf5256b
|
manual merge pass #2
|
2018-10-02 12:57:19 +02:00 |
|
Shannon
|
edc9744397
|
manual merge pass #1
|
2018-10-02 11:14:04 +02:00 |
|
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 |
|
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 |
|
Asbjørn
|
7f107a8559
|
Make TagSupport and related types public #2988
|
2018-09-29 17:42:45 +02:00 |
|
Stephan
|
621ef28680
|
Fix PublishedElementModel, must be abstract
|
2018-09-28 16:59:00 +02:00 |
|
Shannon Deminick
|
2db32ef347
|
Merge pull request #3052 from umbraco/temp8-IDocumentEntity-updates
IDocumentEntity updates
|
2018-09-27 19:41:53 +10:00 |
|
Stephan
|
8ea4c10ce7
|
Fix GetCurrentRequestIpAddress when there is no request
|
2018-09-27 10:52:02 +02:00 |
|
Stephan
|
e6d5af5c3a
|
Fix DisposableTimer messages
|
2018-09-27 10:51:29 +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 |
|
Dennis Adolfi
|
5832387484
|
Added the DefaultLabelDataTypeIdas a non-deletable datatype.
|
2018-09-26 17:55:28 +02:00 |
|
Sebastiaan Janssen
|
540e4f17d6
|
Fixes #3042
Code comes from v8, commit: 9bfe9e6bbf
|
2018-09-26 09:48:24 +02:00 |
|
Sebastiaan Janssen
|
1e07fb48cc
|
Preventing infinite loop into this method
|
2018-09-25 22:21:00 +02:00 |
|
Sebastiaan Janssen
|
d61240e1fd
|
Merge branch 'umbplfest-hackathon-remove-obsolete-phase4' of https://github.com/AnthonyCogworks/Umbraco-CMS into AnthonyCogworks-umbplfest-hackathon-remove-obsolete-phase4
|
2018-09-25 22:18:16 +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 |
|
Stephan
|
14bd8a0851
|
Cleanup some DTOs
|
2018-09-25 18:05:14 +02:00 |
|
Stephan
|
c791050058
|
Denormalize variants for perfs
|
2018-09-25 16:55:00 +02:00 |
|
Sebastiaan Janssen
|
8c8e23f981
|
Merge pull request #2861 from raduorleanu/temp2-U4-11570
Found additional usages for (var web = new HttpClient()) and replaced…
|
2018-09-25 16:17:26 +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
|
53c218428f
|
Merge pull request #3029 from kedde/dev-v7
fix #3020 - casing errors
|
2018-09-25 14:41:35 +02:00 |
|
Sebastiaan Janssen
|
b9f5ddab06
|
Merge pull request #2866 from umbraco/temp-U4-11458-2
Fixes SQL generation for paged results for both UserRepository and AuditRepository
|
2018-09-25 14:27:27 +02:00 |
|
Stephan
|
3d19acb97e
|
Variants in EntityRepository
|
2018-09-25 12:01:38 +02:00 |
|
Stephan
|
5f805b0804
|
Extend NPoco fluent querying
|
2018-09-25 10:55:06 +02:00 |
|
kedde
|
3d0d8d7430
|
fix mysql casing
|
2018-09-24 20:00:08 +02:00 |
|
Stephan
|
f4e87b9949
|
Merge branch temp8 into temp8-IDocumentEntity-updates
|
2018-09-24 19:12:56 +02:00 |
|
Stephan
|
1511fd9b38
|
Merge branch temp8 into temp8-IDocumentEntity-updates
|
2018-09-24 19:12:45 +02:00 |
|
Stephan
|
681ef67653
|
Support ordering content apps
|
2018-09-21 09:42:36 +02:00 |
|
Stephan
|
b1b1d60712
|
Pre-parse show rules in ManifestContentAppDefinition (perfs)
|
2018-09-21 09:01:37 +02:00 |
|
Stephan
|
d6775aa79a
|
Implement content apps code config and manifest
|
2018-09-21 08:09:53 +02:00 |
|
Stephan
|
7f45727936
|
Compile SqlSyntax alias regex - why not?
|
2018-09-21 08:06:42 +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
|
19e4352243
|
Revert "making an attempt at a single SQL statement to get publish info for variants ... but failing, will revert"
This reverts commit c65480cf77.
|
2018-09-21 15:28:36 +10:00 |
|
Shannon
|
c65480cf77
|
making an attempt at a single SQL statement to get publish info for variants ... but failing, will revert
|
2018-09-21 12:28:29 +10:00 |
|
Stephan
|
16eab3eb49
|
Cleanup DisposableTimer log messages
|
2018-09-20 17:26:10 +02:00 |
|
Shannon
|
448850b2d0
|
I may have figured out how to get publish information into the IDocumentEntitySlim
|
2018-09-21 01:21:52 +10:00 |
|
Shannon
|
539c882adb
|
Merge branch 'temp8' into temp8-IDocumentEntity-updates
|
2018-09-21 01:06:21 +10:00 |
|
Anthony
|
c6f3b2fe7c
|
umbPLfest hackathon removed obsolete - phase 4
|
2018-09-20 16:02:49 +01: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 |
|
Anthony
|
8cd0bc5f50
|
umbPLfest hackathon - Removed obsolete methods and properties.
|
2018-09-20 13:56:02 +01:00 |
|
Anthony
|
1ab324ebb9
|
umbPLfest hackathon - Remove obsolete methods
|
2018-09-20 13:14:16 +01:00 |
|
Sebastiaan Janssen
|
8bf8e0a741
|
Updates CDF
|
2018-09-20 08:48:46 +02:00 |
|
Stephan
|
8649062500
|
Merge pull request #2987 from umbraco/temp8-decouple-serilog-from-httpreqid
Decouple Serilog from HTTP Request ID in UmbracoModule Begin & End logs
|
2018-09-20 08:36:06 +02:00 |
|
Shannon
|
feeb1c56cf
|
wip for IDocumentEntitySlim changes
|
2018-09-20 14:58:15 +10:00 |
|
Stephan
|
e6e3716dda
|
Detect SqlServer 2012+
|
2018-09-19 18:51:27 +02:00 |
|