yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,316 Commits 4 Branches 7 Tags
44df0dda2b8bfe26bf2dafc5100381d4d141ecf2
Commit Graph

772 Commits

Author SHA1 Message Date
Dave Woestenborghs
25a90ffbf5 #3419 added extra parameter to createSingleRoot node method so it will always show a single tree. If a single tree doesn't have children it does not show 2018-10-25 08:54:17 +02:00
Dave Woestenborghs
d5cc658811 #3419 added check on tree items count back 2018-10-24 18:28:52 +02:00
Dave Woestenborghs
96c0b701a0 #3419 added always show root item to tree attribute 2018-10-24 18:27:00 +02:00
Shannon
9df4a8091e Merge remote-tracking branch 'origin/temp8' into temp8-231-send-to-publish-with-variants 2018-10-25 01:15:44 +11:00
Shannon Deminick
3652a96687 Merge pull request #3352 from umbraco/temp8-dirty-tracking-on-variants 
v8 - allows audit trail/logging of changed cultures
 2018-10-25 01:11:53 +11:00
Dave Woestenborghs
d23f5f8124 #3419 remove check on number of trees so dictoinary tree shows in the translation section and doesn't return a error when it's moved to the settings section 2018-10-24 15:31:45 +02:00
Shannon
81c7a1de78 Cleans up the notification system, removes coupling on System.Web, simplifies the whole thing, removes old legacy files, adds sort event, moves sort notification to be event based and not part of the controller 2018-10-24 23:55:55 +11:00
Claus
715083ef93 Merge pull request #3398 from umbraco/temp8-258-empty-trees-arrow 
Fixing right-pointing arrow for empty trees.
 2018-10-24 09:47:14 +02:00
Stephan
c0a1e7f2f6 Merge branch temp8 into temp8-dirty-tracking-on-variants 2018-10-23 17:43:52 +02:00
Shannon
ce6b4f4a51 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
 2018-10-23 22:16:48 +11:00
Warren Buckley
2ec6216932 Merge pull request #3400 from umbraco/temp8-247-hostnames-dialog 
Temp8 247 hostnames dialog
 2018-10-23 11:28:08 +01:00
Claus
9438581621 Merge pull request #3240 from umbraco/temp8-sendToPublish 
Send to Publish changes
 2018-10-23 10:54:42 +02:00
Stephan
9699e6cb71 Merge branch 'temp8' into temp8-dirty-tracking-on-variants 2018-10-23 10:51:28 +02:00
elitsa
127ecdf48e Right arrow appears only when there are child nodes. 2018-10-23 09:34:02 +02:00
Shannon
9dadecdcc1 Fixes boolean conversion logic in ColorPickerConfigurationEditor, Fixes tree grouping logic and moves groups cache to the ApplicationTreeService, fix other merge issues 2018-10-23 18:28:55 +11:00
elitsa
c5755e25c8 Revert commit not belonging to this PR. 2018-10-23 09:04:09 +02:00
Warren Buckley
6b7dd261ab Add to the tree metadata (So the UI of the tree node can be aware if it allows variants) 2018-10-22 09:30:39 +01:00
Shannon
c6a67f79ac Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Models/IContentTypeBase.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/buttons.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/modals.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
#	src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
#	src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebServices/SaveFileController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2018-10-22 16:03:01 +11:00
Rasmus John Pedersen
6996a06d64 Only add "Move" action once 2018-10-21 10:34:42 +02:00
elitsa
40424b805b Merge remote-tracking branch 'origin/temp8' into temp8-sendToPublish 2018-10-19 11:40:56 +02:00
Shannon
8dfb0dc35c more send to translate cleanup 2018-10-19 13:25:06 +11:00
Warren Buckley
2e5562c353 Merge branch 'temp8' into temp8-3298-move-rollback 2018-10-17 10:19:42 +01:00
Mads Rasmussen
fd6f9fc83b remove rollback context menu item 2018-10-16 15:11:47 +02:00
Shannon
a100d321f6 Fixes group node route 2018-10-16 18:08:57 +11:00
Shannon
10873c1dfc Cleans up all old tree classes. woohoo! 2018-10-16 17:41:02 +11:00
Shannon
286f7b3279 Gets tree syncing working, updates the GetApplicationTrees to still return a single Root since we require this everywhere for JS, fixes full screen section and makes users a full screen section (and reduces unecessary code), removes code to avoid breaking changes from v7 2018-10-16 16:41:06 +11:00
Shannon
f996653a67 changes logic to Count 2018-10-11 10:35:23 +02:00
Warren Buckley
6dd9bf56be Update logic for checking for groups to be more robust (as we could still have one named group) 2018-10-11 09:23:42 +01:00
Warren Buckley
9572d195b5 Fixes based on Shan's feedback of the PR 
Only does fancy group logic if more than one group - means other sections can be grouped in the future
 2018-10-11 09:16:44 +01:00
