yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,127 Commits 4 Branches 7 Tags
6ea92daa70cc834cc8e33409f5f404794de025b9
Commit Graph

389 Commits

Author SHA1 Message Date
Sebastiaan Janssen
780776072d Update umbracoDefaultUILanguage to en-US 2017-08-24 21:03:31 +02:00
Shannon
254d4e2067 updates to latest examine 2017-08-18 11:54:39 +10:00
Jeavon
b915f723f5 Removing Slack Health Check notification 2017-08-02 11:20:00 +01:00
Jeavon
8259024e20 Merge branch 'dev-v7.7' into temp-U4-9984 
# Conflicts:
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
 2017-08-02 10:48:43 +01:00
mikkelhm
6655be5f5e Updates the trees.config.install.xdt to update the tree.config with the new User section 2017-08-01 14:24:04 +02:00
mikkelhm
005bee7650 Updates web.config.install.xdt to have the latest assemblyBindings for the Katana libs(Owin), v 3.1.0.0 2017-08-01 10:29:22 +02:00
Shannon
bcf4a84725 fixes more tests, gotta be close now 2017-07-31 19:47:02 +10:00
Jeavon
3083f185d0 Merge branch 'dev-v7.7' into temp-U4-9984 2017-06-26 18:01:57 +01:00
Shannon Deminick
08c4a75af7 Merge pull request #1945 from protherj/U4-9792-fips-support 
U4-9792 -- Update Umbraco to be FIPS compliant
 2017-06-13 15:05:21 +02:00
Jeavon Leopold
57bb47a78b Add xdt transforms for adding the HealthChecks config to Web.Config 2017-06-05 15:31:21 +02:00
Jeavon Leopold
a102a7c094 Adding Slack.Webhooks to nuspec 2017-06-05 13:30:26 +02:00
Shannon Deminick
b41de9b623 Merge pull request #1944 from umbraco/temp-U4-9848 
U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors
 2017-05-19 12:02:11 +10:00
Jason Prothero
2334596bf3 Update Unit Tests to check for the correct version of Examine 2017-05-16 11:06:00 -07:00
Sebastiaan Janssen
99d4b13bb0 Adds SQLCE assembly redirect on fresh installs and upgrades 2017-05-15 22:54:46 +02:00
Sebastiaan Janssen
e7b007386a U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors 2017-05-15 19:00:05 +02:00
Shannon
d3fcdfb176 updates nuget semver ref in nuspec 2017-04-30 23:24:26 +10:00
mikkelhm
c9a816f25e Adds assemblyRedirect for log4net in the nuget upgrade transform 2017-04-19 12:21:49 +02:00
Shannon
d5a71ec1da Adds important note for 7.6 upgrades to the nuget upgrade doc 2017-04-19 16:05:24 +10:00
Shannon
777b02b84c Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/IO/IFileSystem.cs
#	src/Umbraco.Core/Media/ImageHelper.cs
#	src/Umbraco.Core/Models/ContentExtensions.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/packages.config
 2017-04-18 20:17:59 +10:00
Sebastiaan Janssen
376c78381d One more.. Reverts CodeAnalysis update to stay compatible with Models builder 2017-04-10 15:02:04 +02:00
Shannon
9f2c428a7c updates to latest Models Builder 2017-04-10 16:12:23 +10:00
Shannon
62ddce60a5 updates nuspec 2017-04-07 12:09:05 +10:00
Shannon
d582d5c827 Fixes log4net nuspec entry 2017-04-07 12:06:17 +10:00
Shannon
e5af5bcc22 more binding redirects missing 2017-04-07 11:47:22 +10:00
Shannon Deminick
9f7f920229 Merge pull request #1868 from umbraco/issue-U4-9745 
U4-9745 Update outdated NuGet dependencies
 2017-04-07 11:38:18 +10:00
Shannon
d1d98372cd Fixes binding redirects local transforms and nuget transforms 2017-04-07 11:37:23 +10:00
Sebastiaan Janssen
16582c8207 U4-9745 Update outdated NuGet dependencies 2017-04-06 16:27:41 +02:00
Shannon
b2a497ddba missing signalr reference in nuspec 2017-04-05 19:17:12 +10:00
Shannon
2248a85876 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Core/Services/ContentTypeService.cs
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
#	src/Umbraco.Web.UI/packages.config
 2017-04-03 21:50:22 +10:00
Stephan
95508c4fb7 Upgrade nuspec accordingly 2017-03-30 09:32:22 +02:00
Shannon
c5f388f6bc Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/packages.config
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2017-03-30 17:03:51 +11:00
Shannon
25f5179b29 updates nuspec 2017-03-30 16:36:54 +11:00
Shannon Deminick
a667058422 Merge pull request #1828 from umbraco/temp-u4-9655 
U4-9655 - update HtmlAgilityPack version in config
 2017-03-29 16:33:37 +11:00
Stephan
a2a9794fdb U4-9655 - update HtmlAgilityPack version in config 2017-03-24 14:47:27 +01:00
Shannon
2ae236e98d Adds xml transform for partial view tree types 2017-03-23 18:48:41 +11:00
Shannon Deminick
04d37c590b Merge pull request #1786 from umbraco/temp-U4-9004 
U4-9004 Remove URLRewriting.net dependency
 2017-03-14 16:25:41 +11:00
Shannon
df04100ff6 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
#	src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
 2017-03-10 10:40:28 +01:00
Sebastiaan Janssen
13aa615745 U4-9004 Remove URLRewriting.net dependency 2017-03-09 11:41:36 +01:00
Stephan
d1111009e3 Fix SemVer lib version 2017-03-08 18:45:00 +01:00
Claus
9f6e4d4fd5 updating nuspec. 2017-03-08 12:04:48 +01:00
James Coxhead
9acfd8f5d2 Updated dashboard config transform 
Fix for dupicate dashboards after upgrading
 2017-03-02 21:02:25 +00:00
Shannon
f30d7fc68c Fixes nuspec to be net45 as a min 2017-02-14 14:29:23 +11:00
Shannon
ce0821e2d6 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-02-09 13:20:33 +11:00
Sebastiaan Janssen
311edd3279 Adds missing dependency (it's in dev-v7, must have been a merge where it was forgotten to be merged into dev-v7.6) 2017-02-08 10:36:36 +01:00
Claus
24063c403a Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-1324 
Conflicts:
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/packages.config
 2017-02-08 09:14:27 +01:00
Shannon
f4f1f6774d U4-9499 Update to latest Json.Net 2017-02-08 17:47:32 +11:00
Warren Buckley
ba6705a706 Merge branch 'dev-v7.6' into temp-U4-9314 2017-02-07 17:27:07 +00:00
Sebastiaan Janssen
73e219b23c Fix unit tests 2017-02-07 16:24:34 +01:00
Sebastiaan Janssen
389b29599b U4-9495 ImageProcessor high CPU usage when trimCache=true 2017-02-07 10:29:11 +01:00
Shannon
a71ec8dd81 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-02-07 12:50:44 +11:00