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

1743 Commits

Author SHA1 Message Date
Stephan
3ee4399fca Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
 2013-10-02 17:40:03 +02:00
Stephan
f64b8d680d Core.StringExtensions - switch over to the new DefaultShortStringHelper 2013-10-02 16:54:56 +02:00
Stephan
f9663a9e80 Core.EnumerableExtensions - refactor InGroupsOf to enumerate source only once 2013-10-02 16:54:47 +02:00
Stephan
759a3619ca Core.Resolution - fix concurrency issues 2013-10-02 11:48:30 +02:00
Stephan
cdd1a0a4cb Core.Resolution - fix concurrency issues 
Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
 2013-10-02 11:41:48 +02:00
Stephan
9b43a86b94 Core.Resolution - fix concurrency issues 2013-10-02 11:09:26 +02:00
Shannon
1090248223 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-02 18:58:21 +10:00
Shannon
880077f6e9 Created TagRepository, added foreign key to cmsTags.ParentId 2013-10-02 18:57:44 +10:00
perploug
ffc1b62b8a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-02 10:56:54 +02:00
perploug
ce30153830 Enables the manifest to load custom stylesheets outside the js loading 2013-10-02 10:54:25 +02:00
Shannon
be7179b962 Fixed up the TagRelationshipDto to have the correct columns, keys, etc.. as our upgrade, updated the old tags API to support the new changes. 2013-10-02 17:10:12 +10:00
Shannon
36cb078073 Tags db upgrades done, now to look at ensuring the legacy tags stuff works. 2013-10-02 15:51:02 +10:00
Shannon
8b6171bb13 Almost got the tags tables upgraded 2013-10-02 13:50:42 +10:00
Shannon
2a1e3dc2f8 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
 2013-10-02 09:22:33 +10:00
Shannon
9c96b247be Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data 2013-10-01 19:37:51 +10:00
Morten Christensen
74f6a34651 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-01 10:20:29 +02:00
Morten Christensen
7dee2802fe Fixing Member and MemberType, so the ids are properly assigned through the repositories. 
Adding test to assert that no Properties, PropertyTypes or PropertyGroups exists without an id when loaded from the db.
NOTE Changes signature of Member class as Email, Username and Password is required.
 2013-10-01 10:20:16 +02:00
Shannon
31a5951626 Updated member tree/editor to use the GUID 2013-10-01 15:36:08 +10:00
Shannon
4602a6b989 Fixes an issue with the MemberTypeReadOnlyFactory 2013-10-01 14:46:16 +10:00
Shannon
bb350035ef Fixed merge issues 2013-10-01 13:43:55 +10:00
Shannon
6f6c33a721 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/TestHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-10-01 13:38:17 +10:00
Sebastiaan Janssen
5238293c09 Merge branch '6.1.6' into 6.2.0 
Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2013-09-30 16:09:25 +02:00
Sebastiaan Janssen
cdda69c4cd U4-2788 Error installing Umbraco 6.1.5 with SQL CE 4 option 2013-09-30 12:39:28 +02:00
Morten Christensen
a21bee6683 Fixing MemberType- and MemberRepository so properties, property types and property groups are properly initialized. 2013-09-30 12:12:58 +02:00
Sebastiaan Janssen
965a7fc500 Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions 2013-09-30 10:55:13 +02:00
Sebastiaan Janssen
328ada2f38 Bump version number 2013-09-30 10:46:08 +02:00
Sebastiaan Janssen
767252cdf1 Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe 2013-09-30 10:31:45 +02:00
Sebastiaan Janssen
010d47c68b Fixes U4-2822 Datepicker throws "Specified cast is not valid" when saving through API 2013-09-30 10:23:43 +02:00
Shannon
42f9427e24 ignores the built in member properties for now, adds more logging to Resolution to try to figure out the underlying problem. 2013-09-30 15:42:29 +10:00
Shannon
bbdce28951 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0-member-editor-wip 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
 2013-09-30 13:52:01 +10:00
Shannon
cf6ecf5bc9 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-member-editor-wip 
Conflicts:
	src/Umbraco.Web.UI/config/trees.config
 2013-09-30 13:51:18 +10:00
Shannon
a8f6b9eeb9 Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions 2013-09-30 13:31:48 +10:00
Shannon
957760d29a Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe 2013-09-30 12:02:35 +10:00
Sebastiaan Janssen
f74b9f9071 Renaming columns in SQL CE is a bit more elaborate.. 2013-09-27 13:35:52 +02:00
perploug
dcb08250ab Minor search visual tweaks 2013-09-27 11:23:38 +02:00
Shannon
a3d674f574 Updated the saving model and validator inheritance chain to better support members, have the members editor display data and posting/validating data - now need to get the correct fields being displayed and the correct tab/layout but coming along very nicely! 2013-09-27 16:59:38 +10:00
Shannon
82c784d560 Most of the member tree working, have the member editor rendering data 2013-09-27 15:19:39 +10:00
Shannon
30095000e6 Updates to latest version of JSON.Net 2013-09-27 13:25:28 +10:00
Shannon
c5c1a7ddfc Upgrades to latest AutoMapper lib 2013-09-27 13:16:25 +10:00
Shannon
ed7851c962 Fixes more issues with the legacy API backwards compatibility issues with new property editor that don't have legacy predecessors. - can now create a member. 2013-09-27 12:51:52 +10:00
Shannon
e0fb09c6bc Added better backwards compatibility for when people are using the legacy business logic APIs but they are using new property editors when there is no legacy property editor predecessor (IDataType implementation). 2013-09-27 11:02:59 +10:00
Shannon
394915fa05 centralizes the thumbnail/image handling 2013-09-25 21:09:59 +10:00
Shannon
1e9a17babe Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen. 2013-09-25 19:23:41 +10:00
Shannon
f356b94c39 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
 2013-09-25 19:09:16 +10:00
Shannon
a939c14de9 Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support 2013-09-25 17:57:44 +10:00
Shannon
a1f87c7232 Fixes: U4-2918 After I set admin password, the error shows.(7.0.0-build.85, new install) 2013-09-25 16:52:26 +10:00
Shannon
06400f8db5 Gets the modal content loading in the rte on editor load all in async, fixes an issue with valtogglemsg when used in a modal to ensure we unsubscribe from the events when the modal element is destroyed. 2013-09-25 14:29:59 +10:00
Shannon
6c9fe2ebd0 Adds dynamic filtering to EntityService (post filtering for GetAll) - updated the insert macro dialog to ensure that it only shows macros flagged for the rte when in rte mode, otherwise shows all of them. adds unit tests for dynamic queryable stuff. 2013-09-25 13:54:25 +10:00
Shannon
c739146f24 Completes: U4-2917 Remove canvas/live editing support, U4-2919 Remove defaultToLiveEditing column, U4-2825 Remove default permissions column 2013-09-24 19:27:13 +10:00
Shannon
5fc8e7b0fb Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-24 18:47:17 +10:00