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

1325 Commits

Author SHA1 Message Date
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
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
Bjarke Berg
1a9ed95235 Bumb version to 8.3 2019-09-26 10:05:41 +02:00
Shannon
ebf55f0031 merge issue from previous branch 2019-09-25 14:18:39 +02:00
Shannon
263072d5cd Merge remote-tracking branch 'origin/v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-09-25 14:13:33 +02:00
Sebastiaan Janssen
77ff96d64f Bump version to 8.1.5 2019-09-20 09:54:30 +02:00
Stephan
cbf6801d5a Merge branch v8/dev into v8/feature/mb-embed 2019-09-12 09:33:10 +02:00
Sebastiaan Janssen
47f365e415 Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-09-05 13:03:23 +02:00
Sebastiaan Janssen
e9bd0d9266 Bump version to 8.1.4 2019-08-29 14:58:58 +02:00
Warren Buckley
727c32843c Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-08-27 11:53:52 +01:00
Sebastiaan Janssen
d8355c368f Too many weird versions 2019-08-22 23:40:24 +02:00
Sebastiaan Janssen
4b9ce6bb10 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DateTimeExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/content/create.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web/Profiling/WebProfilerProvider.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2019-08-22 22:05:14 +02:00
Sebastiaan Janssen
8e2eccb392 Bump version to 7.15.2 2019-08-15 13:32:09 +02:00
Sebastiaan Janssen
a0af474c75 Bump version to 8.1.3 2019-08-15 13:29:14 +02:00
Shannon
db6714d3b8 Merge remote-tracking branch 'origin/v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
 2019-08-14 10:39:15 +10:00
Sebastiaan Janssen
046ed8ec85 Bump version to 8.1.2 2019-08-08 12:23:57 +02:00
Shannon
26d4d056be bumps version 2019-07-17 22:28:06 +10:00
Shannon
89cd655df2 Merge remote-tracking branch 'origin/v7/bugfix/build-without-vs2017' into v7/7.15 2019-07-17 21:48:21 +10:00
Shannon
14c4c4815d bumps version 2019-07-17 21:35:43 +10:00
Warren Buckley
61a18297d9 Make v8/dev now 8.2.0 2019-07-12 13:03:20 +01:00
Warren Buckley
03a4b75176 Ran .\build SetUmbracoVersion 8.1.1 to bump version 2019-07-11 15:11:37 +01:00
Claus
df896af476 adding build targets package. 2019-07-10 12:58:15 +02: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
f01be09075 Update sourcelink & set from full to portable 2019-07-01 10:13:31 +01:00
Warren Buckley
23a7654cea Merge branch 'v8/dev' into v8/feature/sourcelink-update 2019-06-28 12:37:20 +01:00
Stephan
ee83c02424 Import slimmed down ModelsBuilder 2019-06-27 12:47:19 +02:00
Stephan
347c2e8238 Upgrade to ModelsBuilder 8.1.0 2019-06-26 12:30:13 +02:00
Warren Buckley
003ee1a991 Added in Microsoft.SourceLink.GitHub Nuget package 2019-06-23 19:57:43 +01:00
Sebastiaan Janssen
40d4a8fe6a Modelsbuilder is asking for too old a version of CodeAnalysis, Immutable and Metadata dependencies 2019-06-21 13:32:53 +02:00
Sebastiaan Janssen
57c368f70d Bumps version to 7.15.0 2019-06-07 14:32:02 +02:00
Sebastiaan Janssen
5faa71187d More Owin updates 2019-06-06 15:21:05 +02:00
Sebastiaan Janssen
c069f262dc Update MVC, Razor, WebApi and Owin 2019-06-06 14:50:01 +02:00
Sebastiaan Janssen
9f42e6a607 Update ImageProcessor and Newtonsoft.Json dependencies to the latest version 2019-06-06 14:37:57 +02:00
Sebastiaan Janssen
1c87176d80 Merge branch 'v7/dev' into pr/3064 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/packages.config
#	src/umbraco.MacroEngines/packages.config
 2019-06-06 12:50:48 +02:00
Claus
a01efcb59f fix for vs2019 release build tools. 2019-04-29 13:59:16 +02:00
Stephan
70c2090a56 Refactor more mappers - AutoMapper gone now 2019-03-27 09:15:32 +01:00
Stephan
c85c055424 Upgrade to ModelsBuilder 8.0.2, support Custom Tool (#4881) 
* Upgrade to ModelsBuilder 8.0.2, support Custom Tool

* Upgrade to ModelsBuilder 8.0.3

* Fix controllers

* Upgrade MB

* Fix previous commit
 2019-03-11 23:14:32 +11:00
Shannon
34a3389c17 Updates to latest Examine 2019-03-05 12:50:51 +11:00
Stephan
ad62983327 Introduce ILivePublishedModelFactory 2019-02-21 19:15:35 +01:00
Sebastiaan Janssen
91c52cffc8 And revert again 2019-02-19 15:57:40 +01:00