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

294 Commits

Author SHA1 Message Date
Shannon
d3fe37a080 Adds RequiredForPersistenceAttribute to easily detect if any entity fails validation in a way that it cannot be persisted to the data store. Changes all tree events to not be jquery events and to not require a 'callback' jquery object, instead we just use angular events broadcast globally, much nicer. 2013-07-18 17:05:40 +10:00
Shannon
556360143e Fixes issues with ObjectExtensions when converting an entity to XML. U4-2473 Installer throws examine exception: Unable to cast object of type 'System.Int32' to type 'System.String' 2013-07-15 23:27:15 +10:00
Shannon
deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
 2013-07-12 11:03:49 +10:00
Shannon
868edee5e6 Fixes: #U4-2161 - permissions inheritance. Fixes up how user permissions cache is invalidated and looked up (it is now lazy and not forced). User permissions are also cached as a low priority for now and only for 20 mins based on #U4-2474. 2013-07-09 11:47:46 +10:00
Shannon
b7f6195791 Started adding base PermissionsRepository for sub classes to use for assigning permissions, created a BulkImport extension methods for PetaPoco with tests since we'll be needing that for assigning permissions in a nice way. Wrote unit tests for all sql gen for permissions and assigning permissions. This all starts fixing #U4-2161 but there's still a bit more work to do. 2013-07-08 17:29:26 +10:00
Shannon
71bff2d1d7 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Core/Models/Membership/UserProfile.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-07-03 20:24:02 +10:00
Shannon
4077a01a6b Fixes: #U4-2344 - fixes examine re-indexing for media and a null check for DataType.Data 2013-07-03 19:47:06 +10:00
Shannon
a132f609d7 backports changes for -> Finished upgrading the UserRepository and entities to properly support Users' Allowed Sections & streamlines Persistence/Mappers with less code duplication. 2013-07-03 16:40:22 +10:00
Shannon
32ee1fadd6 Finished upgrading the UserRepository and entities to properly support Users' Allowed Sections 2013-07-03 16:07:20 +10:00
Shannon
a9efd08b08 Created new IUserProfile to support the Sections stuff as an interface to work in the IUserRepository 2013-07-03 11:16:45 +10:00
Shannon
3e31faee3b Moving UserSection implementation to one-many relationship with User object. 2013-07-03 10:29:05 +10:00
Shannon
3779e79367 Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations. 2013-07-02 17:47:20 +10:00
Shannon
9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10:00
Shannon
388f55d7fd Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found. 2013-07-01 14:23:56 +10:00
Morten Christensen
8226505e5b Merge branch '6.0.7' into 6.1.2 2013-06-26 15:55:49 +02:00
Morten Christensen
41b8de09b7 Fixes U4-2234 including test case from issue 2013-06-26 15:49:00 +02:00
Morten Christensen
4643d34546 Moving generation of xml from ContentExtensions to the PackagingService 2013-06-26 13:30:54 +02:00
Shannon
68a648d3ba Merge remote-tracking branch 'origin/6.1.2' into 7.0.0 
Conflicts:
	.hgignore
 2013-06-25 10:01:23 +10:00
Stefan Kip
b01b4f7aa7 Forgot to update XML comments 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-24 10:29:03 +02:00
Stefan Kip
49a699c858 Added RemovePropertyGroup method 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-24 10:28:42 +02:00
Morten Christensen
f68571ef7c Merge pull request #24 from kipusoep/U4-2421-RemovePropertyGroup 
U4-2421 Added RemovePropertyGroup method
 2013-06-24 01:18:21 -07:00
Stefan Kip
d553dfd4b0 Forgot to update XML comments 2013-06-23 20:24:22 +02:00
Stefan Kip
f3e737720b Added RemovePropertyGroup method 2013-06-23 16:38:11 +02:00
Shannon
b6cbd521ce Merge branch '6.1.2' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-20 16:06:23 +10:00
Shannon
24a76f53b4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
 2013-06-20 15:49:55 +10:00
Shannon
86ce48ddc8 Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure. 2013-06-20 15:34:57 +10:00
Shannon Deminick
76bbdcd32c Merge with 6.1.2 2013-06-03 13:36:40 -10:00
Morten Christensen
2a2e867784 Fxies U4-2257 2013-06-02 11:30:27 -02:00
Morten Christensen
242443d861 Fixes the EntityRepository for Content and Media, so trees load correctly. 
Fixes U4-2306
Fixes loading of MNTP.
FolderBrowser is now able to show multiple images on a single media item.
FolderBrowser only shows images and not containers.
 2013-06-01 20:40:51 -02:00
