yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,703 Commits 4 Branches 7 Tags
3a1dbc778b01a6dcfa4e746bc39bb1c53560e89c
Commit Graph

8703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c912e80134 modified media service tests to not have to create data in teh base tests 2013-12-19 12:27:21 +11:00
Shannon
098c856138 Merge branch '6.2.0' of https://github.com/sniffdk/Umbraco-CMS into sniffdk-6.2.0 
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-12-19 12:11:33 +11:00
Shannon
b45306e1ff Merge branch '6.2.0' of https://github.com/dprothero/Umbraco-CMS into dprothero-6.2.0 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-19 11:59:22 +11:00
Shannon
3499f39970 Merge branch 'kipusoep-patch-1' into 6.2.0 2013-12-19 11:49:30 +11:00
Shannon
4fb61be092 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 11:46:59 +11:00
Shannon
9115aa1a6d merge issue with proj file 2013-12-19 11:46:31 +11:00
Shannon
f98b81116c Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-12-19 11:45:24 +11:00
Shannon
904cbbb906 missing proj file update 2013-12-19 11:41:26 +11:00
Shannon
c0380e491b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs
	src/umbraco.controls/TreePicker/SimpleContentPicker.cs
 2013-12-19 11:41:03 +11:00
Shannon
8656d3e4b9 adds some null checks, removes old unused webforms files for tree control 2013-12-19 11:35:53 +11:00
Shannon
40988b4655 Merge branch 'select-parent-on-movecopy' of https://github.com/pynej/Umbraco-CMS into pynej-select-parent-on-movecopy 
Completes: U4-3920 Move/Copy/Content-Picker time saver - pre-selects current node
 2013-12-19 11:25:54 +11:00
Shannon
8a8b69a442 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GoogleSpellChecker.cs
 2013-12-19 11:14:06 +11:00
Shannon
06dbea84d8 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-19 11:06:11 +11:00
Shannon
f54cf32057 Converted spell checker deserialization to json.net and changed the deserialized object to internal with correct naming conventions. 2013-12-19 11:06:00 +11:00
Shannon
64dbf0207b Merge branch 'DougMac-6.1.4' into 6.2.0 2013-12-19 10:38:56 +11:00
Shannon
f743830167 Fixes: U4-3911 Datatypes changes their uniqueID on first save 2013-12-19 10:27:18 +11:00
Stephan
206c88105e Left some Console.WriteLine statements uncommented 2013-12-18 17:50:47 +01:00
Shannon
0addd719d3 fixed merge issues 2013-12-18 18:14:37 +11:00
Shannon
662dfb37d3 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2013-12-18 18:11:56 +11:00
Shannon
4ab32dd270 moves classes into sep files 2013-12-18 18:09:54 +11:00
Shannon
fec55e9d1c Updates IMemberService with methods to search on string properties with an option to define how to match the string property, adds all supporting unit tests. 2013-12-18 17:37:46 +11:00
Shannon
a21aa079ff Adds ability to use the query builder with string matches based on an NText column 2013-12-18 17:22:00 +11:00
Shannon
ef4246478d Fixes: U4-2294 6.1.0: umbracoServer table can't be created on MySQL <5.6.5 2013-12-18 15:30:40 +11:00
Shannon
dda538d1fc Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-17 16:14:33 +11:00
Shannon
137d859532 backports missing logic and tests from 7 that I overlooked. 2013-12-17 16:13:38 +11:00
Shannon
d6d80ae037 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/IMemberTypeService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-12-17 16:03:27 +11:00
Shannon
82b2821e27 Gets the members services ensuring members xml is being handled correctly, fixes issue with the static variable holding the default member type properties (this was then persisted in mem and then reused across all member types). Added more unit tests to verify all. 2013-12-17 15:40:47 +11:00
Shannon
b270cefacc Upgrading member repositories and services with tests 2013-12-17 14:53:21 +11:00
Shannon
8b064fc2ec Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
 2013-12-17 12:39:45 +11:00
Shannon
b4e984fe6a adds/updates unit tests for member and member type repository 2013-12-17 12:38:11 +11:00
Shannon
1a3339d485 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
 2013-12-17 11:42:50 +11:00
Shannon
f62e4fa973 adds/updates member type repo tests 2013-12-17 11:42:03 +11:00
Shannon
ee8050f38f Fixes ContentTypeBase event assignment issue - an event handler was added for every property type added - that was not correct. 2013-12-17 11:35:56 +11:00
Stephan
8cb0f5762c Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 17:11:15 +01:00
Stephan
287596220a Merge remote-tracking branch 'origin/7.0.2' into 7.0.2 2013-12-16 17:10:42 +01:00
Stephan
f870ee18d4 U4-3710 - fix merge 2013-12-16 17:10:30 +01:00
Stephan
b506b5c8e9 U4-3710 - bugfix 2013-12-16 17:01:35 +01:00
Shannon
805c1dfb5b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 19:05:44 +11:00
Shannon
66dd0d073c backports the member type service updates 2013-12-16 19:05:03 +11:00
Shannon
f269b1931d Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 19:03:29 +11:00
Shannon
29c22cc4b5 exposes repository service 2013-12-16 19:02:53 +11:00
Shannon
76695fc7b2 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:44:52 +11:00
Shannon
e29031a2c4 Back ported relationship repo/service updates 2013-12-16 18:44:11 +11:00
Shannon
9b2b8e8166 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:24:12 +11:00
Shannon
3ff0cca033 back ports entity service updates 2013-12-16 18:23:40 +11:00
Shannon
aa398b4f36 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:18:23 +11:00
Shannon
fe16cc91fa back ports packaging service updates 2013-12-16 18:17:30 +11:00
Shannon
7e6fdcb05e back ported template repo and file service updates 2013-12-16 18:10:44 +11:00
Shannon
ae54f34bcf Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 17:48:01 +11:00