Shannon
|
cd6ef35bf9
|
comments out the fix during investigation - adds some notes
|
2019-07-03 15:17:51 +10:00 |
|
Shannon
|
47cdc79fcb
|
Merge branch 'v8/dev' into v8/bugfix/5671-fix-for-different-version-number-in-modelbuilder-models-in-live-mode
|
2019-07-03 13:50:38 +10:00 |
|
Shannon Deminick
|
2167eada0c
|
Merge pull request #5764 from umbraco/v8/bugfix/fixes-for-bypass-securtiy-after-merge
V8: Bugfixes regarding the Bypass Security feature after merge from v7
|
2019-07-03 11:27:55 +10:00 |
|
Shannon
|
df11935598
|
Revert and adjusts "Fixes issue when creating DateTypes of type Umbraco.MultiNodeTreePicker with type member, because -1 can't be casted to Udi"
|
2019-07-03 11:23:25 +10:00 |
|
Shannon
|
d3b4b9fe64
|
fix merge
|
2019-07-03 11:10:34 +10:00 |
|
Shannon
|
33aff7ff61
|
Merge branch 'v8/dev' into v8/bugfix/fixes-for-bypass-securtiy-after-merge
# Conflicts:
# src/Umbraco.Web/Editors/EntityController.cs
|
2019-07-03 11:04:34 +10:00 |
|
Sebastiaan Janssen
|
4d2c551b79
|
Merge branch 'v7/dev' into v8/dev
|
2019-07-02 22:01:34 +02:00 |
|
Sebastiaan Janssen
|
5b7ae7150f
|
Fix weird merge
|
2019-07-02 21:55:54 +02:00 |
|
Sebastiaan Janssen
|
5bf29a907a
|
Fixes #5206
|
2019-07-02 21:47:14 +02:00 |
|
Bjarke Berg
|
96d5bdd7b2
|
https://github.com/umbraco/Umbraco-CMS/issues/5671 - If modelsbuilder is in live mode, we need to clear cache for all document types when at least one is cleared. This is due to modelsbuilder updating all the models to different versions.
|
2019-07-02 15:26:54 +02:00 |
|
Bjarke Berg
|
7b4023fd5a
|
Fixes issue when creating DateTypes of type Umbraco.MultiNodeTreePicker with type member, because -1 can't be casted to Udi
|
2019-07-02 13:17:47 +02:00 |
|
Bjarke Berg
|
af72729905
|
Merge remote-tracking branch 'origin/v8/dev' into v8/dev
|
2019-07-02 13:03:29 +02:00 |
|
Claus
|
d5bc54cf6c
|
refixing #4708 - old merge error.
|
2019-07-02 13:00:50 +02:00 |
|
Claus
|
5625102e2c
|
making EditorValidatorOfT public instead of internal.
|
2019-07-02 12:42:18 +02:00 |
|
Bjarke Berg
|
66abd7b50c
|
Merge remote-tracking branch 'origin/v8/dev' into v8/dev
|
2019-07-02 11:31:14 +02:00 |
|
Bjarke Berg
|
2a9bcf0e98
|
Merge pull request #5763 from umbraco/v7/bugfix/fix-for-null-ref-exception-when-using-member-pickers
V7: Bugfix for Null ref-exception when using member pickers.
|
2019-07-02 11:20:53 +02:00 |
|
Bjarke Berg
|
e6484687e5
|
Small fixes after v7 to v8 merge regarding the bypass security feature
|
2019-07-02 11:17:23 +02:00 |
|
Shannon
|
5da1e64bbc
|
Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev
|
2019-07-02 19:15:20 +10:00 |
|
Shannon
|
7b0979f9fd
|
Fixes install.ps1 and updates sln to remove old ps1 file
|
2019-07-02 19:15:04 +10:00 |
|
Dave Woestenborghs
|
1a437c1c6a
|
#5750 - fix outside click directive so it doesn't close dialogues from create action
|
2019-07-02 11:11:03 +02:00 |
|
Bjarke Berg
|
3c0565e516
|
Bugfix: Null ref-exception when using member pickers.
|
2019-07-02 10:56:44 +02:00 |
|
Claus
|
178b1ccf40
|
Merge pull request #5743 from umbraco/v8/feature/sourcelink-update
V8: Adds in SourceLink Debugging Feature
|
2019-07-02 10:49:11 +02:00 |
|
Shannon Deminick
|
c03cd81c23
|
Merge pull request #5748 from umbraco/v8/feature/mb-embed-prepare
Prepare MB future
|
2019-07-02 18:18:07 +10:00 |
|
Stephan
|
3d3647b476
|
Fix tests
|
2019-07-02 10:11:51 +02:00 |
|
Stephan
|
a4cac670df
|
Merge branch 'v8/dev' into v8/feature/mb-embed-prepare
|
2019-07-02 09:12:00 +02:00 |
|
Shannon
|
c414dd06cc
|
updates package lock
|
2019-07-02 15:38:17 +10:00 |
|
Shannon
|
4ed746e4ef
|
Fixes tree refreshing when changing users, fixes memory/event leak
|
2019-07-02 13:37:40 +10:00 |
|
Shannon
|
c270d8ecac
|
Merge remote-tracking branch 'origin/v7/dev' into v8/dev
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Constants-DataTypes.cs
# src/Umbraco.Core/Models/DataTypeDefinition.cs
# src/Umbraco.Core/Models/DataTypeExtensions.cs
# src/Umbraco.Core/Models/IDataTypeDefinition.cs
# src/Umbraco.Core/Models/UmbracoEntity.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
# src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/DataTypeService.cs
# src/Umbraco.Core/Services/DateTypeServiceExtensions.cs
# src/Umbraco.Core/Services/EntityService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/Services/IDataTypeService.cs
# src/Umbraco.Core/Services/IEntityService.cs
# src/Umbraco.Core/Services/IRelationService.cs
# src/Umbraco.Core/Services/Implement/RelationService.cs
# src/Umbraco.Tests/Models/UmbracoEntityTests.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Tests/Services/EntityServiceTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
# src/Umbraco.Web.UI.Client/src/common/services/search.service.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
# src/Umbraco.Web.UI/config/EmbeddedMedia.config
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
# src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
# src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebBootManager.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
# src/umbraco.cms/businesslogic/web/Access.cs
|
2019-07-02 12:24:05 +10:00 |
|
Shannon Deminick
|
ade9bb7324
|
Merge pull request #5741 from umbraco/v8/merge/v715
Merging 7.15 - 8.1
|
2019-07-02 12:10:03 +10:00 |
|
Shannon
|
4134dd16df
|
adds fixme note
|
2019-07-02 12:04:58 +10:00 |
|
Shannon
|
f81588bb13
|
fixes search for content picker with ignore start nodes
|
2019-07-02 11:48:09 +10:00 |
|
Shannon
|
09793a1744
|
Fixes tests
|
2019-07-02 11:07:59 +10:00 |
|
Shannon
|
ba7cd48b8f
|
Merge remote-tracking branch 'origin/v8/dev' into v8/merge/v715
# Conflicts:
# src/Umbraco.Core/Constants-DataTypes.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
|
2019-07-02 10:49:20 +10:00 |
|
Shannon
|
640d2cedb9
|
Gets the link and media pickers working in the grid in the rte with ignore start nodes
|
2019-07-01 21:48:45 +10:00 |
|
Shannon
|
0a6237af04
|
Gets the multi url picker working with ignore start nodes
|
2019-07-01 21:13:11 +10:00 |
|
Shannon
|
503183331f
|
gets media picker with ignore start nodes working in rte
|
2019-07-01 20:59:41 +10:00 |
|
Warren Buckley
|
3effc66b2c
|
Need to update NuSpec to ensure the PDB are getting coppied into the bin when Nuget pacakeg installed into a project
|
2019-07-01 11:53:22 +01:00 |
|
Warren Buckley
|
b64f303537
|
Mark the release PDB as portable too - the Powershell build uses Release not Debug
|
2019-07-01 11:20:07 +01:00 |
|
Warren Buckley
|
760f6a1647
|
Umbraco.Web.UI revert change as no real CS code to F11 into this project
|
2019-07-01 10:54:29 +01:00 |
|
Warren Buckley
|
0b64e34f05
|
Add in SourceLink Nuget to Umbraco.ModelsBuilder csproj
|
2019-07-01 10:19:09 +01:00 |
|
Warren Buckley
|
f01be09075
|
Update sourcelink & set from full to portable
|
2019-07-01 10:13:31 +01:00 |
|
Shannon
|
1c5ed58074
|
gets media picker working with ignore user start nodes
|
2019-07-01 18:54:39 +10:00 |
|
Shannon
|
42d86f147f
|
gets content picker ignore start nodes working, fixes descriptions
|
2019-07-01 18:23:36 +10:00 |
|
Shannon
|
fa4acb255b
|
fixes missing 'var'
|
2019-07-01 17:09:11 +10:00 |
|
Shannon
|
1885767ef1
|
Internalizes the new Anchor logic and removes it from the IContentService interface into extensions.
|
2019-07-01 16:33:09 +10:00 |
|
Shannon
|
80e6880bb7
|
more manual merging - getting anchors back in tinymce
|
2019-07-01 16:22:54 +10:00 |
|
Adam Nelson
|
fabacd1689
|
V8: Fixes case issue on metaData.hasChildren in mini list view as well as .toLowerCase() issue on undefined scope.entityTypeFilter.filter (#5744)
|
2019-07-01 07:48:57 +02:00 |
|
Warren Buckley
|
23a7654cea
|
Merge branch 'v8/dev' into v8/feature/sourcelink-update
|
2019-06-28 12:37:20 +01:00 |
|
Sebastiaan Janssen
|
b2d019bfe1
|
Merge pull request #5270 from umbraco/v8/bugfix/5268-audit-repository
Bugfix Audit service
|
2019-06-28 10:53:42 +02:00 |
|
Sebastiaan Janssen
|
9f817bf032
|
Merge pull request #5742 from umbraco/v8/fix/typeloader-static-fields
Typeloader change fields set by constructor to non static
|
2019-06-28 10:51:45 +02:00 |
|