yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,467 Commits 4 Branches 7 Tags
1bfb64bdd871516d4a5ce304ead547f2ed83a85f
Commit Graph

1367 Commits

Author SHA1 Message Date
Bjarke Berg
1bfb64bdd8 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Constants-AppSettings.cs
#	src/Umbraco.Abstractions/ContentVariationExtensions.cs
#	src/Umbraco.Abstractions/IMainDom.cs
#	src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
#	src/Umbraco.Abstractions/Runtime/IMainDom.cs
#	src/Umbraco.Abstractions/Runtime/MainDom.cs
#	src/Umbraco.Core/IMainDom.cs
#	src/Umbraco.Core/MainDom.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/MainDom.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
#	src/Umbraco.Web/UmbracoApplication.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2020-01-23 13:16:49 +01:00
Bjarke Berg
47c211907a AB4635 - Fixed up some of the review comments - Removed static (de)serializers and get the CacheRefresher from the collection 2020-01-22 14:09:20 +01:00
Bjarke Berg
d7377bd9b4 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 10:51:04 +01:00
Shannon
4cf204f8f5 Merge branch 'v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 13:40:16 +11:00
Shannon
8cc78631a0 Adds TestData project along with test endpoints for enabling/disabling segments 2020-01-21 13:33:39 +11:00
Benjamin Carleski
94f42c3223 Update package references to fix compilation error 2020-01-17 17:21:50 -08:00
Bjarke Berg
6d92f5915a Merge remote-tracking branch 'origin/v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-15 13:44:42 +01:00
Bjarke Berg
10e5d5c7ac bump version to 8.5.1 2020-01-15 07:06:30 +01:00
Shannon
6f420b9577 Merge branch 'v8/bugfix/contentquery-search' of https://github.com/ronaldbarendse/Umbraco-CMS into ronaldbarendse-v8/bugfix/contentquery-search 2020-01-15 12:18:52 +11:00
Bjarke Berg
44a36227f9 Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure 
Netcore/feature/ab4227 move files to infrastructure
 2020-01-06 14:59:17 +01:00
Sebastiaan Janssen
d988d07c5d Merge branch 'v8/dev' into v8/contrib 2020-01-06 14:34:17 +01:00
Warren Buckley
ad53b76308 Merge branch 'v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-03 11:59:05 +00:00
Shannon
a1769dd937 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-18 15:28:27 +11:00
Shannon
9e9a2d8379 Adds TestData project with an endpoint to create content/media hieararchy for testing 2019-12-17 10:38:03 +11:00
Warren Buckley
b78d8fa3e1 Merge pull request #6795 from umbraco/v8/feature/mb-embed 
V8: Embed models builder
 2019-12-16 11:42:01 +00:00
Warren Buckley
ba82e51c72 Bumped to 8.5.0 
powershell .\build setumbracoversion 8.5.0
 2019-12-06 09:48:35 +00:00
Shannon
4338a8f32d Merge branch 'netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-18 20:23:31 +11:00
Shannon
cd3a97ce75 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Abstractions/Constants-Conventions.cs
 2019-11-18 19:58:42 +11:00
Ronald Barendse
b9e749152f Merge branch 'v8/dev' into v8/bugfix/contentquery-search 2019-11-15 09:49:50 +01:00
Bjarke Berg
a97e131891 Bump version o 8.6 (8.5 reserved for MB release) 2019-11-14 14:00:49 +01:00
Bjarke Berg
c0dc545c27 Fix for csproj 2019-11-14 13:54:04 +01:00
Bjarke Berg
7c72fb57f2 Merge remote-tracking branch 'origin/v8/8.3' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Cache/LanguageCacheRefresher.cs
 2019-11-14 13:40:32 +01:00