Warren Buckley
4da6788cb8 Fix PartialView Tree Controller to display a folder icon as opposed to an article icon for nested folders - looks odd/broken to me otherwise 2018-10-10 16:27:13 +01:00
Warren Buckley
c69590fd21 Move macro tree from Templating up into Settings group 2018-10-10 15:03:14 +01:00
Warren Buckley
5b3db88df9 Fix logic - so that Content Blueprints tree is added to the list of trees (Finding by name/title was not working, so switched to the AdditionalData["treeAlias"] instead 2018-10-10 15:02:50 +01:00
elitsa
6db8f50ce3 Right arrow appears when there are child nodes 2018-10-10 15:13:46 +02:00
Warren Buckley
f1b20ebbb2 Orders the grouped trees by name (which means the custom trees will be last now) 
Displays custom third party group - only if we have items to show in that group
 2018-10-10 12:25:19 +01:00
Warren Buckley
e2d3cbc8eb Decorate other settings trees with the correct grouping 2018-10-10 12:24:00 +01:00
Warren Buckley
3c747a1be6 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
 2018-10-09 13:34:19 +01:00
Warren Buckley
31b616f0ae Merge branch 'temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
 2018-10-09 09:25:00 +01:00
Warren Buckley
be42783616 Remove dupe code & order by descending (still need to specify own sort order) 2018-10-08 14:10:11 +01:00
Warren Buckley
6c7c510eb9 Initial WIP of grouping trees for settings section - needs tidying 2018-10-08 13:33:14 +01:00
Shannon
b48202197f Merge remote-tracking branch 'origin/temp8' into temp8-I3089 
# Conflicts:
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
 2018-10-08 09:54:12 +02:00
Warren Buckley
2612f33283 Update trees using [CoreTree] attribute to use new property from our constants 2018-10-05 13:11:38 +01:00
Warren Buckley
e013545cfc Adds property to [CoreTree] attribute that allows you to set the TreeGroup key - which will be from our constants 2018-10-05 13:10:31 +01:00
elitsa
99257f2245 Updated the sortOrder also in the respective controllers, as well as updating to the new standards of string interpolation in those controllers. 2018-10-05 11:51:34 +02:00
elitsa
373dfde730 don't show down arrow when no doc types 2018-10-05 11:28:43 +02:00
elitsa
0cc5a01069 packages section is there with translations sections and correct trees 2018-10-05 11:09:33 +02:00
Warren Buckley
0dcbc9f303 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2018-10-04 15:15:20 +01:00
Warren Buckley
5bc2954650 Merge pull request #3109 from umbraco/update-dashboards 
Merge dashboards from Developer to Settings section
 2018-10-04 11:56:14 +01:00
Warren Buckley
45b5cb0257 Move the tree from developer section to settings section - as we say goodbye to the developer section 2018-10-03 17:43:42 +01:00
Warren Buckley
cb166526dc Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2018-10-03 16:49:37 +01:00
elitsa
f2825a6308 Adding back wrongly deleted code. 2018-10-03 14:12:18 +02:00