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

6237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
dca0c85db5 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-11-04 12:54:07 +01:00
Shannon
5006115b2d Fixes object extensions and tests 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
 2013-11-02 15:20:04 +11:00
Stephan
058cec7551 Cache AspNet hosting permission level 2013-11-01 16:57:31 +01:00
Stephan
2671709991 U4-2518 - issue with virtual dir named Umbraco 2013-11-01 09:53:50 +01:00
Shannon
ac2d8633af Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-11-01 18:07:18 +11:00
Shannon
76bc312842 Fixes an issue with empty string conversions to date time - should fail 2013-11-01 18:06:58 +11:00
Stephan
767719357e U4-3279 - better exception message when failing to find a content type 2013-10-31 18:28:49 +01:00
Stephan
7b29bd67f3 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-10-31 15:29:16 +01:00
Shannon
49d5791825 Adds DescendantsOrSelf extensions on ienumerable to published content extensions 2013-10-28 12:35:50 +11:00
Shannon
6cfb864055 Fixes DataTypeDefinitionRepository to properly delete a data type including it's pre-values 2013-10-28 11:23:09 +11:00
Stephan
89c5d5d613 PublishedContent - get published properties to report the CLR type of the value 2013-10-28 01:09:34 +01:00
Stephan
73b7729b82 Standalone - fix so it works again 2013-10-28 01:07:29 +01:00
Stephan
c66d49dbfe PublishedContent - remove useles code in model factory 2013-10-28 01:07:17 +01:00
Shannon
9a3b70149c Fixes packaging service to export data type's property with the ID as the property editor ID 2013-10-28 11:00:14 +11:00
Shandem
98cc1c63ce Merge pull request #173 from pynej/trees-config-action 
Trees config action
 2013-10-27 16:00:00 -07:00
Stephan
128a08f169 Web.Mvc - Refactor UmbracoViewPage, UmbracoTemplatePage, support strongly-typed content 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-10-25 13:21:29 +02:00
Stephan
4487e686d7 Core.TypeExtensions - add methods 2013-10-25 13:19:20 +02:00
Jeremy Pyne
ba6ba15732 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.1.3-clean 2013-10-18 11:37:28 -04:00
Jeremy Pyne
291f526368 Fix to properly read actions from trees.config. 2013-10-18 11:37:06 -04:00
Shandem
c4f3dae317 Merge pull request #172 from IDisposable/6.2.0 
Reduce Exceptions thrown during type conversions.
 2013-10-17 18:07:52 -07:00
Marc Brooks
4d5b330567 Reduce Exceptions thrown during type conversions. 
There are tons of places where null, blank or empty strings are being
converted to primative types (like int,, long, etc) or other ValueTypes
(like Guid, DateTime, etc.). When this is attempted, Exceptions are
thrown (and caught/swallowed) to allow for value defaulting. Since this
happens all the time in normal operation, tons of Exceptions are being
thrown. By switching to the TryParse methods available on all primative
types and the interesting ValueTypes, we can greatly speed the
processing of content data.
 2013-10-17 19:12:08 -05:00
Sebastiaan Janssen
f9ad06be29 Something odd going on with the new tests being affected by tests that ran before them, no time to fix. Runs fine independently. 2013-10-16 14:19:24 +02:00
Sebastiaan Janssen
699c651daa Merge pull request #169 from stocksr/U4-3033-take2 
Really Fix U4-3033 - inserting extra blank line at end of CSS
 2013-10-16 04:00:26 -07:00
Robert Stocks
79299175c1 Really Fix U4-3033 - inserting extra blank line at end of CSS 2013-10-16 11:49:02 +01:00
Sebastiaan Janssen
14e3976e88 Merge pull request #142 from lars-erik/6.2.0-recursive_isofdocumenttype 
Recursive PublishedContentExtensions IsDocumentType
 2013-10-16 02:55:09 -07:00
Sebastiaan Janssen
76c86daf24 Update da.xml 2013-10-16 11:50:12 +02:00
Lars-Erik Aabech
a1ef40e4be Split the recursive IsDocumentType into an overload for "real" backwards compatibility. 
Changed string comparison to use InvariantEquals. (guessing it doesn't _really_ break backw. compat?)
Added XML docs.
 2013-10-16 11:38:58 +02:00
Sebastiaan Janssen
e4a0904de6 Merge pull request #167 from lars-erik/change-doctype-defaultnone 
Change doctype - default suggestion none when no matching alias.
 2013-10-16 01:09:02 -07:00
Lars-Erik Aabech
607a52883a Change doctype - default suggestion none when no matching alias. 2013-10-15 13:21:30 +02:00
Sebastiaan Janssen
4651dfc763 Merge pull request #166 from stocksr/U4-3033 
Fix U4-3033 - inserting extra blank line at end of CSS
 2013-10-15 01:13:37 -07:00
Robert Stocks
da74c0a163 Fix U4-3033 - inserting extra blank line at end of CSS 2013-10-15 09:09:03 +01:00
Shannon
fbb7f18f23 fixes publish status when publishing child that doesn't have a parent published. 2013-10-15 14:12:10 +11:00
Shannon
af43b35d17 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-14 10:46:06 +11:00
Shannon
72ea43758d Fixes - U4-3119 Non-Admin Users Cannot Create or Edit Users regardless of permission settings - 6.1.6 2013-10-14 10:45:51 +11:00
Stephan
ee5af4998f Fix bug after merge 2013-10-11 12:30:17 +02:00
Stephan
565a020acf Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-11 11:14:36 +02:00
Stephan
15bbe1b829 PublishedContentModel - keep it internal for now 2013-10-11 10:10:19 +02:00
Shannon
c459a893a5 adds new db indexes 2013-10-11 18:45:37 +11:00
Stephan
671b94dd06 PublishedContentModel - keep it internal for now 2013-10-11 09:24:26 +02:00
Stephan
bc9dc911ed Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-11 09:24:06 +02:00
Stephan
cc8298d83c U4-2606 - List registered types in a ManyObject resolver 2013-10-11 09:22:48 +02:00
Shannon
13dcfbbd2b Fixes build - removes .net 4.5 reference of EmailAddressAttribute - we'll leave that in for v7 when targettng 4.5 2013-10-11 10:58:31 +11:00
Stephan
18ea5b3768 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
 2013-10-10 15:52:09 +02:00
Shannon
63a4e00f52 tweaks to membership providers so if we cast we can specify the member type. 2013-10-10 17:23:29 +11:00
Shannon
cb8c1a31cb Fixes/updates more of the member repository and related items 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
 2013-10-10 16:50:57 +11:00
Shannon
6c77749e32 Fixes: U4-3077 No id "xxxx" exists in dictionary 2013-10-10 15:45:52 +11:00
Shannon
4170713e29 More member service and provider updates 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
 2013-10-10 14:51:01 +11:00
Shannon
a3bca42117 updates UmbracoMembershipMember 2013-10-10 14:10:28 +11:00
Shannon
80488e012f Fixes up and implements more if the IMemberService, repository and membership providers (both legacy and what seems to be the new one). 2013-10-10 14:00:35 +11:00
Shannon
27e6e9b91c removes duplicate declaration 2013-10-09 13:52:44 +11:00