yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,941 Commits 4 Branches 7 Tags
327a00aaf4b6f12e8221631968965dcf1db05646
Commit Graph

401 Commits

Author SHA1 Message Date
Claus
30d8e53541 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 2015-10-14 09:58:43 +02:00
Sebastiaan Janssen
4142f47861 U4-6125 Installing MySQL Web Provider Breaks Page Publishing 
#U4-6125 Fixed Due in version 7.3.1
 2015-10-13 13:48:58 +02:00
Sebastiaan Janssen
7135f9a268 Removes message that is no longer correct 2015-10-13 13:12:28 +02:00
Sebastiaan Janssen
96d46c82fe U4-7193 NuGet install doesn't add all bindingRedirects 
#U4-7193 Fixed Due in version 7.3.1
 2015-10-06 08:58:19 +02:00
Sebastiaan Janssen
5fab1ea436 U4-7164 Nuget Update-Package UmbracoCms fails if I have removed dashboard section 
#U4-7164 Fixed Due in version 7.3.1
 2015-10-01 08:52:40 +02:00
Shannon
79eb8176ac bumps version and website port 2015-09-23 14:21:14 +02:00
James Jackson-South
6b639e940c Update ImageProcessor dependency for core 
An update to U4-7053. Reduced memory usage plus web optimised images.
 2015-09-23 16:05:07 +10:00
Sebastiaan Janssen
b9dd0ab1a9 Bump version 2015-09-16 18:58:45 +02:00
Sebastiaan Janssen
4572b55f98 U4-7029 Upgrading Umbraco will remove owin:startup key if configured differently 
#U4-7029 Fixed
 2015-09-15 10:17:31 +02:00
Sebastiaan Janssen
d4fb28607d U4-7053 Update ImageProcessor dependency for core 
#U4-7053 Fixed
 2015-09-01 15:35:42 +02:00
Sebastiaan Janssen
add2f57397 Bump version 2015-08-21 13:30:29 +02:00
Sebastiaan Janssen
08ddb5f4c4 Update NuGet dependency for Examine 2015-08-19 18:47:27 +02:00
Sebastiaan Janssen
50da9bcb50 Should help with U4-4049 Some images fail when uploading multiple media files 2015-08-13 12:26:00 +02:00
Shannon
34fd405bca Downgrades AutoMapper to the version before the assembly was signed (breaking!), we're stuck on < 3.1 because Automapper decided to sign an assembly in a minor version, nothing we can do till v8 2015-08-05 13:35:42 +02:00
Sebastiaan Janssen
2d15c9c01c Use the new views config transform 2015-07-30 17:08:40 +02:00
Sebastiaan Janssen
58e648828b Fix web.config and adds a transform for NuGet 2015-07-30 17:08:40 +02:00
Sebastiaan Janssen
d87b268a40 Update to MVC5 2015-07-30 17:08:39 +02:00
Sebastiaan Janssen
51eae92a5a Update json.net everywhere 2015-07-27 16:11:18 +02:00
Sebastiaan Janssen
0be3f3fb76 Oops, wrong path! Come on msbuild: just intuit what I wanted to do! :) 2015-07-27 16:08:28 +02:00
Sebastiaan Janssen
9f000eb90c Updates build to include and exclude correct files, syncs web.config and syncs dependency versions between core and nuget pkg 2015-07-27 15:52:10 +02:00
Sebastiaan Janssen
3c884b583e U4-6762 7.3 beta: Could not load file or assembly 'System.Web.Mvc, Version=4.0.0.0 
#U4-6762 Fixed
 2015-07-20 11:30:41 +02:00
Shannon
d5460068d4 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Macros/MacroTagParser.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Controllers/BackOfficeControllerUnitTests.cs
	src/Umbraco.Tests/Macros/MacroParserTests.cs
	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/umbraco.cms/Actions/Action.cs
 2015-07-16 17:04:25 +02:00
Shannon
c2dc896fce working on: U4-6756 Don't ship or generate unnecessary folders 2015-07-16 15:29:46 +02:00
Sebastiaan Janssen
2f714d0b3e Update MySql.Data dependency 2015-07-16 13:59:19 +02:00
Shannon
6ee6c77d6e bumps version 2015-07-16 11:10:36 +02:00
Shannon
ba1d546579 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	src/Umbraco.Core/MainDom.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	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
 2015-07-15 14:58:19 +02:00
Sebastiaan Janssen
ed05a3223f Update Examine NuGet dependency 2015-07-15 12:52:24 +02:00
Stephan
db0cfad6b9 Merge 7.2.7 into dev-v7 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	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/umbraco.MacroEngines/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/umbraco.controls.csproj
	src/umbraco.editorControls/umbraco.editorControls.csproj
 2015-07-14 19:57:56 +02:00
Sebastiaan Janssen
a7871abbd9 Update Examine and ClientDependency to latest version 2015-07-14 16:50:45 +02:00
Shannon
3bc4b50d74 updates version 2015-07-08 11:36:50 +02:00
Sebastiaan Janssen
30dfd2772b "+" in the version doesn't work with the current NuGet 2015-07-07 15:20:35 +02:00
Sebastiaan Janssen
b903e0503f "+" in the version doesn't work with the current NuGet 2015-07-07 15:11:58 +02:00
Sebastiaan Janssen
db030ffa31 Adds the ability to pass in a nightly version to the version comment 2015-07-07 15:11:57 +02:00
Shannon
bf19d61d14 bumps txt version 2015-07-06 18:02:25 +02:00
Shannon
a7029e4733 Fixes up migration runner with regard to semver numbers. All migrations for a normal version within a build number will execute. For example if migrating from 7.3.x-x to 7.3.0 (final), all migrations for 7.3 will execute. 2015-06-24 15:20:08 +02:00
Sebastiaan Janssen
b7aadaa3d2 Experiment with less verbose logging for the build (so AppVeyor is easier to use) 2015-06-21 14:41:18 +02:00
Shannon
20e265491f Updates to latest AutoMapper and HtmlAgility 2015-06-16 10:19:34 +02:00
Sebastiaan Janssen
0695839717 Updates version 2015-06-09 19:39:45 +02:00
Stephan
83d5eda63c Bugfix xdt upgrade to 7.3 2015-06-09 12:22:08 +02:00
Sebastiaan Janssen
f100d82e2c Bump version 2015-06-03 14:03:04 +02:00
Shannon
9f82ae1db7 unspec to mvc 4.0.0.1 2015-05-11 10:52:38 +10:00
Shannon
3be1cd8b0d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
 2015-05-07 16:24:29 +10:00
Sebastiaan Janssen
2e6c643dde Bump version 2015-05-06 11:08:25 +02:00
Sebastiaan Janssen
d84b8aa675 Fix duplication of the mysql DbProviderFactory when using NuGet 2015-05-06 11:04:09 +02:00
Shannon
d01e963365 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 
Conflicts:
	src/Umbraco.Web.UI/packages.config
 2015-05-06 17:28:05 +10:00
Shannon
821daa82c4 Fixes: U4-6474 Update to latest examine v0.1.63 2015-05-06 17:14:10 +10:00
Sebastiaan Janssen
a51dd93ffe Expressed version range was wrong 2015-05-06 08:58:45 +02:00
Sebastiaan Janssen
4144590189 Upgrade to latest MySql.Data and loosen up NuGet dependency 2015-05-05 12:15:28 +02:00
Shannon
6849274b98 reverts umb version 2015-05-05 13:03:05 +10:00
Shannon
2f9753cc12 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/umbraco.macroRenderings/app.config
 2015-05-05 12:27:01 +10:00