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

3040 Commits

Author SHA1 Message Date
Sebastiaan Janssen
bb5d373923 Merge pull request #506 from sitereactor/7.2.0-compositions-fix 
Fixes U4-5077 doc types with compositions
 2014-10-07 14:11:09 +02:00
Morten Christensen
e6820ad52a Fixes U4-5077 Umbraco 7.2 Alpha - doc types with compositions get moved in doc type tree 
Return 0 if parent is the root
 2014-10-07 13:59:22 +02:00
per ploug
b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
Shannon
b28f1d86c9 Merge branch '7.1.8' into 7.2.0 2014-10-07 12:57:47 +11:00
Shannon
e1dcf6b061 reverts IQuery 2014-10-07 11:50:35 +11:00
Shannon
8cfb5915ac Manually merge branch 'allyen-6.1.4-shibboleth' into 7.2.0 2014-10-03 12:58:30 +10:00
Shannon
2b2891b6f4 Merge branch '7.1.5' of https://github.com/henrikrossen/Umbraco-CMS into henrikrossen-7.1.5 2014-10-03 12:51:27 +10:00
Shannon
8e89a43311 Merge branch '7.1.7' into 7.2.0 2014-10-03 00:33:10 +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
613dd76f81 removes removed db column from document dto 2014-10-02 12:52:26 +10:00
Shannon
7c7ef42216 fixes typo on downgrade 2014-10-02 12:27:29 +10:00
Shannon
08ea69caae Fixes paging for MySQL (actually makes it a better query anyways), fixes null ref for member indexer, Fixes MNTP after upgrade from v6, fixes typo on migration downgrade. 2014-10-02 12:23:43 +10: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
8a65ea7e97 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-01 15:40:48 +10:00
Shannon
e960f8dca9 Fixes query for mysql 2014-10-01 15:22:20 +10:00
Shannon
c5677233e3 Fixes install upgrade step to run during new install and upgrade - that is used when a db is found at the specified location but the version is empty, the upgrader still needs to run. Updates new upgrade steps to check if the changes are required so no errors occur when re-upgrading. 2014-10-01 14:58:30 +10:00
Shannon
f3df082695 fixes hard coded sql server bracket syntax 2014-10-01 14:56:54 +10:00
Shannon
bad341613f Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-01 10:19:04 +10:00
Shannon
863e8b5024 Changes PetaPoco UOW to use a Queue instead of trying to order by a date which even in ticks is sometimes the same. Changes some content ext to accept the service it needs instead of relying on the app ctx singleton and obsoletes others. Fixes ContentBase.ContentTypeId to check if the Id has been set on it's true ContentTypeBase which is required with the new foreign key to insert entities (this was actually a bug without the foreign key). Updates media/content services with paging to use parameters correctly. Fixes tests. 2014-10-01 10:18:51 +10:00
Brian Powell
be55c11554 Fix for U4-5564 2014-09-30 12:44:52 -04:00
Shannon
55a7f7c23b Updates GetProfile ext method to accept an IUserService so they can be mocked, this is now used by the entity serializer. Fixed examine unit tests that required this. Fixed: U4-5508 Remove cmsDocument.alias column from db, update the order in which tables are created since with the new foreign key, that order was incorrect. 2014-09-30 18:46:02 +10:00
Shannon
54b11ea871 Fixes: U4-5503 cmsContent.contentType requires a foreign key 2014-09-30 17:05:18 +10:00
Shannon
ad1075a1ce Fixes: U4-2120 cmsDataTypePreValues 'value' column should be nvarchar(MAX) or ntext instead of nvarchar(2500) 2014-09-30 15:34:49 +10:00
Shannon
4c0f95a93a Adds GetPagedDescendants to media/content services. Fixes PDF reader disposal. Updates the umb examine indexers to use the services layer, now reindexing is far more efficient. Fixes the examine mgmt dashboard with $timeout. Updates GetPagedResultsByQuery to be more readable. Fixes GetPagedResultsByQuery to use SQL parameters. 2014-09-30 15:13:10 +10:00
Shannon
78141630b7 After a lot of benchmarking i found the bottleneck for building the prop collection. Even though this new bottleneck is leaps and bounds faster than it was before... with this new fix it is epically fast 2014-09-30 11:37:26 +10: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
Shannon
438e985d9e Ensures the custom list view data type's PKs don't interfere with ones that might already exist. 2014-09-29 13:50:28 +10:00
Shannon
cfb2d3c974 Merge branch '7.2.0-sqlexpressions' into 7.2.0 2014-09-26 15:32:36 +10:00
Shannon
d402f762ae adds another test to ensure the cache expiry is working 2014-09-26 15:31:37 +10:00
Shannon
62327a9b58 Updates more of the test to see why the query cache continues to expand... Unfortunatley there's nothing we can do about it at this point due to the 'IN' clause queries. Good thing we now have sliding expiration on each of these! 2014-09-26 13:55:25 +10:00
Shannon
9d5f3089c8 Updates petapoco to have a sliding expiration for the delegates cache, updates the keys it uses to be short hashes, fixes some null checks in content/media services, adds new test for checking that peta poco caches aren't growing with the same queries. 2014-09-26 11:19:54 +10:00
Shannon
4084ff8a24 Changes the key used for the PocoFactories to be a small hash 2014-09-26 08:35:13 +10:00
Shannon
88f79cfca5 Fixes remaining service tests and adds a couple more expression tests 2014-09-25 13:38:32 +10:00
Shannon
893855f8bd More tests fixed 2014-09-24 20:20:27 +10:00
Shannon
0f3408c288 lots more tests fixed and few bits and pieces of the query stuff fixed. 2014-09-24 19:17:49 +10:00
Shannon
afacdc12ad More work on parameterized queries, all tests for repos passing now. 2014-09-24 16:59:45 +10:00
Shannon
2c12b06bd7 Fixes the paging queries for media/content with sql params 2014-09-24 15:04:26 +10:00
Shannon
00f86ffef7 More work on sql parameterization with sql expressions, lots of tests passing but a few fixes still required. Streamlines IQuery to actually have the correct method implementations so we're not casting everywhere. 2014-09-24 13:51:16 +10:00
per ploug
ae0fa3bf14 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-23 16:32:50 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
Stephan
ca8a819590 U4-5540 - property value converter for TextBoxMultiple 2014-09-23 14:54:49 +02:00
Shannon
d3365bc751 starts updating sqlexpressions to include sql params 2014-09-23 18:38:42 +10:00