yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,879 Commits 4 Branches 7 Tags
7610b6f592a9bd3fe7e84102b90a08b01e4cf5d2
Commit Graph

514 Commits

Author SHA1 Message Date
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
Stephan
7848ea5ec0 U4-7038 - IPublishedContentWithKey for contents, members 2015-09-01 15:00:27 +02:00
Shannon
05e17e1c7f Fixes: U4-6973 Given custom permissions user can create, but cannot save 2015-08-31 18:04:13 +02:00
Shannon
e3598b99a5 Ensures tempdata is set on our member controllers in the correct place and ensures that the RegisterModel doesn't explicitly set the RedirectUrl because we want it to be empty by default. 2015-08-27 14:56:42 +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
Shannon
685aea1728 Fixes: U4-6879 Validation issues when creating new content and cancelling save event. 2015-08-20 11:50:32 +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
1ff7b34b86 revalue flag on basic datatype 2015-08-11 11:52:29 +02:00
Shannon
2f1877c2cd Merge branch 'dev-v7' into dev-v7-contenttypeeditor 2015-08-05 13:39:30 +02:00
Shannon
f03ee9f908 Fixes routing tests and reverts to simplified routing logic based on the Language ISO code returned from the IDomain object. 2015-08-05 12:10:13 +02:00
Shannon
85534bc3ce Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-08-04 17:10:58 +02:00
Shannon
3fec2b9756 uses the LanguageIsoCode returned from the domain object during routing so it doesn't need to be re-looked up. 2015-08-04 15:53:08 +02:00
Shannon
6d8ffb903f Ensures events for deleting, trashing and unpublishing are done using the event messages, updates UI to support showing these messages in the list view, Since we cannot change the 
method results on a service, we've created a new temporary service that we will explicitly implement with an extension method to get it. This is temporary until v8 where we will just replace
the original methods on the service with these methods and then remove this class.
 2015-07-29 15:12:12 +02:00
Shannon
16c9ca9e4b Refactors IDomain model, simplifies it so that it doesn't contain references, simplifies the domain repository to no longer require lookups of content and languages, updates all other code referencing IDomain and now if a language lookup is required it is made when appropriate. 2015-07-27 12:53:09 +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
5e81aed928 Adds icon and group to property editor classes 2015-06-24 12:54:06 +02:00
Per Ploug
2e2f8723a0 Set collections on property groups 2015-06-23 09:56:59 +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