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

12717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Mads Rasmussen
867d955d01 Optimize directive to not use ng-repeat 2015-06-04 22:55:03 +02:00
Mads Rasmussen
309afc9e2d Remove margin top on tabs 2015-06-04 21:30:22 +02:00
Mads Rasmussen
1d3238d9d8 use new umb-editor-navigation + umb-editor-sub-views directives + styling of header 2015-06-04 21:28:50 +02:00
Mads Rasmussen
3dbd7fafd4 Added directives to split navigation and sub views so it is possible to add navigation to editor header. 2015-06-04 21:24:13 +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
Mads Rasmussen
2fe00d6455 content type permissions sub view 2015-06-03 21:30:45 +02:00
Mads Rasmussen
4d2ef9c07d Add no-indent variations of checkboxes and radios 2015-06-03 21:26:47 +02:00
Mads Rasmussen
66cd5d0b66 Add list wrapper class 2015-06-03 18:50:47 +02:00
Mads Rasmussen
37d88ed224 Bring back the bold tab strokes to make more contrast + remove inherited property border 2015-06-03 18:48:55 +02:00
Mads Rasmussen
cc226cf9ac Add margin in top of tabs list to compensate for position absolute tab titles 2015-06-03 18:47:41 +02:00
Mads Rasmussen
51dea2d5fc Remove padding from canvas on big screens 2015-06-03 18:46:26 +02:00
Mads Rasmussen
d6281f3e2b Add more margin to the bottom of sub views nav 2015-06-03 18:45:39 +02:00
Per Ploug
c2c93a1a5b removes unneeded tolists 2015-06-03 15:09:19 +02:00
Per Ploug
d62ae17f05 Content type get all method 2015-06-03 14:56:32 +02:00
Per Ploug
882f866a5f Removes singleton reference 2015-06-02 22:03:30 +02:00
Mads Rasmussen
8cdb34adb6 umb-sub-views directive: select tools form the first view on init 2015-06-02 15:29:40 +02:00
Mads Rasmussen
5178525802 Use umb-sub-views directive to load in views in the content type editor 2015-06-02 15:14:56 +02:00
Mads Rasmussen
f5f4eef7a9 load in umb-sub-views less file 2015-06-02 15:02:55 +02:00
Mads Rasmussen
fe28bcafca Added custom directive to add sub views to a page 2015-06-02 15:00:37 +02:00
Per Ploug
bd1de4559d Adjusting the content type display model 2015-06-02 11:57:43 +02:00
Mads Rasmussen
bb5a89956c Remove border in sorting mode 2015-06-01 19:18:41 +02:00
Mads Rasmussen
eca0f91794 Better styling of inherited property label 2015-06-01 15:52:20 +02:00
Mads Rasmussen
ac42eebe60 remove unused function 2015-06-01 14:41:45 +02:00
Mads Rasmussen
a8c00ed2d3 set borders to 1px, remove shadow + move inherited tab text 2015-06-01 14:40:54 +02:00
Mads Rasmussen
058085d9d0 move dialog outside form 2015-06-01 13:26:14 +02:00
Mads Rasmussen
f0f5ab9304 Add button group to edit data type dialog with the possibility to save and save as new 2015-06-01 13:24:13 +02:00
Mads Rasmussen
53ef8ce7f4 Added directive to add bootstrap button groups 2015-06-01 13:17:41 +02:00
Mads Rasmussen
5586e07329 Show dataTypeName instead of preview when an editor is loaded 2015-05-29 13:59:11 +02:00
Mads Rasmussen
6773057b11 fix actions button position 2015-05-29 12:42:34 +02:00
Mads Rasmussen
e2417f92f5 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-05-29 12:40:28 +02:00
Mads Rasmussen
b622184c87 WIP header 2015-05-29 12:40:04 +02:00
Per Ploug
350161bfee Actions button 2015-05-29 12:11:29 +02:00
Mads Rasmussen
acdc81a384 Do not add contentType to available content type model 2015-05-29 11:55:37 +02:00