yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,696 Commits 4 Branches 7 Tags
087c07bcbd8c3f024ce7c41a280ea0346e8912ea
Commit Graph

143 Commits

Author SHA1 Message Date
Shannon
087c07bcbd started updating the content type mapping. 2015-06-04 16:52:22 +02:00
Per Ploug
bd1de4559d Adjusting the content type display model 2015-06-02 11:57:43 +02:00
Per Ploug
7a53af95e4 Fixes CT mapping 
Should now have the correct properties on each tab according to
inheritance, also includes a content type ID on each tab
 2015-05-26 16:43:03 +02:00
Per Ploug
1bfe7840a9 Added composite types to the ct mapper 2015-05-20 20:56:51 +02:00
Per Ploug
b43f0a0986 Fixed up a couple of mapping errors 2015-05-19 11:57:49 +02:00
Shannon
b9120698ba Adds more mapping logic for content type mappers, creates unit tests for them, adds some missing required properties that will be needed for editing, adds lots of notes. 2015-05-19 11:17:23 +10:00
Shannon
3be1cd8b0d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
 2015-05-07 16:24:29 +10:00
Shannon
813f1a1f2d Fixes: U4-6035 Properrty.WasDirty() always returns false 2015-05-07 11:43:53 +10:00
Shannon
685635c568 Merge branch 'master-v7' of https://github.com/aaronpowell/Umbraco-CMS into aaronpowell-master-v7 2015-05-07 11:06:55 +10:00
Shannon
a1c7352da1 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Integration/GetCultureTests.cs
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Tests/Models/ContentTypeTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/Mvc/SurfaceController.cs
 2015-04-09 16:50:07 +10:00
Shannon
b35397b464 uses property type ctor overload to accept an alias which prob should have been there all along since in most cases you need an alias to create one (same prob goes for property groups, etc... but oh well). Adds a couple tests for case insensitive comparisons in PropertyCollection 2015-04-08 16:33:16 +10:00
Shannon
d3eff734aa Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
	src/Umbraco.Core/Services/LocalizedTextService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-03-19 17:37:00 +11:00
