yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,062 Commits 4 Branches 7 Tags
487d2c6ea16eb0bd708eecaeff5a036a2ced9b2b
Commit Graph

434 Commits

Author SHA1 Message Date
Shannon
8b2606f681 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2016-01-13 17:31:35 +01:00
Shannon
5aab50ba3b Ensures fcnMode and file size maximums are set for the debug web config transform and also for the nuget transform. 2016-01-13 17:27:56 +01:00
Sebastiaan Janssen
5a62713de4 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
 2016-01-12 11:39:10 +01:00
Shannon
b0060a9592 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/InstallGit.cmd
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
	src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
	src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
	src/Umbraco.Web/WebServices/SaveFileController.cs
 2016-01-06 10:46:38 +01:00
Sebastiaan Janssen
db538d95ba Bumps version 2016-01-05 16:11:59 +01:00
Sebastiaan Janssen
5081027482 Improve batch files: SETLOCAL makes sure we don't change the user's actual path, so no need to revert changes any more either 2016-01-05 11:33:10 +01:00
Shannon
c6dbb0f7fa reverts member tree order 2015-12-28 10:35:54 +01:00
Stephan
0df4949b82 Merge pull request #960 from umbraco/temp-deploy-31 
deploy-31 Implement DB changes for Umbraco Deploy
 2015-12-17 10:28:11 +01:00
Sebastiaan Janssen
a0ac0b55d0 Update trees transform with new aliases and sorting, also re-ordered member tree to have member types first, think that was the intention 2015-12-16 17:02:10 +01:00
Shannon
8260c12d64 deploy-31 Implement DB changes for Umbraco Deploy 2015-12-16 14:07:09 +01:00
Sebastiaan Janssen
7e5ffdf0ca Update in case people have 64bit git installed 2015-12-16 13:00:28 +01:00
Shannon
26b70a4a4e Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
 2015-12-15 10:40:52 +01:00
Sebastiaan Janssen
220446afec Adds some more dependencies so we upgrade those properly when necessary 2015-12-08 14:24:52 +01:00
Sebastiaan Janssen
e90fedb835 Bumps version 2015-12-08 13:54:57 +01:00
Sebastiaan Janssen
9949e2676d Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-12-01 15:16:57 +01:00
Shannon
610efe552d Bumps version 2015-11-27 16:54:02 +01:00
Sebastiaan Janssen
4baaafd006 Also remove change password dashboard from nuget package 2015-11-26 11:57:37 +01:00
Sebastiaan Janssen
d0865017d1 Merge branch 'dev-v7' into 7.4.0 2015-11-18 19:42:13 +01:00
Sebastiaan Janssen
aca181b32e U4-7410 Version issue with MySql.Data after upgrade to 7.3.1. 
#U4-7410 Fixed
 2015-11-18 19:39:10 +01:00
Sebastiaan Janssen
05c592860d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-11-17 13:43:19 +01:00
Sebastiaan Janssen
e01cbcd405 Fix failing upgrade due to old dll being in bin folder 2015-11-17 09:24:22 +01:00
Shannon
f32479bb10 bumps version 2015-11-13 11:26:31 +01:00
Shannon
a0761b92b8 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/RevertToCleanInstall.bat
	build/RevertToEmptyInstall.bat
	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbavatar.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/views/components/application/umb-avatar.html
	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
 2015-11-09 12:33:53 +01:00
Sebastiaan Janssen
48fdb75d96 Improves clean scripts for Claus 2015-11-09 09:25:59 +01:00
Sebastiaan Janssen
a97094458d U4-7356 <siteMap><providers> element can only be added once, when using nuget update-packge 
U4-7356 Fixed
 2015-11-09 09:25:58 +01:00
Sebastiaan Janssen
bbe4a87784 U4-6171 Continuous Deployment from Visual Studio Online to Azure Websites not working as expected 
#U4-6171 Fixed
 2015-10-29 16:07:07 +01:00
Sebastiaan Janssen
cbd5c295bd Merge pull request #728 from vnbaaij/dev-v7 
Fix for #U4-6171 Continuous Deployment from Visual Studio Online to A…
 2015-10-29 16:05:20 +01:00
Shannon
30ad3f5aa6 bumps version 2015-10-15 17:12:13 +02:00
Claus
5af5599371 Ensuring the RevertToCleanInstall and RevertToEmptyInstall scripts only deletes view files. 2015-10-14 14:56:03 +02:00
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
Vincent Baaij
e25886180a Merge remote-tracking branch 'upstream/dev-v7' into dev-v7 2015-09-09 13:57:35 +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
Vincent Baaij
d5a41d41e9 Merge remote-tracking branch 'upstream/dev-v7' into dev-v7 2015-08-18 09:14:11 +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