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

14291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
bca74790ca Implement IFileService.GetTemplate(Guid) 2015-11-17 12:02:35 +01:00
Claus
3d95b4d73a Updated unit test after adding in TaskTypeMapper. 
cherrypicked from dev-v7.
 2015-11-17 11:51:03 +01:00
Shannon Deminick
60c2040cba Merge pull request #890 from umbraco/temp-U4-7286 
Fixes: U4-7286 Upgrade script to normalize all GUIDs for content types + update Courier to support it
 2015-11-17 11:48:19 +01:00
Claus
e442911d0f Merge pull request #892 from umbraco/temp-U4-7342 
Temp u4 7342
 2015-11-17 10:09:33 +01:00
Stephan
92e4a14b7e Merge temp-U4-6911 into 7.4.0 2015-11-13 15:06:28 +01:00
Stephan
9654a0aa3a Enable moving system datatypes (but not deleting) in tree 2015-11-13 15:04:14 +01:00
Stephan
8653da010e Remove warning on container delete, cannot delete a non-empty container 2015-11-13 15:03:57 +01:00
Stephan
b59ea231c5 Merge 7.4.0 into temp-U4-6911 2015-11-13 12:53:34 +01:00
Mads Rasmussen
d00569325a Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
 2015-11-13 11:29:47 +01:00
Shannon
bf40fc25e6 Fixes csproj and fixes migration script to use Sql object and ensures that it normalizes GUIDs across ALL content types 2015-11-13 11:17:14 +01:00
Shannon Deminick
371269436f Merge pull request #891 from umbraco/temp-U4-7128 
Fixes: U4-7128 Send to Translation gives YSOD
 2015-11-13 10:23:41 +01:00
Shannon
50e2bd5d7e Gets data type folders working, this includes updating the data type repo + unit test, the move dialog/views, the data type tree to just show folders. 2015-11-12 19:01:42 +01:00
Shannon
5209a54f2a Added Move methods for both content types and media types ... these move methods are done as part of the UOW commit/transaction process, something that should be done with the Move/Copy operations of the content/media services. I added unit tests for the move operations for both content, media and data types. Events are all in places for content type and media type moves (something which Courier will need to use). Updated the trees/menu items to support moving which includes rendering the tree with only folders, updated the move dialog views to work. 2015-11-12 19:01:41 +01:00
Shannon
98be8dfe3e adds unit tests for content, media and data type repositories for creating and deleting containers (NOTE: There are other failing tests that are not part of this branch that need to be fixed in the 7.4 branch) 2015-11-12 19:01:41 +01:00
Shannon
d379b98c57 Gets data type folders working/creating, data types being able to be created in folders, tree syncing with data type paths, fixes up some localization stuff and fixes up some issues with media type folders with parent ids 2015-11-12 18:59:43 +01:00
Shannon
42a0697d60 Nearly got data type folders creating 2015-11-12 18:59:42 +01:00
Shannon
4f07033d58 Gets creating/deleting media type folders working. 2015-11-12 18:59:41 +01:00
Shannon
b4755fc5c4 Gets more doc type folders working, can create and delete, now to get doc types to be moved. 2015-11-12 18:59:40 +01:00
Shannon
f54cde050a WIP - updated repositories to better support creating/deleting entity containers in a transaction, this is done by a child repository and a new EntityContainer type. Updated the controller to use this logic. 2015-11-12 18:59:39 +01:00
Shannon
4ce0e6bac3 Starts fixing up the doc type folders stuff, fixes permissions settings on the trees, adds error messaging for duplicating folders, removes the click handler for folder nodes 2015-11-12 18:59:38 +01:00
Claus Jensen
ce5b6861bb Merge pull request #855 from ryanmcdonough/UKFest-U4-5617 
UKFest-U4-5617 RTE now respects CSS Directory AppSetting.
 2015-11-12 16:35:27 +01:00
