yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,854 Commits 4 Branches 7 Tags
b8ea50d644fac11f29a7f9cb2cbc1899fa9074ad
Commit Graph

10854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
b8ea50d644 Merge remote-tracking branch 'origin/6.2.4' into 7.1.8 
Conflicts:
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
	src/Umbraco.Tests/Services/EntityServiceTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-10-08 17:30:45 +11:00
Shannon
1eab26c0f6 reverts IQuery 2014-10-08 17:26:55 +11:00
Shannon
0543c620eb bumps version 2014-10-08 17:25:06 +11:00
Shannon
646e5f173d Fixes descendant queries to ensure that the comma is suffixed to the path, otherwise strange things could happen when there are longer ids! 2014-10-08 17:23:14 +11:00
Shannon
b5594517bd Fixes: U4-5583 Can no longer link to Media Items from RTE in 6.2.3 - Due to a cherry pick/merge issue since the newer 7.x EntityRepository deals with NVarchar and NText values whereas the 6.x one did not. Have backported the mapping poco classes to now also support NVarchar and NText for the EntityRepository. Have also fixed the basic query to ensure that there are no left joins before inner joins which can also cause problems. Fixed up the duplicate where clause. Adds more tests to entity service. 2014-10-08 17:13:28 +11:00
Sebastiaan Janssen
5501c9531b Bump version 2014-10-07 11:22:51 +02:00
Shannon
8824ab2b27 reverts JS from tree controller and updates the c# method to create the tree child node URLs to ensure the custom start node param is ignored, this is a bit cleaner. 2014-10-07 12:52:02 +11:00
Shannon
b60e292d5f Fixes: U4-5578 MNTP with root node, recursive output 2014-10-07 11:51:11 +11:00
Shannon
e1dcf6b061 reverts IQuery 2014-10-07 11:50:35 +11:00
Sebastiaan Janssen
246dfba8ac Bump version 2014-10-02 18:06:15 +02:00
Shannon
c0c7d21001 Merge remote-tracking branch 'origin/6.2.3' into 7.1.7 2014-10-03 00:29:33 +10:00
Shannon
7d189a6fb8 Backports the @ symbol escaping fixes 2014-10-03 00:28:49 +10:00
Shannon
e60dcfa144 Merge branch '7.1.7' of https://github.com/umbraco/Umbraco-CMS into 7.1.7 2014-10-03 00:26:25 +10:00
Shannon
3f8b779ae4 adds note 2014-10-03 00:23:38 +10:00
Shannon
72dc5fc477 Removes unused method 2014-10-03 00:23:28 +10:00
Shannon
737f2fb707 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-03 00:07:40 +10:00
Shannon
a13ead0d10 unescapes @ symbols now that sql params are in place 2014-10-03 00:06:09 +10:00
Shannon
414dbe45a6 Fixes: U4-5460 User with start content set won't see the selected node. 2014-10-02 13:38:44 +02:00
Sebastiaan Janssen
340328aeba Fixes merge issue 2014-10-02 11:44:41 +02:00
Shannon
f875dc15f7 Merge branch '6.2.3' into 7.1.7 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx
 2014-10-01 16:47:49 +10:00
Shannon
71242430da Fixes a query that would cause the new petapoco changes to have issues since it was asking for the wrong type 2014-10-01 16:37:42 +10:00
Shannon
1e04735826 updates iis port 2014-09-29 16:47:00 +02:00
Shannon
b975a02bfa Updates version to 7.1.7 2014-09-29 16:46:53 +02:00
Shannon
88ec514630 fixes entity repo merges, this also means that the n+1 fixes for entity repository will be in this release. 2014-09-29 16:46:46 +02:00
Shannon
6f7ec84f18 Backports fixes to SQL parameterization and PetaPoco mem updates 2014-09-29 16:46:37 +02:00
Shannon
4ee4f296fc updates version 2014-09-29 17:31:24 +10:00
Shannon
b9e4950e36 fixes up entity repo merges to support old db schema 2014-09-29 17:30:09 +10:00
Shannon
ba52f9235e Backports fixes to SQL parameterization and PetaPoco mem updates 2014-09-29 17:11:58 +10:00
Sebastiaan Janssen
33ccf490ab Update nuspec to ask for a valid nuget pkg 2014-08-25 15:53:45 +02:00
Sebastiaan Janssen
101e116baf Bump version number 2014-08-25 15:14:21 +02:00
Shannon
ebf24d69b5 Fixes: U4-5384 Custom ApiController routes not working after upgrade to 7.1.5 2014-08-25 14:33:50 +02:00
Shannon
c94662e49c Fixes: U4-5388 YSOD after doctype rename & U4-5387 Deleting Properties in document types causes "Object reference not set to an instance of an object" 2014-08-25 14:33:03 +02:00
Sebastiaan Janssen
5d37eaf993 #U4-4673 Fixed Due in version: 7.1.6 2014-08-25 14:32:35 +02:00
Sebastiaan Janssen
1ded2c9baf #U4-5385 fixed Due in version: 7.1.6 2014-08-25 14:32:14 +02:00
Sebastiaan Janssen
2daacd8d57 #U4-5379 Fixed Due in version: 7.1.6 
Some users have not set an email, don't strip out empty entries
 2014-08-25 14:31:50 +02:00
Shannon
3f4fa8b8ed Fixes: U4-5380 Booting.aspx security issue 2014-08-25 14:31:04 +02:00
Sebastiaan Janssen
03ba8c9e14 Update to 6.2.2, removes airinstallbadge 2014-08-25 13:46:21 +02:00
Shannon
13b57c7638 adds some logging 2014-08-25 16:40:45 +10:00
Shannon
a8b297903d Ensures we don't get any ysods when changing doc type properties and the content re-creation since it's running on an async thread (U4-5388 , U4-5387 ) 2014-08-25 16:16:42 +10:00
Shannon
89b5774106 Fixes: U4-5380 Booting.aspx security issue 2014-08-21 14:39:06 -06:00
Sebastiaan Janssen
3a4d0a02eb Fix redirect issue 2014-08-21 14:16:58 +02:00
Sebastiaan Janssen
2666742851 The admin (0) user in UaaS always has password "default" (unencrypted), checking for that for 
now until we can fix this properly. If we didn't update this scheduled publishing would be broken
 2014-08-21 14:10:54 +02:00
Sebastiaan Janssen
38c1e154d4 Fixes broken relation type manager 2014-08-21 12:08:43 +02:00
Shannon
774f201514 Adds a simple cache mechanism to hold reflected property info when cloning - reduces perf to 10% of what it used to be 2014-08-20 20:09:05 -06:00
Shannon
067eceffce adds a couple of benchmark tests if we need to refer to them in the future (they are ignored so won't run as part of the normal build) 2014-08-20 19:36:03 -06:00
Shannon
573c08295a Adds a simple cache mechanism to hold reflected property info when cloning - reduces perf to 10% of what it used to be 2014-08-20 19:27:53 -06:00
Shannon
fc558198d2 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-20 18:04:11 -06:00
Shannon
de1b69d5ae adds some notes 2014-08-20 18:04:05 -06:00
Shannon Deminick
03358ca1ca Merge pull request #454 from leekelleher/U4-5005 
U4-5005 - YesNoValueConverter fails for int
 2014-08-20 13:10:57 -06:00
Shannon
81d8a90f59 Adds some simple request based caching for the retrieval of the current member in the Umbraco helper. 2014-08-20 12:31:54 -06:00