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

6218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shannon
09b7186713 Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data - fixes merge issues and explicitly implements interface for entities that are not UmbracoEntity and hides other implementations from intellisense. 2013-10-09 13:32:58 +11:00
Shannon
c6389852ea Adds public ctors for ApplicationContext, ServiceContext, DatabaseContext, RepositoryFactory, makes IDatabaseFactory public, makes an interfaces for IEntityService, adds EnsureContext methods for ApplicationContext - to set the singleton. 2013-10-09 13:17:19 +11:00
Shannon
49f10ccd32 Fixes merge issue , fixes the ServiceContext lazy fields to be the underlying interfaces, adds public ctor 2013-10-09 12:18:42 +11:00
Shannon
a8b037f2e0 Fixes member type repository when member types don't have properties declared and adds tests. Adds IMemberTypeService. 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Services/ServiceContext.cs
 2013-10-09 12:09:28 +11:00
Stephan
17c055472d Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-08 09:44:37 +02:00
Shannon
16bce4248d Fixes merge issues with 6.2 and copying across TempData properly. 2013-10-08 10:46:02 +11:00
Shannon
a2e9ec0412 Merge remote-tracking branch 'origin/6.1.6' into 6.2.0 
Conflicts:
	src/Umbraco.Web/Mvc/UmbracoPageResult.cs
 2013-10-08 10:37:46 +11:00
Shandem
11c9abf359 Merge pull request #145 from florisrobbemont/6.1.6 
U4-3007 RouteDefinition should not store instance of controller
 2013-10-07 16:31:50 -07:00
Sebastiaan Janssen
12b7a9d874 Argh, didn't save csproj file before committing. 2013-10-07 13:20:34 +02:00
Sebastiaan Janssen
a90f32035d U4-2733 call to umbraco.library:Request broken? 2013-10-07 08:18:44 +02:00
Sebastiaan Janssen
33b09c80aa Forgot to commit csproj file 2013-10-06 18:55:52 +02:00
Sebastiaan Janssen
b2980cedc6 Also apply to media types - U4-541 Wrong dictionary key when using in backend template names 2013-10-06 18:54:46 +02:00
Sebastiaan Janssen
34b7f86b8b U4-541 Wrong dictionary key when using in backend template names 2013-10-06 18:24:46 +02:00
Sebastiaan Janssen
130f6d3a42 Additions for U4-2776 Default Content For A Razor Layout Section 2013-10-06 17:52:46 +02:00
Sebastiaan Janssen
3ff9d6adbc U4-2509 Umbraco backend search not working correctly with spaces - Also updated search.aspx dialog 2013-10-06 16:55:54 +02:00
Sebastiaan Janssen
fd5de171c9 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-10-06 16:45:31 +02:00
Sebastiaan Janssen
45ad51b8df U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2013-10-06 16:45:21 +02:00
Floris Robbemont
b02657f32c Cleaning up commit for issue U4-3007 
Changed documentation on UmbracoMvcHandler
 2013-10-05 23:31:02 +02:00
Sebastiaan Janssen
9f3784aaed U4-1242 Template editor sometimes stops editing. 2013-10-05 19:26:01 +02:00