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

764 Commits

Author SHA1 Message Date
Shannon
8a70c440f2 Added many more unit tests for the membership provider base class and fixed some logic inconsistencies. 2013-12-28 18:55:43 +11:00
Shannon
a5828a2c3e Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
 2013-12-19 15:59:50 +11:00
Shandem
c589c741e8 Merge pull request #220 from leekelleher/U4-2006 
Fixes: U4-2006 Domain.GetDomain(string DomainName) is case-sensitive
 2013-12-18 20:56:03 -08:00
Shannon
68a25bb5b1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 15:50:03 +11:00
Shandem
8ee133bb75 Merge pull request #239 from OptimisticCoder/U4-451 
U4-451 Inconsistent line endings in template files created by Umbraco
 2013-12-18 20:46:46 -08:00
Shannon
73c479c843 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 13:23:22 +11:00
Shannon
67caf81a74 adds a couple of null checks. 2013-12-19 13:14:38 +11:00
Shannon
67a8fa5f07 Merge branch 'wtct-U4-3091' into 6.2.0 2013-12-19 13:05:27 +11:00
Shannon
f7b61d09e2 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Profiling/ProfilingViewEngine.cs
 2013-12-19 12:53:32 +11:00
Shannon
5c59317bf8 changes casing of col names 2013-12-19 12:52:37 +11:00
Shannon
a2ec53dd4f Merge branch 'wtct-U4-3071' into 6.2.0 2013-12-19 12:50:42 +11:00
Shannon
3a1dbc778b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-19 12:29:02 +11:00
Shannon
3499f39970 Merge branch 'kipusoep-patch-1' into 6.2.0 2013-12-19 11:49:30 +11:00
Shannon
fcacc1bd71 Merge commit '060e584503039ac020f79602ae9565d7ee0531bb' into 7.0.2 2013-12-16 16:21:06 +11:00
Shannon
9105c08a4c getting membership provider to the same state as v7 2013-12-16 12:20:38 +11:00
Shannon
751ace1168 Merge branch '6.2.0-membershipprovider' into 6.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-13 17:17:24 +11:00
Shannon
c5047148b3 Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/library.cs
 2013-12-10 12:56:31 +11:00
Shannon
a6b3233c10 Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 2013-12-10 12:53:33 +11:00
Shannon
b1913c9a07 puts IDataValueSetter back in so it can be used by backwards compatible data 2013-12-05 16:18:45 +11:00
Shannon
f6179ff813 Strange, somehow these updates got overwritten 2013-12-05 16:11:15 +11:00
Shannon
186e664894 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-12-05 16:09:34 +11:00
Shannon
1735c5adca adds Exists(string username) to member service and wraps IsMember with that call. 2013-12-05 16:04:53 +11:00
Shannon
31e715e146 Updates legacy Member class to setupNode based on the new IMember object (just like we do with media/content) - this will speed up data retrieval and is the start of wrapping the new API from the old one. 2013-12-05 15:51:38 +11:00
Shannon
4a7f7813e7 Updates legacy Member class to setupNode based on the new IMember object (just like we do with media/content) - this will speed up data retrieval and is the start of wrapping the new API from the old one. 2013-12-05 15:30:22 +11:00
Shannon
5f50bae65c Cleaning up a bit of the legacy member class 
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-12-05 14:48:30 +11:00
Shannon
996d74b1d3 Cleaning up a bit of the legacy member class 2013-12-05 14:45:28 +11:00
Shannon
e6d8a83519 Ensures that the ContentBase item is set on Document/Media and that the property value is set based on the already loaded value in the model if IData implements IDataValueSetter (which DefaultData does). This streamlines how properties get their data and will save on a ton of queries when using the legacy API. 2013-12-05 14:26:18 +11:00
Shannon
d3aa1b3d7e Ensures that the ContentBase item is set on Document/Media and that the property value is set based on the already loaded value in the model if IData implements IDataValueSetter (which DefaultData does). This streamlines how properties get their data and will save on a ton of queries when using the legacy API. 2013-12-05 14:24:26 +11:00
Shannon
9fc8e18881 Fixes csrf issue 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/umbraco/logout.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
 2013-11-29 12:17:58 +11:00
