yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,829 Commits 4 Branches 7 Tags
618c50f9da5c03ac46ddced9df1a6ebf3447fce8
Commit Graph

268 Commits

Author SHA1 Message Date
Shannon
a70c9226fc Updates lots of trees for searching and gets results grouped 2017-05-31 12:25:05 +02:00
Shannon
3ae16e717c Merge branch 'dev-v7-pluggable-ISearchableTree' of https://github.com/efabioli/Umbraco-CMS into efabioli-dev-v7-pluggable-ISearchableTree 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
 2017-05-30 00:48:41 +02:00
Shannon
765decf3b1 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
#	src/Umbraco.Web/Trees/PartialViewsTree.cs
 2017-05-17 20:00:29 +10:00
wanddy
ab551b2c96 Fix some menu tree header won't be translated. 
This may be caused by the explicit definition of tree node name.

Signed-off-by: wanddy <wanddy@163.com>
 2017-05-02 14:20:44 +08:00
Emil Wangaa
2a44b73056 Adds support for loading uninitialized trees in the treepicker - is needed for CON-1296 to work 2017-03-28 21:19:12 +02:00
Shannon
d37106576d Adds null checks to the ContentTreeController too 2017-03-23 12:53:48 +11:00
mikkelhm
31d8f49d3b Enables HasAccess on the MediaTreeController to use a udi for checking access 2017-03-22 20:25:15 +01:00
Shannon
2cf68ab263 dont' render files that are invalid (no name) 2017-03-21 18:30:39 +11:00
Stephan
a9c7a7a405 U4-9640 - use IFileSystem 2017-03-20 15:53:34 +01:00
Shannon
9a57f463ce Updates LocalLinks to be UDI, this will support both INT and UDI as LocalLink but when a new LocalLink is picked, it will use the UDI so eventually the INT will be gone 2017-03-14 15:31:30 +11:00
Warren Buckley
e619c402b4 Merge branch 'temp-U4-9310' into dev-v7.6 
# Conflicts:
#	src/Umbraco.Core/UdiEntityType.cs
 2017-02-14 11:53:38 +00:00
Shannon
e612bcae58 Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310 2017-02-10 10:04:58 +11:00
Emil Wangaa
a31cfb86f8 Moved reload to be last menu option and added a separator for delete option to keep consistency 2017-02-08 15:57:53 +01:00
Emil Wangaa
e4802b592f Centralized the tree menu logic for partialviews, partialviewmacros and scripts to the FileSystemTreeController and implemented logic to match what we do for Document Types 2017-02-08 15:43:31 +01:00
Shannon
a20cc60c10 Updates new UDI pickers that have start nodes for pre-values to also store UDIs for their prevalues, this has a knock on effect in that we need to be able to inject some server side config for pre-value editors (otherwise we'd have to make diff udi prevalue editors but that isn't very re-usable), so have implemented that and then updated all of the logic to deal with the udi idType. 2017-02-08 16:15:27 +11:00
Emil Wangaa
c21837e906 Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-9429 
# Conflicts:
#	src/Umbraco.Web/Editors/CodeFileController.cs
 2017-02-02 10:24:42 +01:00
Emil Wangaa
6bf5f4dbdf Fixed up tree menus for scripts, partialviews and partialviewmacros 2017-02-02 09:20:42 +01:00
Claus
06c829eb27 initializing stringbuilder with text instead of appending after init. 
trimming end instead of both beginning and end, since we know whats in the beginning.
 2017-02-01 14:03:03 +01:00
Per Ploug
90448f1c78 Added comments and made helper internal 2017-01-31 11:06:14 +01:00
Emil Wangaa
6bd1a77b96 Simple wiring up of the create menu for partialview, partialviewmacro and script 2017-01-31 10:10:05 +01:00
Per Ploug
b05c4711ce Fixes tree syncing issues 2017-01-30 13:33:05 +01:00
Shannon
a458e7daf0 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-01-30 16:55:12 +11:00
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
Niels Hartvig
205ea22daa Fixes U4-9437 2017-01-25 17:34:34 +01: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