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

383 Commits

Author SHA1 Message Date
Shannon
1b21e04dc2 WIP for model mappers to new content editor save model, udpates to js to use that 2015-10-06 17:19:08 +02:00
Per Ploug
1d23d2b7c6 Fixed: New document types fails to save 2015-09-23 20:40:03 +02:00
Stephan
9c9ba477aa Merge dev-v7 into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Constants-ObjectTypes.cs
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/loader.dev.js
	src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
	src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
	src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-09-16 13:25:32 +02:00
Per Ploug
81f206090d Default listview name on mediatypes 2015-09-11 10:42:48 +02:00
Shannon
05e17e1c7f Fixes: U4-6973 Given custom permissions user can create, but cannot save 2015-08-31 18:04:13 +02:00
Per Ploug
94b09a4568 Fixes issues with the merged contenttype mapper 
Mediatype, membertype and contenttype all use the same core mapper, with
small variations between each type - it is however important in what
order the mappers are added.
 2015-08-26 12:07:43 +02:00
Claus
f44875d072 Prevent internal member groups from showing up in group list on member properties. 
Prevent internal member groups from showing up in the member group tree listing.
 2015-08-24 16:14:29 +02:00
Per Ploug Krogslund
0f4596c897 Cleanup the mappers and the display classes 2015-08-19 22:38:08 +02:00
Per Ploug Krogslund
e1fd1ab5e5 include property type editor 2015-08-11 13:22:33 +02:00
Per Ploug Krogslund
495493f2c5 Updates existing property types in mapper correctly 2015-07-16 11:12:40 +02:00
Shannon
4c1a65283a Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
 2015-07-13 15:42:25 +02:00
Shannon
8521dfb0d7 Fixes issue that you could not remove a property group, fixes issue that the inherited flag during mapping wasn't set on a standalone parent property group, updated/created tests to support. 2015-07-13 15:29:00 +02:00
Shannon
1e8bee9826 Fixes mapping tests, simplifies property group mappings, adds another test to test composition mappings. 2015-07-13 13:42:40 +02:00
Per Ploug Krogslund
446d158ff7 Fixes issues related to default templates 
Ensures default template is created on new, properly updates Ids on
allowed templates and makes default template correct
 2015-07-13 12:11:28 +02:00
Per Ploug Krogslund
1ea7d062f2 Property types can now delete properly on changed types 2015-07-07 21:13:35 +02:00
Per Ploug Krogslund
76d9efb398 Default listview and custom listview lookup 2015-07-07 11:29:53 +02:00
Per Ploug Krogslund
583c18bdd3 Merges in parent ct names on each tab 2015-07-06 15:19:20 +02:00
Per Ploug Krogslund
0bf86e8286 Adds list view name for the content type 2015-07-06 15:19:20 +02:00
Per Ploug Krogslund
955f1eacf8 Changes the order of inherited properties on tabs 2015-07-06 14:15:23 +02:00
Per Ploug
8679c26f3d Added icons and groups on all core editors 2015-06-24 21:43:14 +02:00
Per Ploug
05d554d8a6 Fixes doctype icon map 2015-06-16 13:30:28 +02:00
Shannon
089909c036 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-08 18:22:52 +02:00
Per Ploug
e8abe4af2d map generic properties the right way 2015-06-08 18:17:10 +02:00
Per Ploug
ddfd2fece4 Map member types 2015-06-08 18:16:52 +02:00
Per Ploug
8ec652c557 ignore system properties 2015-06-08 18:16:41 +02:00
Shannon
f36574fef3 Merge branch '7.3.0' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
 2015-06-08 18:03:39 +02:00
Per Ploug
c4abe6c771 Enables available templates 
fixes the last mapping issues
 2015-06-08 14:03:48 +02:00
Shannon
8ec397e4ae Updates mappings to ensure the underlying logic in the ContentType classes is used when using AddPropertyGroup and AddPropertyType 2015-06-06 11:32:21 +02:00
Shannon
c7510ab50e fixes prop group/prop type mapping for when there is a new property group with new property types assigned 2015-06-06 10:58:25 +02:00
Per Ploug
34060ceed6 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-06 08:40:11 +02:00
Shannon
2654657701 fixes up some more mappings, now the persistence tests are working 2015-06-05 16:37:39 +02:00
Shannon
f2f29eaa8e Fixes up some more mappings, adds another test to simulate persisting an updated type from the display model - which isn't working so need to fix more. 2015-06-05 16:13:13 +02:00
Per Ploug
cf3dfe4992 merge 2015-06-05 12:20:45 +02:00
Per Ploug
87b9758337 Change propertyresolver to use IContentTypeComposition 2015-06-05 12:16:41 +02:00
Per Ploug
3cf9ceb2a6 Remove membertype from content type mapper 2015-06-05 12:16:08 +02:00
Per Ploug
55daa2ee45 WIP membertype editor 2015-06-05 12:15:20 +02:00
Shannon
e580bfef97 moves mapping for allowed content types to be inline, no need for after map for that 2015-06-05 12:13:40 +02:00
Shannon
c9cb7034f8 fixes mappings with change to allowed content types with enumerable int's. Fixes up a mapping to not do ToArray() and consuming more memory than required 2015-06-05 12:09:20 +02:00
Shannon
d797677879 Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
 2015-06-05 12:00:07 +02:00
Shannon
a483ec306c fixed up more mappings and tests 2015-06-05 11:59:45 +02:00
Shannon
087c07bcbd started updating the content type mapping. 2015-06-04 16:52:22 +02:00
Per Ploug
ac16f9498e Changes allowed content types to list<int> 2015-06-04 10:59:26 +02:00
Per Ploug
882f866a5f Removes singleton reference 2015-06-02 22:03:30 +02:00
Per Ploug
bd1de4559d Adjusting the content type display model 2015-06-02 11:57:43 +02:00
Per Ploug
1a04f5f071 Mapping of composite alias 2015-05-29 11:18:22 +02:00
Per Ploug
f65bff185d WIP On mapping 2015-05-29 09:21:38 +02:00
Per Ploug
4424f0a37b Correct mapping of composte type ids 2015-05-28 14:01:18 +02:00
Per Ploug
f96e13902c Sets correct property inherite stattus 2015-05-28 12:59:04 +02:00
Per Ploug
936e31c5df Adds content type names composite Ui 
for UI read-only
 2015-05-28 10:59:35 +02:00
Per Ploug
b545b76248 Merge tabs based on names 2015-05-27 15:48:40 +02:00