Sebastiaan Janssen
|
56545ad7f1
|
Revert "Merge branch 'v7/dev' into v8/dev"
This reverts commit 7db0440b5c.
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
|
2019-06-18 19:18:48 +02:00 |
|
Sebastiaan Janssen
|
994c6eed50
|
Revert "U4 10147 - Bypass User Security option in pickers (#2441)"
This reverts commit cc9a7ff942.
# Conflicts:
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
|
2019-06-18 13:07:40 +02:00 |
|
Stephan
|
70203512fb
|
Make TypeCollectionBuilderBase fluent
|
2019-04-27 09:07:49 +02:00 |
|
Sebastiaan Janssen
|
eb10d71bff
|
Don't just Parse, the value might be null, have to use TryParse
|
2019-04-17 16:47:23 +02:00 |
|
Sebastiaan Janssen
|
7db0440b5c
|
Merge branch 'v7/dev' into v8/dev
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/UriExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/search.service.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
|
2019-04-17 14:35:59 +02:00 |
|
Stephan
|
7a6884d208
|
Rename mapper stuff
|
2019-04-03 10:39:49 +02:00 |
|
Stephan
|
c5f934930e
|
Merge branch 'v8/dev' into v8/feature/284-auto-mapper
|
2019-04-02 12:03:05 +02:00 |
|
Stephan
|
ef5646fa3b
|
Cleanup, reduce AutoMapper exposure
|
2019-03-27 09:15:31 +01:00 |
|
Stephan
|
b43e113cb6
|
Experiment with mapping (perfs)
|
2019-03-27 09:15:31 +01:00 |
|
Dan White
|
cc9a7ff942
|
U4 10147 - Bypass User Security option in pickers (#2441)
|
2019-03-23 12:51:36 +01:00 |
|
Sebastiaan Janssen
|
ff33e0d969
|
Fix merge mistake
|
2019-03-20 13:22:22 +01:00 |
|
Sebastiaan Janssen
|
559debc079
|
Merge branch 'dev-v7' into dev-v8
# Conflicts:
# src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
|
2019-03-20 13:10:32 +01:00 |
|
Bjarke Berg
|
7d67a734f0
|
Merge pull request #4994 from umbraco/temp-user-controller-authz
Fixes the authorization for certain endpoints on the UsersController
|
2019-03-15 12:27:50 +01:00 |
|
Shannon
|
d74ec8f8cb
|
Authorizes more endpoints for admin/non-admins
|
2019-03-15 12:39:46 +11:00 |
|
Shannon
|
e24b22f6bd
|
Fixes the authorization for certain endpoints by non admins so that data cannot be seen and avatars cannot be changed
|
2019-03-15 12:20:24 +11:00 |
|
Stephan
|
9f7fae2ca6
|
Enable adding api controllers
|
2019-03-05 19:23:57 +01:00 |
|
Shannon Deminick
|
5ddba3e64e
|
Merge pull request #3851 from umbraco/temp-fix-formdatacollection-3796
Fixes binding of FormDataCollection for GET requests which fixes the …
|
2019-03-05 13:39:37 +10:00 |
|
Robert Foster
|
5aa38c1f43
|
Changed all references of umbracoUseSSL to Umbraco.Core.UseHttps to fix issue #4749
|
2019-02-28 16:48:56 +10:00 |
|
Shannon
|
f2ae41ada2
|
Fixes the culturerequest.interceptor so that it works in tests (and so circular deps aren't caused), internalizes ClientCulture and makes it a little less error prone.
|
2019-02-19 01:44:00 +11:00 |
|
Shannon
|
04487557d7
|
Merge branch 'v8-fix-use-client-culture' of https://github.com/kjac/Umbraco-CMS into kjac-v8-fix-use-client-culture
|
2019-02-19 01:05:11 +11:00 |
|
Bjarke Berg
|
a29f7b764f
|
Merge remote-tracking branch 'origin/temp8' into temp8-injection-ihttpcontextaccessor-instead-of-controller
# Conflicts:
# src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
# src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
# src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs
|
2019-02-15 09:48:55 +01:00 |
|
Bjarke Berg
|
1770a0abec
|
Inject IUmbracoContextAccessor instead of UmbracoContext
|
2019-02-14 12:40:45 +01:00 |
|
Stephan
|
abceda7750
|
Kill UmbracoContext.Current
|
2019-02-14 10:39:49 +01:00 |
|
Kenn Jacobsen
|
7045eb196c
|
Use InvariantContains instead of Contains when looking for culture in the querystring
|
2019-02-14 10:14:56 +01:00 |
|
Shannon
|
f814a80ab7
|
Fixes the ContentSaveValidationAttribute since it was capturing a request based object in it's ctor when it's a singleton, moves the OnlyLocalRequestsAttribute to the correct namespace, WebSecurity shouldn't be IDisposable
|
2019-02-14 11:37:27 +11:00 |
|
Kenn Jacobsen
|
0c860e999b
|
Reimplement after merge
|
2019-02-09 18:26:03 +01:00 |
|
Kenn Jacobsen
|
3587a774f3
|
Merge with temp8
|
2019-02-09 18:03:53 +01:00 |
|
Kenn Jacobsen
|
0dd5ba61ab
|
Clean up unused culture attribute
|
2019-02-09 17:48:45 +01:00 |
|
Kenn Jacobsen
|
89a701c865
|
Initial PoC
|
2019-02-09 15:41:30 +01:00 |
|
Shannon
|
33bc979cfc
|
Fixes binding of FormDataCollection for GET requests which fixes the compatibility with the latest WebApi 5.2.7 version (cherry picked from https://github.com/umbraco/Umbraco-CMS/pull/3851), fixes a binding redirect
|
2019-02-06 17:03:23 +11:00 |
|
Shannon
|
bb64141207
|
removes obsolete method
|
2019-02-01 16:35:10 +11:00 |
|
Shannon
|
7b55d2f1b2
|
New IMacroRenderer and ITemplateRenderer and hides underlying logic for these in internal classes. Massively cleans up the macro rendering logic (almost makes sense now), removes unused macro code, injects UmbracoHelper wherever it's needed (not creating manually), fixes UmbracoHelper to have it's services injected, no more empty services, allows setting the AssignedContentItem on the UmbracoHelper and ensures it's lifespan is Transient, updates all corresponding ctors. Fixes macro rendering, ensures the correct culture variation is assigned, and that we can render macros for any given IPublishedContent, not just the one assigned in the request.
|
2019-01-31 15:09:31 +11:00 |
|
Shannon
|
febc788c20
|
Merge remote-tracking branch 'origin/temp8' into temp8-remove-legacy-controls
# Conflicts:
# src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
|
2019-01-30 14:36:40 +11:00 |
|
Stephan
|
5d65ba3147
|
Merge branch 'temp8-fixtree' into temp8
|
2019-01-29 14:59:45 +01:00 |
|
Shannon
|
eef86689c8
|
Removes booting.aspx and creates embedded html pages for booting and failed (if those are ever seen ), renames some classes and namespaces, removes old cdf bundle classes
|
2019-01-29 23:05:59 +11:00 |
|
Stephan
|
c675708388
|
Refactor dashboards
|
2019-01-28 12:38:58 +01:00 |
|
Stephan
|
27ecd795b2
|
Merge branch temp8 into temp8-fixtree
|
2019-01-28 10:19:36 +01:00 |
|
Warren Buckley
|
9f79f1833f
|
Merge remote-tracking branch 'origin/temp8' into temp8-dashboards-collection
# Conflicts:
# src/Umbraco.Web/Services/DashboardService.cs
|
2019-01-28 08:33:52 +00:00 |
|
Chris Houston
|
193e24afd2
|
Fixing all the TODO, FIXME & HACK comments so they all follow the same layout.
|
2019-01-27 11:16:00 +01:00 |
|
Chris Houston
|
0b6ba5aa52
|
Temp8 - Fixing spelling / typos etc in Umbraco.Web (#4148)
|
2019-01-26 16:52:19 +01:00 |
|
Bjarke Berg
|
5f80faa725
|
Review fix suggestions for dashboards.
|
2019-01-25 09:52:18 +01:00 |
|
Stephan
|
585abf2902
|
Cleanup trees
|
2019-01-25 09:49:55 +01:00 |
|
Stephan
|
4067ac7d93
|
Merge branch temp8 into tmp8-fixtree
|
2019-01-24 18:34:25 +01:00 |
|
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 |
|
Stephan
|
e36ca2e957
|
Merge branch temp8 into temp8-fixtree
|
2019-01-22 14:08:14 +01:00 |
|
Stephan
|
ad026e25d7
|
Cleanup trees
|
2019-01-22 13:55:31 +01:00 |
|
Stephan
|
c840895f90
|
Deal with more fixme
|
2019-01-22 09:49:35 +01:00 |
|
Stephan
|
3982732b7d
|
Fix merge + cleanup
|
2019-01-18 15:05:20 +01:00 |
|
Stephan
|
876056f0bb
|
Merge branch temp8 into temp8-appCaches
|
2019-01-18 14:54:08 +01:00 |
|