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

12841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
2c9343afcb Add list view labels mock 2015-06-09 11:16:49 +02:00
Mads Rasmussen
f37fb1078f add filter to icon picker 2015-06-08 22:46:22 +02:00
Mads Rasmussen
42c2c23437 remove json debug in html + small indent clean up 2015-06-08 22:34:42 +02:00
Mads Rasmussen
74eb5f628c get data type details for each property on init 2015-06-08 22:26:41 +02:00
Mads Rasmussen
51a5dbb72a Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-08 19:38:43 +02:00
Mads Rasmussen
12702a12b4 Add validation to property 2015-06-08 19:37:15 +02:00
Shannon
f167f84c7f doc type folders are a thing 2015-06-08 19:02:35 +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
Shannon
4e4382ff90 folders are more or less working. 2015-06-08 18:22:43 +02:00
Per Ploug
6e23e3eeeb change default ct icon 2015-06-08 18:18:05 +02:00
Per Ploug
77a571efb3 update ui to latest 2015-06-08 18:17:36 +02:00
Per Ploug
120b7bae17 clean up membertype groups and props 2015-06-08 18:17:26 +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
Shannon
76ffbab26f Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI/config/trees.config
 2015-06-08 18:00:29 +02:00
Shannon
97c6067b70 Gets initial doc type folders working 2015-06-08 17:59:56 +02:00
Per Ploug
7b06c37f44 merge 2015-06-08 16:49:34 +02:00
Per Ploug
13fd548c17 Adds umb-locked-field directive 2015-06-08 16:06:10 +02:00
Mads Rasmussen
6ff82475e4 set min-width on name field when name is empty 2015-06-08 15:00:56 +02:00
Per Ploug
e82e608701 removed lorem ipsum 2015-06-08 14:39:40 +02:00
Per Ploug
416fe02608 Property editor dialog cleaned up 2015-06-08 14:39:37 +02:00
Mads Rasmussen
174f5c2043 load templates in templates section 2015-06-08 14:37:08 +02:00
Mads Rasmussen
109c0408cf Increase resize directive delay time 2015-06-08 14:29:21 +02:00
Per Ploug
c4abe6c771 Enables available templates 
fixes the last mapping issues
 2015-06-08 14:03:48 +02:00
Per Ploug
84a1230759 Changes GetScaffold to GetEmpty 2015-06-08 14:03:47 +02:00
Mads Rasmussen
93b0991dc4 Add prototype for template section 2015-06-08 14:01:37 +02:00
Shannon
08762e5a00 Fixes getScaffold issue, starts adding Create dialog for doc types 2015-06-08 13:10:52 +02:00
Mads Rasmussen
bbb4a25070 Basic implementation of icon picker. Still needs support for images 2015-06-08 11:16:49 +02:00
Shannon
49417cbce4 Fixes assembly references and assembly redirects 2015-06-06 22:35:24 +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
Mads Rasmussen
61519f1762 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-05 22:38:56 +02:00
Mads Rasmussen
0f70d1a69f Temp removal of 1 sec timeout to prevent bug where overlay does not open 2015-06-05 22:38:20 +02:00
Mads Rasmussen
50f3a4bd61 Change from select element to target overlay 2015-06-05 22:34:11 +02:00
Mads Rasmussen
203deb55e5 Extend overlay directive with "target"-version 2015-06-05 22:29:14 +02:00
Shannon
6153c70ef6 Fixes: U4-6673 Xml data integrity dashboard 2015-06-05 17:27:18 +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
1eb98a7478 Change GetScaffold to GetEmpty 2015-06-05 12:15:43 +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