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

245 Commits

Author SHA1 Message Date
Mads Rasmussen
ab00ba8a12 Merge branch 'dev-v7.6' into temp-U4-9352 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-27 10:39:31 +01:00
Warren Buckley
2465eb233e Adds in same workaround as other trees like DataTypes & DocTypes where Folders/Containers set an inline piece of JS that does nothing & returns 2017-01-26 11:32:13 +00:00
Claus
29d86b8675 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-01-19 12:08:23 +01:00
Niels Hartvig
afae06a866 Adds support for icons and encoding of directories for Code files 2017-01-19 10:41:08 +01:00
Niels Hartvig
051af5c48e Wire up the editors and controllers 2017-01-19 09:49:27 +01:00
Niels Hartvig
f75e0cf4ba Updates to PR based on Review 2017-01-10 12:47:00 +01:00
Niels Hartvig
1a9f336a59 Add support for GUIDs in media and content pickers 2017-01-09 14:45:40 +01:00
Mads Rasmussen
f6d8a980a6 Merge branch 'dev-v7' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-11-14 11:04:15 +01:00
Anders Bjerner
a5b0fbb83d Headline in the "Republish entire site" dialog is now translated 2016-11-02 19:51:54 +01:00
Claus
a92aa6ad9a fixed up a comment and some cleanup. 2016-08-10 10:04:47 +02:00
Claus
154e4a19a5 cleaning and formatting. 2016-08-10 10:01:04 +02:00
Claus
0142bc61bc U4-8671 Media Types Missing in 7.4 
renders child nodes in media type tree.
fixed up the context menus returned on nodes so you can create children if not disabled in config.
 2016-08-10 09:56:28 +02:00
Sebastiaan Janssen
1c88117498 U4-8803 Add "Create package" back as a right-click item on the "Created Packages" node 
#U4-8803 Fixed
 2016-08-03 20:17:43 +02:00
Shannon
092abfb56d Gets created packages deletion working, gets the min umb version field working on the created packages UI 2016-06-29 15:31:10 +02:00
Shannon
a8c71e52ec Ensures the min umbraco version is checked when installing packages that have the strict flag set. 2016-06-13 23:35:09 +02:00
Per Ploug
93891a6a71 Make the template tree use the new view for create 2016-06-13 19:03:06 +02:00
Shannon
5a32e1a294 package tree is basically done, got the editor updated to work with the server data to display the initial screen and details 2016-06-12 21:39:29 +02:00
Per Ploug
8a66943f4a Makes template tree load the new angular editor 2016-06-12 18:49:19 +02:00
Shannon
cba91145ee Updates new packages tree, obsoletes old one, have the package UI running for root node and sub nodes only for created packages. 2016-06-12 15:19:42 +02:00
Mads Rasmussen
d77986fb18 open overview html instead of edit html.. add category html and link the two views 2016-05-27 13:11:03 +02:00
Mads Rasmussen
30ac4e94be hacked new packages tree 2016-05-26 13:12:05 +02:00
Claus
4fa6e70e72 Merge pull request #1140 from jamescoxhead/U4-7746 
U4-7746 - use flat icon in partial views tree
 2016-03-15 09:22:18 +01:00
Stephan
dafde545b0 U4-7641 - bugfix + implement for media types 2016-02-25 16:02:04 +01:00
Stephan
610538261e U4-7641 - enable content type copy 2016-02-25 15:26:03 +01:00
James Coxhead
01bcd3b623 Changed partial views icon to icon-article 2016-02-22 16:15:31 +00:00
James Coxhead
64fd95bd22 Updated tree icons for partial views and partial view macros 2016-02-22 16:13:25 +00:00
Shannon
9e931b84db U4-7925 Add dependency injection to Umbraco.Web.Trees.TreeController* 2016-02-10 10:26:09 +01:00
Shannon
54669ee2bc Ensures you cannot move a child doc type, changes the result of GetAvailableCompositions to be a model instead of a tuple, the result also includes the current ancestor list which we can use to disable items in the list, makes these models/methods internal since they'll most likely be changing, 2016-01-13 16:25:35 +01:00
Claus
3676de0fe8 Reverting code to add additional meta data on compositions. 
Added locked compositions to content type object.
Changed UI to use the lockedCompositeContentTypes instead.
 2016-01-11 12:07:36 +01:00
Claus
4db1599bcb Null checks for when using folders. 
Updated tree menu items.
 2016-01-11 12:07:35 +01:00
Claus
5360bcff52 context menu for creating child doctype. 2016-01-11 12:06:37 +01:00
Claus
f1cc32771e Using constants instead of -1. 2016-01-06 10:31:21 +01:00
Claus
e49033a602 Added import document type option to context menu on root node. 2016-01-06 09:44:12 +01:00
Claus
e489cffa3d Removed unused namespaces and cleanup. 2016-01-06 09:26:58 +01:00
Claus
2bdea2ef30 Fixes: U4-7556 Export/import document types isn't available in 7.4 
Added in export to context menu on document types using the legacy dialog.
 2016-01-06 09:23:55 +01:00
Shannon
c6dbb0f7fa reverts member tree order 2015-12-28 10:35:54 +01:00
Sebastiaan Janssen
05c592860d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-11-17 13:43:19 +01:00
Stephan
9654a0aa3a Enable moving system datatypes (but not deleting) in tree 2015-11-13 15:04:14 +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
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
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
Jeffrey Schoemaker
c096ab9e54 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:26:31 +01:00
Jeffrey Schoemaker
ada5a031b4 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:26:06 +01:00
Per Ploug
755853cc50 Sets up trees, menus and dialogs for content type moving 
The actual service apis for moving is not implemented yet, but this is
the scaffold for using it.
 2015-10-15 13:14:13 +02:00
Per Ploug
6c5e35ec2c Fixed: U4-7150 Inconsistent tree aliases 
Changes all translation files and tree classes to have consistent
naming, updates trees.config to these new alias's
 2015-09-28 08:54:00 +02:00
Per Ploug
e4e3c46d15 Remove the culture from tree header localization 2015-09-25 16:29:41 +02:00
Per Ploug
8d57e0cd1d Less hacky way to lookup current user culture 2015-09-24 15:52:44 +02:00