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

8740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
d5e0c6ff68 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	.gitignore
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.designer.cs
	src/Umbraco.Web.UI/umbraco/editContent.aspx
	src/Umbraco.Web.UI/umbraco/login.aspx
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
 2013-12-19 15:08:19 +11:00
Shannon
a43f4b7b7f Completes: U4-1521 Updated back office to use ClientDependency bundles for common files 2013-12-19 15:05:05 +11:00
Shandem
7ce3949852 Merge pull request #209 from ProNotion/U4-1521 
U4 1521
 2013-12-18 18:37:02 -08:00
Shandem
4862419744 Merge pull request #198 from craigacronin/U4-1891 
Fixed as per issue comments, but also implemented for another 3 overload...
 2013-12-18 18:33:57 -08:00
Shannon
6b810c89f6 un-ignores PublishedContentExtensionTests 2013-12-19 13:28:17 +11:00
Shandem
89b0a2fd89 Merge pull request #170 from lars-erik/6.2.0_fix_publishedcontentextensiontests_sidebysidefriendly 
Should make the PublishedContentExtensionTests green when ran together w...
 2013-12-18 18:25:38 -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
8aceae9880 re-formats some code, simplifies calls using InvariantEquals extension method 2013-12-19 13:22:33 +11:00
Shandem
384d4d60f1 Merge pull request #168 from stevetemple/6.1.6-multiple-action-route-issue 
Fix error when multiple routes have the same controller
 2013-12-18 18:18:44 -08:00
Shannon
67caf81a74 adds a couple of null checks. 2013-12-19 13:14:38 +11:00
Shannon
763ab26446 Updates packaging service to not export empty properties. 2013-12-19 13:13:13 +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
db78c78df2 fixes some merge issues with view engine wrapping PR. 2013-12-19 12:45:46 +11:00
Shannon
4558549d5a Fixes appendformat issue 2013-12-19 12:40:41 +11:00
Shannon
d98801d5d1 Merge branch '6.2.0' of https://github.com/mortenbock/Umbraco-CMS into mortenbock-6.2.0 
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
 2013-12-19 12:35:33 +11:00
Shandem
de9ecf6afc Merge pull request #143 from IDisposable/patch-1 
Added contextualKeyBuilder optional argument to allow the key used for cachin...
 2013-12-18 17:32:26 -08:00
Shandem
702790bf77 Merge pull request #144 from IDisposable/patch-2 
Make CacheHelperExtensions public so we can call CachedPartialView and C...
 2013-12-18 17:30:01 -08: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
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