swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,180 Commits 73 Branches 219 Tags
c23afee261dcbbf11daa67d7d46265cecc57f019
Commit Graph

13180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen c23afee261 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-07-13 19:38:30 +02:00
Mads Rasmussen 71c14b6944 Added shortcut to add editor 2015-07-13 16:13:30 +02:00
Mads Rasmussen 263fd4b162 Added shortcut to edit data type 2015-07-13 16:12:22 +02:00
Mads Rasmussen fa5ebd13de added shortcut to toggle list view 2015-07-13 16:11:21 +02:00
Mads Rasmussen 95bbcc35a4 added shortcut to add property 2015-07-13 16:10:38 +02:00
Mads Rasmussen a9cb694c2d added shortcut to add tab 2015-07-13 16:10:08 +02:00
Mads Rasmussen fc8751f897 WIP: added directive to show a keyboard shortcuts overview 2015-07-13 16:06:51 +02:00
Mads Rasmussen 7d85074387 accept hotkey on div elements 2015-07-13 15:57:45 +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 ff71d5b88f Fixes issue with custom property editors/data types when no group is assigned - was getting null ref exceptions. 2015-07-13 15:40:57 +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
Mads Rasmussen 111be2dd8d add filter to item picker overlay 2015-07-13 14:55:20 +02:00
Mads Rasmussen 5c538426e5 clean up hotkey directive keyboardService on $destroy 2015-07-13 14:50:26 +02:00
Shannon bfe4f79b7c Fixes security on member, content and media type controllers 2015-07-13 14:21:33 +02:00
Shannon 913505c547 Fixes a backoffice IsAuthenticated check to ensure it's the correct identity type 2015-07-13 14:21:13 +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
Shannon ae32f49243 Updates permissions on DataTypeController 2015-07-13 13:41:34 +02:00
Shannon bb8864f51b ensures that when setting the PropertyType's property on a PropertyGroup that the PropertyGroupId is set 2015-07-13 13:41:15 +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
Shannon 2e088fa036 Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-07-13 09:49:34 +02:00
Mads Rasmussen 6b18e19ea3 Template section: only add name watcher on new types 2015-07-10 12:28:35 +02:00
Mads Rasmussen 993a517ec5 umb button group: added hot key to submit 2015-07-10 12:15:25 +02:00
Mads Rasmussen 1d0f24fb2d Umb-overlay: add hotkeys to submit and close overlay 2015-07-10 12:12:32 +02:00
Mads Rasmussen 70e5731ee4 Edit data type: when data type name is changed - switch the default save button to save as new 2015-07-10 11:59:53 +02:00
Mads Rasmussen 09941be089 umb button group: set default button based on property value to make it easier to switch default button from outside the directive. 2015-07-10 11:57:11 +02:00
Mads Rasmussen 4ae0dbbdbf comment out user configured and custom property editors in editor picker 2015-07-10 10:00:24 +02:00
Mads Rasmussen 2eea8da101 insert template placeholder as default template on new content types 2015-07-10 09:42:18 +02:00
Stephan 97533e7c3d UmbracoApplication - log unhandled exceptions 2015-07-08 21:29:17 +02:00
Stephan 993a5bbc92 Resolution - better logging when freezing 2015-07-08 16:28:53 +02:00
Stephan c9489bb912 DatabaseServerMessenger - default instructions retention is 2 days 2015-07-08 14:42:47 +02:00
Stephan fce688f47f DatabaseServerMessenger - local identity is unique appdomain 2015-07-08 14:42:38 +02:00
Stephan 6833c195c1 BackgroundTaskRunner - refactor recurring tasks, improve shutdown 2015-07-08 13:18:46 +02:00
Shannon Deminick cf16692b5a Merge pull request #741 from abryukhov/patch-2 
UI localization (RU) - All 7.2 and actual at the moment 7.3 keys
 2015-07-08 09:53:23 +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 446b434408 passes the scope correctly to the resetform 
+ fixes a couple of eslint issues
+ adds notification
 2015-07-07 21:13:12 +02:00
Per Ploug Krogslund fc1c3697d5 Adds delete method to delete dialog 2015-07-07 21:12:26 +02:00
Per Ploug Krogslund 89088b1e92 Changes safeAlias response to object 2015-07-07 21:12:12 +02:00
Mads Rasmussen 9e875e404c set header name and alias to $parent to bind to scope. Set auto focus on name 2015-07-07 19:39:44 +02:00
Per Ploug Krogslund 798cbb8190 Create a defaultTemplate if it doesn't exist 2015-07-07 18:53:58 +02:00
Shannon 5d60440a6f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-07 18:27:38 +02:00
Shannon 0fe96e80c9 Fixes: U4-6782 ContentTypeService should support getByKey(Guid) and refactors a little bit of the RepositoryBase stuff with the addition of IReadRepository, adds some tests to support. 2015-07-07 18:26:53 +02:00
Shannon a712726065 Updates the logger and how to output process id and app domain id with the default log4net patterns. 2015-07-07 16:18:57 +02:00
Shannon 253b9dab27 Ensures log4net is shutdown on app shutdown 2015-07-07 16:12:05 +02:00
Shannon 1ffde1e9a6 makes log tests go a little quicker 2015-07-07 16:11:49 +02:00
Shannon f6e0dfe9dc Changes published media cache log output to warnings (when indexes are not found) 2015-07-07 16:11:33 +02:00
Sebastiaan Janssen 30dfd2772b "+" in the version doesn't work with the current NuGet 2015-07-07 15:20:35 +02:00
Alexander Bryukhov f93364ab96 All 7.2 and actual at the moment 7.3 keys 2015-07-07 19:17:56 +06:00
Sebastiaan Janssen b903e0503f "+" in the version doesn't work with the current NuGet 2015-07-07 15:11:58 +02:00
Sebastiaan Janssen b0ccb040a1 Makes sure we can have nightlies for non-pre-releases as well 2015-07-07 15:11:57 +02:00
Sebastiaan Janssen db030ffa31 Adds the ability to pass in a nightly version to the version comment 2015-07-07 15:11:57 +02:00