yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,950 Commits 4 Branches 7 Tags
142a319776cd673c3e1532d76e7cd00a7884feb0
Commit Graph

980 Commits

Author SHA1 Message Date
Shannon
b3cbcebf5b Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-15 16:27:29 +11:00
Stephan
7f12cff3bd Minor build cleanup 2018-01-11 16:25:18 +01:00
Shannon
9ad8e6a876 fixes nuspec for tour files 2018-01-12 00:20:06 +11:00
Stephan
ad882ab5be Merge remote-tracking branch 'origin/dev-v7.8' into temp-U4-10789 2018-01-10 15:58:18 +01:00
Shannon
11fa015b64 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2018-01-10 15:08:10 +11:00
Shannon
df553140e8 Updates to latest 1.9.4 of CDF and updates Nuspec 2018-01-10 12:25:24 +11:00
Sebastiaan Jansssen
3e8fb11abd Update to latest modelsbuilder 2018-01-08 08:39:01 +01:00
Shannon
a9713dc6fc Converts the xslt tree to a controller, ensures all config for trees is correct and transforms for upgrades applied 2018-01-05 13:44:57 +11:00
Shannon
9e2c7d16a6 Merge branch 'dev-v7' into dev-v7.8 2017-12-14 18:35:34 +11:00
Shannon
44db4e7a48 updates nuspec and references to use latest Examine 2017-12-14 18:34:48 +11:00
Shannon
680d97c630 Make sure the back office tour files are included in the nuget release 2017-12-14 16:51:48 +11:00
Mads Rasmussen
4bfb2d219b Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-11-16 12:01:26 +01:00
Sebastiaan Janssen
000ba73887 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/packages.config
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/UmbracoExamine/packages.config
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2017-11-13 15:38:59 +01:00
Sebastiaan Janssen
08b81d991b Update to latest ImageProcessor 2017-11-13 15:33:54 +01:00
Sebastiaan Janssen
4937f87c0d Update to latest Examine 2017-11-13 15:27:15 +01:00
Shannon
a2025c14b1 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-10-31 11:18:52 +11:00
Stephan
ab758001ef Cleanup more build 2017-10-26 17:52:51 +02:00
Stephan
2305426dda Version -alpha.30 with ModelsBuilder -alpha.13 2017-10-26 11:25:01 +02:00
Stephan
edc5b398bd Version 8.0.0-alpha.29 2017-10-25 14:25:52 +02:00
Stephan
cf46a51866 Getting NestedContent and ModelsBuilder happy 2017-10-25 13:23:14 +02:00
Claus
fa68bee762 removing left over using statements and references to SharpZipLib. 2017-10-24 15:16:12 +02:00
Sebastiaan Janssen
18e377f159 U4-10564 - Update ImageProcessor dependencies 2017-10-24 13:20:33 +02:00
Stephan
0fe96a58c1 Migrate to Umbraco.Build 2017-10-20 17:53:41 +02:00
Stephan
890b87a1cf More build fixing 2017-10-16 17:51:53 +02:00
Warren Buckley
5df4d3509d Fix in PowerShell build - The 7Zip tool download was giving two paths & thus break the build script 
(cherry picked from commit a2e6da2491)
 2017-10-16 14:22:09 +02:00
Warren Buckley
a2e6da2491 Fix in PowerShell build - The 7Zip tool download was giving two paths & thus break the build script 2017-10-13 11:19:39 +01:00
Stefano Chiodino
647d3e8792 Normalises whitespace (replace tabs) and add EOF line 2017-10-05 19:17:06 +01:00
Stephan
4a2ee801d4 Fix build 2017-09-29 22:07:48 +02:00
Stephan
d32f18f9e7 Relax versionning, version 8.0.0-alpha.26 2017-09-29 18:33:33 +02:00
Stephan
477acb4de3 Fix build, version 8.0.0-alpha024 2017-09-27 11:35:51 +02:00
Sebastiaan Janssen
7e25501ac5 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-27 10:08:44 +02:00
Claus
581eac5369 U4-10470 Missing transform for the scripts tree when upgrading 2017-09-27 10:04:07 +02:00
Sebastiaan Janssen
c9ea1a5504 Copy Azure Gallery script to output folder 2017-09-22 17:03:20 +02:00
Sebastiaan Janssen
10da318989 Get-FileHash is now unused 2017-09-22 16:54:34 +02:00
Sebastiaan Janssen
74e3308017 Adds Azure Gallery release script - no more need for WebPI builds 2017-09-22 16:52:04 +02:00
Sebastiaan Janssen
92b6e276bf U4-10443 Remove xmlrpcnet from nuspec 2017-09-21 08:44:59 +02:00
Sebastiaan Janssen
fd35d89949 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-19 18:51:23 +02:00
Sebastiaan Janssen
1b3fc9fb21 Oops! Add -docs for all the log file pipes 2017-09-19 18:37:00 +02:00
Sebastiaan Janssen
2e98651d62 Create the out and tmp folders correctly 2017-09-19 18:16:19 +02:00
Sebastiaan Janssen
704e981284 Always do the node/bower/gulp build to get docs, start with node build first 2017-09-19 18:15:31 +02:00
Stephan
ca0d5e365a Port 7.7 - WIP 2017-09-19 16:46:49 +02:00
Sebastiaan Janssen
9c0500325d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-19 14:23:26 +02:00
Sebastiaan Janssen
e33a28ac19 Making sure we don't build Belle twice for the documentation 2017-09-19 11:38:20 +02:00
Sebastiaan Janssen
dd440eb9d5 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
 2017-09-13 12:09:17 +02:00
Sebastiaan Janssen
00b469b61b Easy ps script to just update the Umbraco version without having to do a full build 2017-09-13 12:07:29 +02:00
Sebastiaan Janssen
4d7f66736d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-12 11:41:37 +02:00
Sebastiaan Janssen
4cb7b29f60 Try to make build server do the npm/gulp tasks on it's own 2017-09-12 11:20:46 +02:00
Sebastiaan Janssen
fb2f9cea64 Make VSTS responsible for padding the build number 2017-09-12 11:03:56 +02:00
Sebastiaan Janssen
394f21f4be Make it possible for the build server to set an alpha build version 2017-09-12 10:38:22 +02:00
Sebastiaan Janssen
1eea4867af Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-12 09:21:39 +02:00