Ronald Barendse
634f648517 Require Examine 1.0.2 2019-11-14 09:20:18 +01:00
Bjarke Berg
7eef6b4037 https://github.com/umbraco/Umbraco-CMS/issues/7125 - Updates the projects to use the same versions as required by our nuspec 2019-11-12 08:50:31 +01:00
Bjarke Berg
ed82bd05c6 AB3649 - Abstracted IPropertyType, IProperty and IPropertyValue 2019-11-08 14:27:27 +01:00
Bjarke Berg
05569440c4 Post merge fixes - Port number 2019-11-07 14:47:41 +01:00
Bjarke Berg
563f58afa6 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-11-07 14:34:45 +01:00
Bjarke Berg
3df329deb2 bump version and remove unused references 2019-11-05 16:52:22 +01:00
Bjarke Berg
1732fad780 Merge remote-tracking branch 'origin/v8/feature/mb-embed' into netcore/feature/mb_embed 2019-11-05 07:54:49 +01:00
Bjarke Berg
88e57277fa Bump version to 8.4.0 2019-11-04 12:58:08 +01:00
Bjarke Berg
501f9495a9 Bumb version to 8.3 2019-11-04 11:30:52 +01:00
Shannon
065e3c1ba3 removes the MB package 2019-11-01 11:33:15 +11:00
Bjarke Berg
34d9e0cd09 Merge branch 'v8/dev' into v8/feature/mb-embed 2019-10-31 12:33:01 +01:00
Bjarke Berg
bf16a5936e Merge remote-tracking branch 'origin/v8/feature/mb-embed' into v8/feature/mb-embed 2019-10-31 12:32:51 +01:00
Bjarke Berg
851a4e0d56 Fix Umbraco.Web.UI.csproj after auto merge 2019-10-31 11:49:43 +01:00
Bjarke Berg
ad6343719b Merge branch 'v8/8.2' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-10-31 11:48:53 +01:00
Bjarke Berg
ef38fc1a6d Bump version to 8.2.2 2019-10-31 10:02:08 +01:00
Bjarke Berg
eade92e803 Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore 
# Conflicts:
#	src/Umbraco.Core/ObjectExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-10-30 13:35:48 +01:00
Ronald Barendse
7f0a077f58 Add SecurityCodeScan static code analyzer (#6636) 
* Added SecurityCodeScan to all projects

* Enable analysing of content items
 2019-10-29 19:37:15 +01:00
Bjarke Berg
1436441f78 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/mb-embed 2019-10-29 16:09:43 +01:00
Bjarke Berg
d82918d39c Merge branch 'v8/feature/AB3289-MB-allow-legacy' into v8/feature/AB3389-MB-Move_js_from_app_plugins 2019-10-29 14:44:10 +01:00
Bjarke Berg
a00824484d Revert "AB3289 - Do not use the nuget package as default" 
This reverts commit 7d08040f
 2019-10-29 14:43:43 +01:00
Bjarke Berg
7d08040f34 AB3289 - Do not use the nuget package as default 2019-10-29 14:29:58 +01:00
Bjarke Berg
17e28b6840 AB3389 - Move the stuff from App_Plugins/ModelsBuilder into Umbraco.Web.UI.Client and handle dashboard as code. 2019-10-29 14:28:54 +01:00
Shannon
cd89308711 Ensures embedded MB is enabled on the UI proj, disables embedded MB if the legacy MB is detected 2019-10-29 01:14:10 +11:00
Shannon
3b6abbb936 Renames project: Umbraco.ModelsBuilder.Embedded and namespaces since we need a different assembly, updates nuspec, changes file path of MB app_plugins 2019-10-29 00:25:03 +11:00
Bjarke Berg
050fc1576b Merge branch 'v8/8.2' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-10-22 16:23:13 +02:00
Bjarke Berg
54bb5bb835 Bump version to 8.2.1 2019-10-22 16:07:37 +02:00
Bjarke Berg
e1c6f721b0 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/mb-embed 2019-10-21 13:33:59 +02:00
Ronald Barendse
0dea83543e Removed Microsoft.Net.Compilers dependency (#6501) 2019-10-14 13:39:53 +02:00