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

1391 Commits

Author SHA1 Message Date
Bjarke Berg
c975162e14 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-24 09:57:27 +01:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Bjarke Berg
5e79585149 Introduced Umbraco.Web.UI.Backoffice 2020-02-18 08:32:06 +01:00
Bjarke Berg
b850b3c8fe AB4950 - Created new Umbraco.Web.BackOffice project. Moved dashboards into this new project (#7615) 2020-02-10 09:06:29 +01:00
Bjarke Berg
d147b182ee Renamed the project to Umbraco.PublishedCache.NuCache - and move non NuCache related stuff to abstractions and infrastructure. 2020-02-06 14:40:46 +01:00
Bjarke Berg
0bc843b06d Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-06 14:09:23 +01:00
Bjarke Berg
a018315404 Removed references from web and Models builder.. Moved some classes to do so 2020-02-06 14:09:16 +01:00
Bjarke Berg
e13c17b02d Updated and aligned nuget package versions 2020-02-05 08:43:23 +01:00
Bjarke Berg
a3867d93dd Replaced the Umbraco.Examine.Lucene.csproj with the new format (PackageReferences) 2020-02-05 08:17:30 +01:00
Andy Butland
41fde9318d Restored accidental change of csproj 2020-02-04 19:19:51 +01:00
Bjarke Berg
420d8d2ba8 Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-04 07:14:41 +01:00
Bjarke Berg
47ca4a0207 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/3679-examine-netstandard 2020-02-03 14:18:27 +01:00
Andy Butland
171fce2ecb Moved PublishedCache from Umbraco.Web into .Net standard project. 
Returned to compiling state with a number of things to check and some temporarily commented out functionality.
 2020-01-30 20:08:03 +01:00
Bjarke Berg
f1daa125e6 Fix for merge issue with ports 2020-01-29 19:54:05 +01:00
Shannon
958118fc7f removes duplicate lines in csproj 2020-01-29 14:20:17 +11:00
Shannon
ecf5a5efbc reverts accidental change 2020-01-29 12:46:16 +11:00
Shannon
69f4ea5484 Renames Umbraco.Examine project to Umbraco.Examine.Lucene for the Lucene implementation part 2020-01-28 17:09:45 +11:00
Shannon
58537ce11a Updates to newer 2.0 version of Examine which has Examine.Core as netstandard 2020-01-28 15:21:58 +11:00
Bjarke Berg
a1ed2eb135 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-27 14:22:04 +01:00
Warren Buckley
8bf457a88d Set v8/dev to 8.7.0 with powershell .\build setumbracoversion 8.7.0 2020-01-24 09:10:54 +00:00
Bjarke Berg
257ea6c1c3 Merge remote-tracking branch 'origin/v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-24 09:32:34 +01:00
Bjarke Berg
4cf78d6ef0 Bump version to 8.5.3 2020-01-24 09:22:34 +01:00
Bjarke Berg
384ecbe22a Removed reference from Umbraco.Web.UI to Umbraco.TestData 2020-01-24 08:25:03 +01:00
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
5ddc4b8efb Bump version to 8.5.2 2020-01-17 11:51:31 +01: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