yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,516 Commits 4 Branches 7 Tags
01de2eb266f4f877e492905f4eddfd0637c936b5
Commit Graph

693 Commits

Author SHA1 Message Date
Sebastiaan Janssen
d380f75d31 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
 2019-01-22 22:46:15 +01:00
Kenn Jacobsen
a8d5bd6d1f Don't let the users empty the recycle bin without delete permissions (#3699) 2019-01-22 22:05:12 +01:00
Warren Buckley
62617537fa Change icon from scary bug to box-alt 2019-01-22 10:05:14 +00:00
Bjarke Berg
70010bc344 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
 2019-01-22 10:19:43 +01:00
Stephan
c840895f90 Deal with more fixme 2019-01-22 09:49:35 +01:00
Bjarke Berg
2c86e87917 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-22 08:23:07 +01:00
Warren Buckley
8ab5142357 Moves tree into Settings group as opposed to third party trees & positions last 2019-01-21 16:36:00 +00:00
Stephan
358a36dd87 Merge branch temp8 into temp8-3668-query-builder-snippits 2019-01-21 16:07:20 +01:00
Warren Buckley
f6154a38d9 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Web.UI.Client/gulpfile.js
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
 2019-01-21 11:17:14 +00:00
Bjarke Berg
a32c8b3a68 Merge pull request #4167 from umbraco/temp8-3417-macro-crud 
Macro delete stuff
 2019-01-21 11:36:10 +01:00
Niels Lyngsø
82d6af2013 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 
# Conflicts:
#	src/Umbraco.Web/Trees/ApplicationTreeController.cs
 2019-01-21 11:13:08 +01:00
Stephan
d4664fbae6 Merge branch 'temp8' into temp8-3668-query-builder-snippits 2019-01-21 10:50:40 +01:00
Bjarke Berg
252d31a5f5 Delete macros 2019-01-21 10:44:11 +01:00
Bjarke Berg
566895d3cd Merge branch 'temp8' into temp8-3417-macro-crud 2019-01-21 09:14:40 +01:00
Stephan
3982732b7d Fix merge + cleanup 2019-01-18 15:05:20 +01:00
Stephan
6f9a63d035 Merge branch 'temp8' into temp8-packaging-view-3996 2019-01-18 11:04:28 +01:00
Stephan
07238b54e1 Merge branch 'temp8-tree-sections-no-more-xml' into temp8 2019-01-18 10:59:04 +01:00
Stephan
437385fd61 Bit of cleanup 2019-01-18 10:53:51 +01:00
Callum Whyte
cee1171d39 Removing masterpages support from V8 (#3971) 2019-01-18 10:53:38 +01:00
Stephan
a7a3fca8a8 Merge branch 'temp8' into temp8-tree-sections-no-more-xml 2019-01-18 09:23:55 +01:00
Bjarke Berg
59fe603ef7 Merge remote-tracking branch 'origin/temp8' into temp8-3668-query-builder-snippits 
# Conflicts:
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2019-01-18 08:34:14 +01:00
Bjarke Berg
0daca21b51 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 2019-01-18 08:31:54 +01:00
Chris Houston
941ede776b Corrected all the miss spellings of: 
Seperator -> Separator
Seperate -> Separate
 2019-01-17 13:16:43 +01:00
Sebastiaan Janssen
effed9efa7 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-17 12:08:27 +01:00
Sebastiaan Janssen
e6a99c5097 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
#	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
#	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
 2019-01-17 12:05:56 +01:00
Shannon
1667e914cd Allows the tree collection to be manipulated by devs on startup, renames some things 2019-01-17 18:38:55 +11:00
Shannon
356209e013 renames ApplicationTree to just Tree 2019-01-17 17:33:38 +11:00
Shannon
1a734141f1 Allows package manifest to declare a section 2019-01-17 17:31:29 +11:00
Shannon
0160f141f4 cleanup and explicitly registering sections 2019-01-17 17:04:53 +11:00
Shannon
cfe1b17eec Gets trees and sections loading now in a much more simplified way without any xml, now to cleanup 2019-01-17 16:40:11 +11:00
Shannon
355ac09d90 WIP - moved out the tree and section service from Core, these are web only things, removes their xml parsing, fixes base controller ctor params with UmbracoContext, need to implement tree/section collections taking into account controllers and not scanning so much 2019-01-17 13:20:19 +11:00
Bjarke Berg
00158b42e7 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/media/restore.html
 2019-01-16 11:47:13 +01:00
Shannon
31545db91e Fixes routing with the packages section 2019-01-16 19:29:42 +11:00
Bjarke Berg
aaedfe0309 Added access to the dictionary tree with we have access to the templates tree. 2019-01-14 08:14:10 +01:00
Kenn Jacobsen
fbf60fbac4 Don't add the "Notification" tree menu item if Umbraco can't send emails 2019-01-14 08:13:10 +01:00
Warren Buckley
6d808cb121 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-09 10:46:44 +00:00
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
Shannon
b3414166a6 webforms and legacy file cleanup 2019-01-09 20:43:46 +11:00
Shannon
4b58e34220 Align namespaces with _Legacy folder 
# Conflicts:
#	src/Umbraco.Web/_Legacy/Packager/PackageInstance/InstalledPackage.cs
 2019-01-09 19:08:09 +11:00
Stephan
436fa261f5 Merge remote-tracking branch 'origin/temp8' into temp8 2019-01-07 19:42:33 +01:00
Stephan
19ae9f5dee Refactor configuration for DI 2019-01-07 19:40:07 +01:00
Claus
003d54cacd cleanup usings 2019-01-07 12:59:38 +01:00
Warren Buckley
9ce35d25d2 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
 2019-01-07 09:59:15 +00:00
Dave Woestenborghs
edd2adc8a0 #3417 changed path of macro tree item to use angular view instead of webform 2019-01-07 08:31:06 +01:00
Dave Woestenborghs
d50061b4af Merge branch 'temp8' into temp-3417 2019-01-04 10:50:56 +01:00
Warren Buckley
baa37549fb Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-03 13:52:14 +00:00
Stephan
ceab758100 Merge branch 'temp8' into temp8-di2690 2019-01-02 16:44:35 +01:00
Claus
fb9d5a3c5d Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into kjac-v8-feature-angular-public-access 2019-01-02 11:58:24 +01:00
Warren Buckley
4651325d77 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
 2019-01-01 19:08:59 +00:00
Stephan
a60fd1b7be Merge branch origin/temp8 into temp8-di2690 2018-12-21 15:47:08 +01:00