Shannon
834b780d8e Removes change tracking for User.DefaultPermissions since it is entirely not necessary (and in fact shouldn't be settable). Also ensures that the cloning of the default permissions is a new list, wasn't doing this before... which might have been the culprit for strange thread issues. 2015-03-03 19:37:13 +11:00
Shannon
e1e73f5e5f completes: U4-6174 Remove cmsPropertyType.helpText column 2015-01-29 17:21:44 +11:00
Shannon
1cb0cd296c Decoupling more things, mostly to do with the PluginManager and logging which now requires an IServiceProvider so have created a simple instance of that. 2015-01-16 15:47:44 +11:00
Shannon
5cbfa7bd91 Updates how the stylesheet file works, uses v5 style logic for naming a stylesheet rule, adds plenty of tests to support, fixes validation methods on the file service, removes the css parser library stuff as it's overkill for what we want. 2015-01-14 14:10:55 +11:00
Shannon
b3a93e369a WIP - bit of a refactor on the IFile stuff, moves all validation to the service level and obsoletes the IFile.IsValid methods. Adds v5 style CSS property parsing, but might integrate that with this zany css parser in the core for 'safer' parsing. 2015-01-14 12:09:30 +11:00
Shannon
d5c8430cd2 Removes all IRepositoryCacheProvider's, we are just using a single cache construct to which is much easier to manage. 2015-01-13 13:33:39 +11:00
Shannon
e3acdbe85b Fixes up dictionary and language repositories to have underlying simple get repositories since they support getting by id, unique id and string variations but we want to have native repository enabled caching for these items so these get methods now use private repositories based on these keys. Adds more tests, removes N+1 queries for languages and dictionary items. Removes RuntimeCacheProvider, we only want one type of cache, this simplifies things a lot. 2015-01-13 13:25:36 +11:00
Aaron Powell
b8097219fb Implementing a test for U4-6035 2014-12-21 17:56:33 +11:00
Shannon
d4fd58e038 Completes: U4-5846 Remove cmsTemplate.master column and transfer those values over to umbracoNode.parentId, U4-5847 Ensure the path is set correctly for templates in the db, almost done the other template service tasks too. 2014-12-05 17:29:47 +11:00
Shannon
df3d427c0b WIP - Updates templates service and repo with some extra methods, creates new template tree, updates template model with some more properties, still need to finish the template tree, it's missing some menu actions. 2014-11-20 19:51:42 +11:00
Morten Christensen
a699f32178 Correcting invalid tests related to Compositions 2014-11-18 12:40:31 +01:00
Shannon
9717a6962a adds tests 2014-10-22 16:46:22 +10:00
Shannon
967030a9c4 Fixes up issues when tracking dirty changes on numerical or empty string values because json.net converts numerical to long and we were setting those values on the Property.Value which means that comparing long -> int will always return false and thus the property is flagged as dirty. Same goes with string and null when dealing with an object. This is all fixed up now and have added another method to see if we shold actually persist any changes for content when saving. This all relates to fixing: U4-5510 Previewing a content item saves that item 2014-10-21 13:12:31 +10:00
Shannon
067eceffce adds a couple of benchmark tests if we need to refer to them in the future (they are ignored so won't run as part of the normal build) 2014-08-20 19:36:03 -06:00
Shannon
762656e964 Fixes: U4-4926 Pre-values need to be cloned in/out of the cache 2014-05-16 12:08:17 +10:00
Shannon
46a4f9242c fixes test 2014-05-16 11:43:20 +10:00
Shannon
8cae2526d5 Fixes: U4-4842 Unable to edit "name" and "alias" to MediaType property 2014-05-16 11:34:10 +10:00
Shannon
03cb54e931 fixed merge issue 2014-05-12 14:37:54 +10:00
Shannon
150b67d10f Merge remote-tracking branch 'origin/6.2.1' into 7.1.3 
Conflicts:
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Tests/Models/ContentTypeTests.cs
 2014-05-12 14:37:19 +10:00
Shannon
cca27e064a Fixes: U4-4855 Can't use macro parameters at all 2014-05-12 13:48:56 +10:00
Shannon
53a9cdb7a0 fixes a couple tests 2014-05-09 17:10:56 +10:00
Shannon
da0b935604 Fixes merge 2014-05-09 16:08:05 +10:00
Shannon
b91a06ab98 Fixes: U4-4849 Cannot change a users language/sections in the back office 2014-05-09 16:00:30 +10:00
Shannon
d61fb5d94d Fixes user cloning issues with allowed sections 2014-05-09 15:59:30 +10:00
Shannon
b763c2ab2f Fixes deep clone of User object 2014-05-09 15:56:45 +10:00
Shannon
0d37a1f6e8 Fixes: U4-4849 Cannot change a users language/sections in the back office 2014-05-09 15:19:00 +10:00
Shannon
389724cba5 Re-fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) 2014-05-09 14:06:15 +10:00
Shannon
0382902984 Fixes user cloning issues with allowed sections 2014-05-09 14:01:20 +10:00
Shannon
9d96a4411f Fixes deep clone of macro object 2014-05-09 13:26:16 +10:00
Shannon
8e9a9dc996 Fixes deep clone of User object 2014-05-09 13:25:18 +10:00
Sebastiaan Janssen
59cb1ad31e Revert "Fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) - this is done by using the entityResource in the mediaPicker but to do this we need to return a cut down version of the media properties in the additionalData which is tricky because the cropper stores json which is ntext and the existing sql didn't cater for this. This also cleans up the entity service and we no longer have this internal collection of properties, everything is just added to additionalData, then had to add mediaHelper method to deal with getting urls from a media 'entity' not just a media object." 
This reverts commit c38c2ede11.
 2014-05-08 16:08:16 +02:00
Shannon
c38c2ede11 Fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) - this is done by using the entityResource in the mediaPicker but to do this we need to return a cut down version of the media properties in the additionalData which is tricky because the cropper stores json which is ntext and the existing sql didn't cater for this. This also cleans up the entity service and we no longer have this internal collection of properties, everything is just added to additionalData, then had to add mediaHelper method to deal with getting urls from a media 'entity' not just a media object. 2014-05-07 23:55:20 +10:00
Shannon
31e018c045 Moves XML serialization for content/media/members to a resusable class: EntityXmlSerializer to remove the circular references we have by using the ToXml extension methods from directly in the services. This has been completed for the ContentService, next is Media and Member services. Updates the ContentService to not perform CUD operations for preview or published xml, this is now done at the repository level and now done in a single transaction for the saving and publishing events. Still need to do that for the member and media services too and the remaining methods in the content service 2014-04-28 17:28:40 +10:00
Shannon
0725d95941 fixes merge 2014-04-22 17:48:36 +10:00
Shannon
4f8485e7d9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 2014-04-22 14:00:28 +10:00
Shannon
f673cb024a Adds unit test for ensuring reset identities on cloning a content type 2014-04-22 14:00:03 +10:00
Shannon
15f4de4ed0 fixes build issues 2014-04-17 18:52:07 +10:00
Shannon
7d556a0318 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderExtensions.cs
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/ICacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Core/Services/DataTypeService.cs
	src/Umbraco.Tests/Models/Collections/PropertyCollectionTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/PublishedProperty.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
 2014-04-17 18:10:42 +10:00