Shannon
250276bbd4 Merge branch '6.1.6-U4-3619' into 6.2.0 2013-11-29 11:26:01 +11:00
Shannon
af29f61478 Fixes csrf issue 2013-11-29 11:10:25 +11:00
Shannon
7f305db637 Fixing: U4-3687 Umbraco 7 Packaging Issues - have fixed the data type package issues, cleaned up some code and fixed a different underlying pre-val issue for empty legacy aliases 2013-11-28 16:57:05 +11:00
Shannon
2391ee1368 Changes the web.config template to use a linked resources (one file) 2013-11-26 20:03:13 +11:00
Shannon
327d17c90e obsoleted some un-used/legacy code. IMediaFactory it is no longer used and is contained in an old assembly. If we want to re-support this (which i don't think we do), it needs to be manually re-created and implemented, i don't think its been used for quite some time. 2013-11-26 17:52:53 +11:00
Shannon
369f6ac935 fixes merge issue 2013-11-20 18:15:11 +11:00
Shannon
5a928aa459 FIxes installer when duplicate conflicts: U4-3612 Cannot install Txt starter kit in the back office 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
 2013-11-20 17:28:33 +11:00
Shannon
d1a656b3cd FIxes installer when duplicate conflicts: U4-3612 Cannot install Txt starter kit in the back office 2013-11-20 17:25:25 +11:00
perploug
bf93d773a8 redirects all repo requests to our instead of packages 2013-11-14 09:04:10 +01:00
Shannon
86c996efb8 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-14 10:51:52 +11:00
lars-erik
d8debf6789 Fixes Template.ToXml() (U4-3508) and refactored Template.Import to use PackagingService.ImportTemplates. 
Fixed nullreference bug in ImportTemplates when used with XElement("Template"). (Added test for case with one template only)
 2013-11-13 14:27:05 +01:00
Shannon
6fe647146c Fixes: U4-3431 Macro property not passed to ASCX usercontrol 2013-11-11 12:23:46 +11:00
Shannon
a311a54d3d Hugely simplifies setting properties from macro parameters on user control macros with tests. 2013-11-11 12:22:29 +11:00
Shannon
330732323f Hugely simplifies setting properties from macro parameters on user control macros with tests. 2013-11-11 12:16:30 +11:00
OptimisticCoder
80b5cfbb07 U4-451 Inconsistent line endings in template files created by Umbraco 
Changed all "\n"'s to Environment.NewLine
Changed a string that was being appended in that method to a StringBuilder to be more efficient.
Cleaned up old commented out code from the method.
 2013-11-09 14:37:22 +00:00
Shannon
367cdde35e Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/umbraco.cms/businesslogic/workflow/Notification.cs
 2013-11-08 08:55:22 +11:00
mattbrailsford
d963917556 Added SortOrder to XML for document types (used by export) 
Added ability for doctype importer to set the sort order if a sort order element is available
 2013-11-07 16:30:23 +00:00
leekelleher
8e89d13142 Fixes: U4-2006 Domain.GetDomain(string DomainName) is case-sensitive 2013-11-07 15:41:34 +00:00
leekelleher
516beedbbb Fixes: U4-3452 Update the MIT License URL (Packager) 2013-11-07 14:48:20 +00:00
Morten Christensen
7306ddef14 Merge pull request #182 from stocksr/6.2.0-petapoco-refactor 
6.2.0 petapoco refactor - umbraco.cms.businesslogic.language.Item
 2013-11-07 03:37:37 -08:00
Morten Christensen
8bf3de738f Merge pull request #188 from stocksr/6.2.0-petapoco-refactor-umbraco.cms.businesslogic.language.Language 
Refactoring umbraco.cms.businesslogic.language.Language class
 2013-11-07 03:34:08 -08:00