Shannon Deminick
160811e190 added new tests for model mapping and serialization of the content display models. Started integrating trees. Committed the compiled 
angular controllers, directives, services, resources since I'll be modifying them to work with the real data services. Then we'll have
to merge back to the belle repo with the changes.
 2013-05-30 21:21:52 -10:00
Shannon Deminick
c5ff9ddec9 Updated property editors deserialization method to accept more information and original values, updated the upload property editor to now save 
files in accordance with exactly how we are saving them currently and it is all working... expcept the new uploader can do multiple files. It is
now persisting to the database as well.
 2013-05-28 18:27:11 -10:00
Shannon Deminick
302b3c3750 Fixed some build problems, replaces all calls to the legacy/obsolete data type factory to the DataTypesResolver and removes test for DataTypeFactoryTests. 
Updates data type editor to show legacy data types at the bottom and the new Property editors at the top. Updated the data type editor to use the new api
so that we can test assigning Belle property editors to data types (pre-values have not been converted though). #U4-2289
 2013-05-28 15:54:19 -10:00
Shannon Deminick
cf631974a8 Updated validator definitions, updated ToXml logic to take into account new Property Editors, added Serialization and Deserialization methods 
for property editor's to override if necessary, updated the ContentItemBinder to bind the db and dto models so now that validator filter
just validates against the model and doesn't actually do any data lookups itself (much nicer). Now saves and retreives from the database !!
 2013-05-27 21:32:37 -10:00
Morten Christensen
232581664b Moving internal membership provider classes. 
Adding missing alias to AllowedContentTypes on ContentType.
Adding Package export test.
 2013-05-24 08:13:24 -02:00
Morten Christensen
c7a4c782e3 Internal work around the creation of users through the new api. 2013-05-23 13:25:14 -02:00
Morten Christensen
b19621c07b Improving tree performance for Content and Media trees using the new EntityService and the thin IUmbracoEntity object. 
Updating a few internal overloads as well as adding new ones to ensure backwards compatibility for events used by the tree.
Fixing issue with the Published/Unpublished/Saved/Pending Changes states shown in the content tree.
 2013-05-22 11:06:21 -02:00
Shannon Deminick
cfe6ac0486 Merge with 6.0.6 2013-05-07 18:57:39 -10:00
Shannon Deminick
c52669fb05 Fixes: #U4-2094 - issue with duplicates in getting Descendants for media in mvc. 2013-05-07 18:56:24 -10:00
Shannon Deminick
6cffa67518 Fixes merge issues and WebSecurity with the correct encryption (from failed merge along time ago). 
Fixes ContentType to ensure that ALL property type values get reset, not just ones assigned to a group.
Fixes logic in ContentTypeService to ensure that xml is re-generated when a property type alias is changed too.
 2013-04-25 21:09:07 -10:00
Shannon Deminick
710c8aa6ea Merge with 6.0.4 2013-04-23 21:52:07 -10:00
Morten Christensen
eeb0e0026a Making PropertyCollection, PropertyGroupCollection and PropertyTypeCollection return a proper null when FirstOrDefault should return null. 2013-04-20 19:47:30 -02:00
Morten Christensen
1e21671b62 Fixes #U4-2008 Umbraco.Core.Models.PropertyType -> change ValidationRegExp from internal to public 2013-04-20 11:10:28 -02:00
Morten Christensen
9621403f79 Fixes U4-2053 2013-04-16 17:19:46 -02:00
Shannon Deminick
2642d74450 adds some logging and fixes sequence of events for distributed cache sending 2013-04-12 04:06:24 +06:00
Sebastiaan Janssen
1d89702c2c Merge with 6.0.4 2013-04-11 10:21:37 -02:00
Sebastiaan Janssen
c874fa6507 Fixes U4-2097 Package import causes template tree to break 2013-04-11 10:20:17 -02:00
Morten Christensen
efbc461da9 Code cleanup - removing all internal code related to Macros, which was created for v6 but left out for backwards compatibility. 2013-04-07 17:47:10 -02:00
Morten Christensen
640be73a66 A few refactoring bits for the FolderBrowserService. 2013-04-03 07:03:57 -02:00
Morten Christensen
a4c9c3bfd9 Updating EntityService and repository to add content and media specific properties to the UmbracoEntity for performance enhancements. 
Adding sample implementation in the BaseMediaTree but keeping it commented out as it won't work with the legacy events.
And a bit of code cleanup
 2013-04-03 05:25:26 -02:00
Morten Christensen
3f7a93e0c9 Adding test fixture for the EntityService. 
Refactoring sql query used in the EntityRepository.
Correcting a few issues with the UmbracoObjectTypes extensions.
 2013-03-30 09:52:37 -01:00