Commit Graph

14 Commits

Author SHA1 Message Date
Shannon
e27b873a5a Merge branch 'temp8-remove-package-ascx-3996' into temp8-packages-ui
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
2019-01-09 20:57:02 +11:00
Claus
003d54cacd cleanup usings 2019-01-07 12:59:38 +01:00
Warren Buckley
8425c3124d Modify FileSystemTree Controller - that if * is used for file extension then we will return all files :) 2018-12-05 15:15:45 +00:00
elitsa
2f3483453c Merge remote-tracking branch 'origin/temp8' into temp8-258-empty-trees-arrow 2018-11-04 22:44:20 +01:00
elitsa
4d594e17aa Adding a check to verify if there are any children which will resolve the problem with showing a right-pointing arrow in front of empty trees in the Settings section. 2018-10-31 13:40:23 +01:00
Shannon
77f4f0bbad Refactors how the 'OpensDialog' gets assigned to menu items, fixes permission check on rollback 2018-10-30 00:34:43 +11:00
Shannon
bae9bb6108 Initial cleanup of IActions, menu items, etc... 2018-10-29 17:27:33 +11:00
Shannon
0a5db8f97b Fixes up macros and file trees 2018-05-01 00:35:49 +10:00
Stephan
c2e1ba21b2 Port v7@2aa0dfb2c5 - WIP 2018-03-27 16:18:51 +02:00
Stephan
96c08f24ee Port 7.7 - WIP 2017-09-12 16:22:16 +02:00
Stephan
8561d85f7a porting 7.6-rc1 into 8 2017-05-24 12:25:39 +02:00
Stephan
0597eea72b Resvolution - Components, Runtime & Booting 2016-09-19 16:33:43 +02:00
Shannon
74e1078c31 Merge branch 'U4-8198_file_system' of https://github.com/yannisgu/Umbraco-CMS into yannisgu-U4-8198_file_system
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2016-03-30 16:07:45 +02:00
per ploug
4baf3ed99a Initial commit of the grid 2014-05-09 12:23:59 +02:00