swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,346 Commits 73 Branches 219 Tags
4da6788cb8799e927e7a36282e660a0fe2798867
Commit Graph

21858 Commits

Author SHA1 Message Date
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
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 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 f63a9e93b0 Merge remote-tracking branch 'origin/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/zh_tw.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
 2018-10-09 08:53:40 +01:00
Warren Buckley b2bc259bd5 Adds in lang keys 2018-10-08 14:19:52 +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 c306bdea47 Updates umb-tree directive to loop over the uodated WebAPI collection of SectionRootNodes 2018-10-08 13:36:59 +01:00
Warren Buckley b3f4e9da8f JS tweaks needed to deal with a collection of SectionRootNodes returning from the API 2018-10-08 13:36:14 +01:00
Warren Buckley 5a551bd3d6 Changed needed as GetApplicationTrees returns an IEnumerable of SectionRootNodes now 2018-10-08 13:34:11 +01:00
Warren Buckley 6c7c510eb9 Initial WIP of grouping trees for settings section - needs tidying 2018-10-08 13:33:14 +01:00
Warren Buckley 7db13960e9 Adds in GetAllTypes to ApplicationTreeService 2018-10-08 13:32:12 +01:00
Shannon 210102fcdc oops incorrect package version got reverted 2018-10-08 13:10:38 +02:00
elitsa b68b962d6f Removed all keys which are not being referenced anywhere in the code base. 2018-10-08 11:58:22 +02:00
elitsa aa003713e6 Removed files which were added mistakenly discarding merge conflicts. 2018-10-08 11:57:13 +02:00
elitsa 85309e8ce5 Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089 2018-10-08 10:23:53 +02:00
elitsa 4bde59ed66 Translation clean up 2018-10-08 10:13:36 +02:00
elitsa 9ad65e5fa8 Deleting 'Task' related references and implementations 2018-10-08 10:08:04 +02:00
elitsa e2acc8b447 Remove sections icons - not needed anymore 2018-10-08 10:00:52 +02:00
elitsa 8fdee9af85 Update trees.Release.config 2018-10-08 09:58:19 +02: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
Warren Buckley 4ff15fbf04 Updates constants to include nested class in Constants.Trees.Groups for the various settings section subtree groupings - these keys will be used to help group the trees 2018-10-05 13:09:30 +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
Stephan b6679551d4 Fix url provider for variant/invariant urls 2018-10-04 16:16:56 +02:00
Stephan 9106dc9ca9 Fix ModelType and media picker converter for when picking only images 2018-10-04 16:16:56 +02:00
Warren Buckley 811526859c Fix up unit test - Test_Section_Tabs after dahsboards moving around from dev into settings 2018-10-04 13:08:14 +01:00
Warren Buckley d1835d8ea0 Merge pull request #3151 from umbraco/temp8-219-IsolatedContentAppForms 
#219 Isolated content app forms
 2018-10-04 12:53:38 +01:00
Warren Buckley 17cb3604e0 After peer review with Shan & Mads - forgot to remove commented out code but both are happy with this implemtation for first iteration 2018-10-04 12:49:43 +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 8270888780 Merge remote-tracking branch 'origin/temp8' into temp8-219-IsolatedContentAppForms 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
 2018-10-04 10:38:37 +01:00
Warren Buckley e98cd3fe8f WIP - Get the custom content app icon as invalid if my form in my content app contains errors in the form 2018-10-03 16:42:58 +01:00
Stephan 96acc1bd7e Contextualize variations in fallback, too 2018-10-03 16:19:41 +02:00
Stephan ef3099ec58 Expose variation context accessor on Current 2018-10-03 16:16:50 +02:00
Warren Buckley a3217a73d3 we need to NOT have umb-isolate-form or val-form-manager on the umb-editor-sub-view when its core's own content apps 2018-10-03 15:15:43 +01:00
Stephan 1ff92d819d Fix languages list 2018-10-03 16:08:25 +02:00
Warren Buckley 6d604a37b6 WIP with Shan - Removes nested content app form validation error messages & then puts them back 2018-10-03 14:55:15 +01:00
Warren Buckley b2ec2ac592 Update bower to angular 1.7.4 2018-10-03 14:51:04 +01:00
Stephan 2020c680d6 Merge branch temp8 into temp8-11502 2018-10-03 15:08:12 +02:00
Stephan 61a926e7e6 Cleanup npm package[-log].json files 2018-10-03 14:44:08 +02:00
Shannon 651b4a348a gets unpublish working 2018-10-03 14:27:48 +02:00
elitsa f3d1cc29bb Remove file related to old Developer's dashboard. 2018-10-03 14:21:41 +02:00
elitsa 7468c4ab04 Disabling packages section dashboard. 2018-10-03 14:20:46 +02:00
elitsa 83c66730e2 Updating tabs into Settings section. 2018-10-03 14:19:35 +02:00
elitsa 2fca4579e7 Relocate "Redirect URLs" markup and controller into a newly created 'content' folder. 2018-10-03 14:16:06 +02:00