Stephan
ef94441d3b Fix ContentTypeServiceTests, due to changes in service/repository 2015-11-12 16:25:50 +01:00
Stephan
c27849a405 Fix ContentTypeRepositoryTest failing mapping tests 2015-11-12 15:33:55 +01:00
Stephan
af0451f8be Fix DataTypeDefinitionRepositoryTest, broken since the repo was changed 2015-11-12 15:33:05 +01:00
Stephan
098d2815e3 Fix ContentRepositoryTest.Can_Perform_Add_With_Default_Template 2015-11-12 15:32:58 +01:00
Stephan
6fd185df2d Replace evil magic number with constant 2015-11-12 15:32:53 +01:00
Stephan
901d55b472 Fix more tests, now that folder browser is gone 2015-11-12 15:32:43 +01:00
Stephan
eee1e9385f Fix DataTypeDefinitionRepositoryTest, now that folder browser is gone 2015-11-12 15:32:35 +01:00
Stephan
3272cd5c4d Fix PropertyValueEditor.ConvertDbToEditor for decimals, use invariant culture 2015-11-12 15:31:18 +01:00
Stephan
1d5602a22c Fix PluginManagerTests, post-6c5e35e 2015-11-12 15:31:09 +01:00
Claus Jensen
fdd0ff2c23 Merge pull request #897 from umbraco/temp-U4-7070 
Fixes: U4-7070 UX - Mediapicker autofocus when creating a folder
 2015-11-12 15:14:19 +01:00
Claus
bade8e42ba Fixes to media picker when creating new folders. 
Changed to ngShow to ensure input field hides when blur event is hit.
Clearing and switching visibility of input field on successful submit.
Fixed up focus directive to use $timeout. The focus event can trigger before the element is rendered by angular so its safer to have a timeout ensure it is done at the end of the digest cycle - using $timeout instead of setTimeout ensures it is handled by angular at the right time.
 2015-11-12 15:12:59 +01:00
Claus
cfdf2768e6 Merge branch 'UKFest-U4-7070' of git://github.com/JJCLane/Umbraco-CMS into JJCLane-UKFest-U4-7070 2015-11-12 14:05:10 +01:00
Claus Jensen
c3ca006f14 Merge pull request #896 from umbraco/temp-U4-3774 
Fixes: U4-3774 Change password UX
 2015-11-12 13:36:36 +01:00
Claus
6c47c8f792 Added danish translation. 2015-11-12 13:36:13 +01:00
Claus
63160e2e2d Removing the Change Password tab from Content section. 2015-11-12 13:31:03 +01:00
Claus
edc58fe8a5 Merge branch 'dev-uk-U4-3774' of git://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-3774 2015-11-12 11:23:36 +01:00
Claus Jensen
23632dc0c3 Merge pull request #856 from tompipe/U7-6928 
Fixes U4-6928 - Persist Creator ID of member
 2015-11-12 11:07:57 +01:00
Claus Jensen
d739b9fb31 Merge pull request #894 from umbraco/temp-U4-6167 
Fixes: U4-6167 MNTP: show path of selected node
 2015-11-12 10:58:24 +01:00
Claus
2ae4ede258 Showing path when hovering nodes should be configurable on the content picker. 2015-11-12 10:55:00 +01:00
Claus
cacd08b57c Merge branch 'tompipe-U4-6167' into temp-U4-6167 2015-11-11 17:21:51 +01:00
Claus
4eddfb4cf5 Merge branch 'U4-6167' of git://github.com/tompipe/Umbraco-CMS into tompipe-U4-6167 2015-11-11 17:13:40 +01:00
Simon Busborg
c26057c925 Fixed link hover state 2015-11-11 13:34:42 +01:00
Simon Busborg
62711406ab Added umb-dashboard-control back to dashboard, removed underlines via less 2015-11-11 13:11:41 +01:00
Claus
f2b3d7c041 Removed commented out line. 2015-11-11 12:07:45 +01:00
Claus
5d97a94dcb Fixed to use alias instead of hardcoded id. 
Added mapper for TaskType.
 2015-11-11 12:02:12 +01:00
Simon Busborg
cd2e810299 Removed "message" on no times in media section 2015-11-11 11:42:02 +01:00
Simon Busborg
55cac7990e Added dropzone upload to listview in media section 2015-11-11 11:42:02 +01:00
Simon Busborg
25db6ed430 More efficient empty state 2015-11-11 11:42:02 +01:00
Simon Busborg
d68a9fae5d UI Polish 
New: UI Polish
Edit: Changed 'Cancel' to 'Clear selection'
Fix: Changed from table to flexbox
 2015-11-11 11:42:02 +01:00