Claus
|
fd8317493e
|
Merge branch 'dev-v7.8' into temp-U4-10707
# Conflicts:
# src/Umbraco.Web/Editors/TourController.cs
# src/Umbraco.Web/Umbraco.Web.csproj
|
2018-01-10 10:10:19 +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 |
|
Claus
|
a5ec5f46ac
|
filtering out tours.
|
2018-01-09 15:49:19 +01:00 |
|
Sebastiaan Jansssen
|
3e8fb11abd
|
Update to latest modelsbuilder
|
2018-01-08 08:39:01 +01:00 |
|
Sebastiaan Jansssen
|
d2f3e162f1
|
Bump version to 7.7.8
|
2018-01-04 16:45:00 +01: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
|
8053cea92d
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/UdiEntityType.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/umbraco.cms/umbraco.cms.csproj
|
2017-12-14 16:24:25 +11:00 |
|
Robert
|
1ff66d0c3a
|
Merge pull request #2345 from umbraco/temp-U4-10735
U4-10735 Examine update to better manage appdomain shutdowns
|
2017-12-13 10:52:56 +01:00 |
|
Sebastiaan Jansssen
|
b6b7b9f433
|
Bump version to 7.7.7
|
2017-12-11 13:57:31 +01:00 |
|
Shannon
|
131fea3ba4
|
updates some proj refs
|
2017-12-06 15:38:00 +01:00 |
|
Shannon
|
b0661218a0
|
U4-10735 Examine update to better manage appdomain shutdowns
|
2017-12-06 15:21:38 +01: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
|
7eca99e249
|
Bump version to 7.7.6
|
2017-11-15 15:21:25 +01:00 |
|
Sebastiaan Janssen
|
dad77fc506
|
Bump version to 7.7.5
|
2017-11-14 07:17:19 +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
|
1d52f59657
|
Puts tours on the file system and loads them from an api controller
|
2017-11-09 00:41:59 +11:00 |
|
Shannon
|
2fdd1c0bd2
|
bump version
|
2017-10-31 11:52:43 +11:00 |
|
Sebastiaan Janssen
|
18e377f159
|
U4-10564 - Update ImageProcessor dependencies
|
2017-10-24 13:20:33 +02:00 |
|
Sebastiaan Janssen
|
7e7f9902f6
|
Bumps version to 7.7.4
|
2017-10-23 14:18:00 +02:00 |
|
Sebastiaan Janssen
|
a36184a261
|
Bump version to 7.6.11
|
2017-10-23 14:14:59 +02:00 |
|
Sebastiaan Janssen
|
461ce64feb
|
Bump version to 7.6.10
|
2017-10-17 10:57:18 +02:00 |
|
Sebastiaan Janssen
|
80f172e3fb
|
Bump version to 7.7.3
|
2017-10-16 14:56:43 +02:00 |
|
Shannon
|
efd1ea5b86
|
bumps version
|
2017-09-29 13:18:58 +10:00 |
|
Sebastiaan Janssen
|
33cf983cae
|
Bump version
|
2017-09-25 11:19:36 +02:00 |
|
Sebastiaan Janssen
|
0070d8b913
|
Bump version
|
2017-09-19 14:23:58 +02:00 |
|
Sebastiaan Janssen
|
eda7f1e527
|
Bump version
|
2017-09-19 14:17:19 +02:00 |
|
Sebastiaan Janssen
|
0dfbe4d4eb
|
Bump version
|
2017-09-18 23:08:32 +02:00 |
|
Sebastiaan Janssen
|
48f2aa4f15
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2017-09-18 14:19:47 +02:00 |
|
Sebastiaan Janssen
|
5d74e61bcf
|
Bump version
|
2017-09-18 14:16:57 +02:00 |
|
Sebastiaan Janssen
|
1eea4867af
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-12 09:21:39 +02:00 |
|
Sebastiaan Janssen
|
237b7176bf
|
I see, we explicitly need to tell MsBuild not to build belle, fine
|
2017-09-12 09:19:34 +02:00 |
|
Sebastiaan Janssen
|
63343d89de
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-12 09:05:28 +02:00 |
|
Sebastiaan Janssen
|
1c5e2b5f73
|
No need for UmbracoBuild=True - the build scripts already manually build Belle once, this would just cause it to run again during MSBuild
|
2017-09-12 09:02:57 +02:00 |
|
Sebastiaan Janssen
|
26cce02984
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Web.UI.Client/test/config/karma.conf.js
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2017-09-12 08:52:10 +02:00 |
|
Sebastiaan Janssen
|
30af8cb928
|
Only build Belle when UmbracoBuild is set (from powershell input), lib folder doesn't exist or on rebuild
|
2017-09-12 08:47:36 +02:00 |
|
Shannon
|
1f083ca21c
|
removes the Belle build stuff from the csproj
|
2017-09-12 12:41:39 +10:00 |
|
Sebastiaan Janssen
|
3275f03aff
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# .gitignore
# build/UmbracoVersion.txt
# src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2017-09-11 15:46:54 +02:00 |
|
Sebastiaan Janssen
|
c66a763406
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-08 18:58:48 +02:00 |
|
Sebastiaan Janssen
|
8544aa685b
|
VS loves managing whitespace.. go ahead then
|
2017-09-08 14:12:53 +02:00 |
|
Sebastiaan Janssen
|
09c23e93c2
|
Looks for the build output app.js to determine if we need to call BuildBelle.bat
|
2017-09-08 14:12:53 +02:00 |
|
mikkelhm
|
895faf41b1
|
Update version to 7.6.7
|
2017-09-04 12:28:16 +02:00 |
|
Shannon
|
254d4e2067
|
updates to latest examine
|
2017-08-18 11:54:39 +10:00 |
|
mikkelhm
|
ca80a0cddc
|
Bump version to 7.6.6
|
2017-08-10 08:41:06 +02:00 |
|
mikkelhm
|
1c59c0b164
|
Dont output the Healthcheck.Release.config file when publishing the webapp, i.e. for nu nuget package
|
2017-08-02 23:57:37 +02:00 |
|
Jeavon
|
51f51c1762
|
Revert this csproj change, not sure when VS added it
|
2017-08-02 11:29:31 +01:00 |
|
Jeavon
|
b6e377a560
|
Removing further NuGet packages that were added by the Slack package
|
2017-08-02 11:25:28 +01:00 |
|
Jeavon
|
b915f723f5
|
Removing Slack Health Check notification
|
2017-08-02 11:20:00 +01:00 |
|