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

1348 Commits

Author SHA1 Message Date
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
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
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
Bjarke Berg
2b8805b69d Merge branch 'v8/dev' into vx/feature/unicore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-10-09 11:09:10 +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