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

10017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
cd459e8b7d Merge remote-tracking branch 'origin/7.1.2' into 7.1.2 2014-04-19 14:21:24 +02:00
Stephan
7ae522b511 U4-3787 - Ensure we republish published descendants when republishing 2014-04-19 14:20:26 +02:00
Shannon
52186f5cb2 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
 2014-04-17 20:08:07 +10:00
Shannon
b13251778e Fixes: U4-4713 Provider Name not set when using Custom Connection String from the Installer 2014-04-17 20:05:55 +10:00
Shannon
51309e62ec Fixes: U4-4714 Sql Azure no longer a database option in 7.1 2014-04-17 19:55:17 +10:00
Shannon
fee23fac0a updates deep clone to have the false flag for resetting properties (we don't want to remember them when cloning) 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
 2014-04-17 18:54:55 +10:00
Shannon
15f4de4ed0 fixes build issues 2014-04-17 18:52:07 +10:00
Shannon
8c303893d2 updates deep clone to have the false flag for resetting properties (we don't want to remember them when cloning) 2014-04-17 18:46:37 +10:00
Shannon
7d556a0318 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderExtensions.cs
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/ICacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Core/Services/DataTypeService.cs
	src/Umbraco.Tests/Models/Collections/PropertyCollectionTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/PublishedProperty.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
 2014-04-17 18:10:42 +10:00
Shannon
cf6775ec31 moves an internal class 2014-04-17 18:05:12 +10:00
Shannon
1a13366cc9 Working on U4-4701 Fixup DataTypeService and repository with cache - the deletion logic all now happens in the transaction before it was done quite poorly for updating content types :( 2014-04-17 18:03:34 +10:00
Shannon
595b039ebe Working on U4-4701 Fixup DataTypeService and repository with cache, pre-values are now persisted properly using units of work with it's own mini internal repo. 2014-04-17 17:41:08 +10:00
Shannon
e6406e9757 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-04-17 14:23:52 +10:00
Shannon
bf65bf5bab Got pre-values caching properly and data types using the runtime cache provider correctly + unit tests. 2014-04-17 14:23:37 +10:00
Stephan
a39a659858 Bugfix published content extension .Next() 2014-04-16 19:10:50 +02:00
Stephan
306d83cbd6 Bugfix published content extension .Next() 2014-04-16 19:04:49 +02:00
Stephan
a4eedb9f8b U4-4575 - refactor 2014-04-16 18:51:12 +02:00
Stephan
1da901be96 U4-4575 - refactor prop. conversion logic 2014-04-16 18:25:41 +02:00
Shannon
d953966248 Completes: U4-4670 Add .ContainsAny string extension to Umbraco.Core.StringExtensions 2014-04-16 17:01:26 +10:00
Shannon
2f679a52f4 fix build 2014-04-16 16:52:45 +10:00
Shannon
ad8ab9f46e Fixes media uploader issue to ensure non-approved file types are not saved 2014-04-16 16:48:52 +10:00
Shannon
9b344a5a69 Added tests for member groups and member cloning. Added tests to verify that all entities can be serialized without issue. 2014-04-16 16:44:08 +10:00
Shannon
0a28bdafc2 Merge remote-tracking branch 'origin/6.2.0' into 6.2-cachefixing 2014-04-16 15:54:37 +10:00
Shannon
a3a0f1a0bf adds some logging 2014-04-16 15:38:16 +10:00
Shannon
f69527eac1 Fixes media uploader issue to ensure non-approved file types are not saved 2014-04-16 15:38:01 +10:00
Shannon
7aa1f480c9 Fixes up some cloning with value types and collections 2014-04-16 15:33:21 +10:00
Shannon
998f031877 Merge branch '6.2.0' into 6.2-cachefixing 2014-04-16 14:01:38 +10:00
Shannon
ac7cb8febe Fixes cache providers to ensure it stores and resolves clones 2014-04-16 14:01:26 +10:00
Shannon
6e166bdba7 publicizes DeepCloneHelper 2014-04-16 13:40:20 +10:00
Shannon
1f2e46a195 Simplifies much of the deep cloning with the DeepCloneHelper and adds tests 2014-04-16 13:39:42 +10:00
Shannon
bb22f5a283 More code and tests written for deep cloning. 2014-04-16 11:23:00 +10:00
Shannon
dcac5d4709 More code and tests written for deep cloning. 2014-04-15 20:31:32 +10:00
Shannon
0e4e12d0ba More code and tests written for deep cloning. 2014-04-15 19:12:42 +10:00
Shannon
9118701669 More test written for deep cloning. 2014-04-15 14:53:19 +10:00
Shannon
58758e7a41 More work on deep cloning, have test passing for IContent 2014-04-15 13:52:49 +10:00
Shannon
5697809ce9 Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-04-14 18:33:04 +10:00
Shannon
4f5cae55c2 Fixes: U4-4654 7.1.1 InsertMacroController unescapes objects to string 2014-04-14 18:32:28 +10:00
Sebastiaan Janssen
e5b4769109 Remove test code 2014-04-14 09:27:25 +02:00
Shannon
5990a95d13 Fixes: U4-4610 Unmapped members in Automapper 2014-04-14 15:20:02 +10:00
per ploug
e3c4ed5bf7 Changes grunt to accept a buildversion param 
use grunt build --buildversion=7.1.2 to set it in all client files
 2014-04-10 14:25:26 +02:00
Sebastiaan Janssen
02a4c2f4fc Update for WebPI 2014-04-09 09:35:02 +02:00
Sebastiaan Janssen
b60aa3031c Post.cshtml shouldn't be there 2014-04-08 12:03:55 +02:00
Sebastiaan Janssen
2a0e3d803f Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-08 11:37:50 +02:00
Sebastiaan Janssen
670a67225a Upgrade to Json.Net 6.0.2 2014-04-08 11:37:40 +02:00
perploug
0bedf09f48 Fixes: U4-4609 v7.1 Media Picker datatype only allows selection of images not PDFs 2014-04-08 11:34:42 +02:00
perploug
41ad18deef Removes autocomplete from installer password field 2014-04-08 11:07:23 +02:00
perploug
4745be4765 Fixes missing listview icons 2014-04-08 11:07:02 +02:00
perploug
13891bb033 Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-07 16:08:45 +02:00
perploug
a2efd7ab53 Fixes: U4-4619 Make sure installer pings stats 2014-04-07 16:08:34 +02:00
Sebastiaan Janssen
3c204da150 Spelling error 2014-04-07 16:05:21 +02:00