yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,276 Commits 4 Branches 7 Tags
4edf7fdf830a77e69f96b3453d8771f8e29679b6
Commit Graph

11112 Commits

Author SHA1 Message Date
Shannon
4edf7fdf83 Ensure all back office controllers are plugin controllers and use constant 2020-08-04 12:27:21 +10:00
Bjarke Berg
b1fc81b642 Merge fix 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 14:06:21 +02:00
Bjarke Berg
f3614d51fa Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/UmbracoAuthorizeFilter.cs
 2020-07-07 13:17:08 +02:00
Bjarke Berg
610bbee245 Added OverrideAuthorizationAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 12:39:24 +02:00
Bjarke Berg
adb38dceb5 Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-28 14:00:26 +02:00
Bjarke Berg
3d65cb96e1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
 2020-06-28 13:59:33 +02:00
Bjarke Berg
9d639a64b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Templates/IUmbracoComponentRenderer.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 13:35:25 +02:00
Bjarke Berg
2ffb01530a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Compose/AuditEventsComponent.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 12:48:19 +02:00
Bjarke Berg
e14a81c72d Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-25 11:47:12 +02:00
Bjarke Berg
ba38055ee9 Merge branch 'netcore/dev' into bug/use-sql-main-dom-lock-when-linux 2020-06-25 11:39:11 +02:00
Bjarke Berg
f9d5acee84 Added test 2020-06-25 11:22:59 +02:00
Bjarke Berg
aaccaef6af Started on AutoMoqDataAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-24 22:00:27 +02:00
Shannon Deminick
ee7d62e583 Fixes #7148 - ensures we only check for SurfaceController routes (#8322) 
* See https://github.com/umbraco/Umbraco-CMS/issues/7148 for bug report and reason for fork and PR.

* Fixes #7148 - ensures we only check for SurfaceController routes

When finding the SurfaceController to post back to when using BeginUmbracoForm we weren't specifically checking for only SurfaceControllers routes since we just assumed it would be a SurfaceController route. This is problematic if using a SurfaceController simultaneously as an IRenderController with a custom front-end route since it will fail to find that controller to post back to. This is fixed by further filtering the controllers looked up to only include SurfaceControllers.

Co-authored-by: Colin Wiseman <sayhi@codeitwise.co.uk>
 2020-06-24 10:22:10 +02:00
Sebastiaan Janssen
fee6ef0fb0 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
 2020-06-24 09:05:22 +02:00
Bjarke Berg
540195c597 Cleanup and fixed more tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 15:01:55 +02:00
Bjarke Berg
0714fc4734 Migrated some of the UserControllerTests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 14:11:01 +02:00
Bjarke Berg
1594a84d80 migated remaining backoffice controllers 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 10:08:08 +02:00
patrickdemooij9
591575b47d Added content apps for document types (#8187) 
* Added content apps for document types

* PR Feedback updates

* Updated the javascript code to use Utilities

* Replace tolowercase comparison with localeCompare
 2020-06-19 18:10:16 +01:00
Ronald Barendse
0886ada39c Properly HTML encode text in helper methods (#6545) 2020-06-19 11:41:16 +02:00
Bjarke Berg
558c0b03ee Migrated MemberController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-18 21:03:11 +02:00
Bjarke Berg
73123704cd Added JsonDateTimeFormatAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-18 19:40:13 +02:00
Thomas Andresen
a9bd2ae856 Merge pull request #8266 from umbraco/v8/bugfix/macro-rte-render-fix 
Allows unpublished content to render a macro HTML in the RTE
 2020-06-17 15:59:50 +02:00
Bjarke Berg
a6b23fbfa0 Entity controller migrated 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 13:07:49 +02:00
Sebastiaan Janssen
567d7176a5 Importing a doctype would never assign a value to UploadedFiles, turns out we don't need UploadedFiles on the model 
Additionally added a check to see if temp files were left behind and delete them to prevent errors when the same file has just been uploaded
 2020-06-15 11:05:40 +02:00
Bjarke Berg
834a8173d0 Migrated Media controller + ContentTypeControllerBase + ContentTypeController, MediaTypeController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 22:13:43 +02:00
Bjarke Berg
52bc003c8e Migrated more stuff for MediaController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 15:58:53 +02:00
Bjarke Berg
989c83b452 Merge remote-tracking branch 'origin/netcore/feature/migrate-remaining-trees' into netcore/feature/contentcontroller_and_related 2020-06-12 10:03:37 +02:00
Bjarke Berg
609c1ffc5b Migrated content controller + related 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 08:27:22 +02:00
Bjarke Berg
e8c0a08ea8 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-11 15:21:51 +02:00
Bjarke Berg
16038e4232 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/get-remaining-seconds 2020-06-11 13:48:20 +02:00
Bjarke Berg
c2b2b5010d Review + build fix 2020-06-11 13:04:01 +02:00
Bjarke Berg
27fee12230 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-11 12:40:17 +02:00
Bjarke Berg
f86d8185bf Clean up and based on review comments 2020-06-11 11:21:07 +02:00
Bjarke Berg
57b8ab201d Clean up and fixed second ctor in PhysicalFileSystem 2020-06-11 11:07:21 +02:00
Bjarke Berg
aa7637129c Fix tests by reintroducing some files in Umbraco.Web 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:23:56 +02:00
Bjarke Berg
835b04273f Migrated remaining *TreeController's 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:22:25 +02:00
Warren Buckley
3680f22321 Allows unpublished content to render a macro HTML in the RTE 2020-06-10 14:33:32 +01:00
Bjarke Berg
96fee753b4 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/macros 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web.BackOffice/Extensions/UmbracoBackOfficeServiceCollectionExtensions.cs
 2020-06-10 12:17:37 +02:00
Bjarke Berg
9f17049582 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/websecurity 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
 2020-06-10 11:13:32 +02:00
Bjarke Berg
9aea7039d2 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/macros 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
 2020-06-10 10:55:56 +02:00
Warren Buckley
e82f504658 Adds skipStepIfVisible property to JSON Tour Steps to allow skipping if DOM item is present (#8235) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2020-06-09 08:55:06 +02:00
Shannon
246e28d147 Implements PostLogout and ensures all appropriate cookies are cleared on logout along with ensuring that the ticket is renewed each user seconds request if configured to stay logged in. 2020-06-09 14:36:36 +10:00
Shannon
433a7c8908 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/get-remaining-seconds 
# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
 2020-06-09 10:41:57 +10:00
Bjarke Berg
af382e5e71 Migrated section controller + LanguageTreeController, ApplciationTreeController. 
Updated AngularJsonOnlyConfigurationAttribute to be a TypeFilterAttribute, to allow injeciton into the filter.

Note: Left TODO about checking authorization of proxied trees..
 2020-06-08 13:14:23 +02:00
Andy Butland
458de2b0be Migrated tree related classes to .NET core 2020-06-07 09:34:32 +02:00
Bjarke Berg
1029f4fe0b Fix for filesystems. Now rooted at the content root and not the www root 2020-06-05 11:36:59 +02:00
Bjarke Berg
354225452a Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-05 08:14:23 +02:00
Bjarke Berg
58d7fc1817 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
 2020-06-05 08:05:50 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Bjarke Berg
772041bb8f Migrated MacrosController.cs 2020-06-05 06:17:54 +02:00