yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,752 Commits 4 Branches 7 Tags
263ee5c297d13d0e29ed16bd8caeddf7c01cc640
Commit Graph

9331 Commits

Author SHA1 Message Date
Sebastiaan Janssen
263ee5c297 Merge branch 'dev-v7' into dev-v8 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2019-03-20 23:03:18 +01:00
Kenn Jacobsen
99b80e0f56 Ensure that media in RTEs are always rendered with up-to-date sources 2019-03-20 22:46:42 +01:00
Bjarke Berg
13fd177325 Merge remote-tracking branch 'origin/dev-v8' into dev-v8 2019-03-20 13:30:03 +01:00
Bjarke Berg
c589ef1995 https://github.com/umbraco/Umbraco-CMS/issues/5024 - Fixed issue, when using the culture overload of the Children. Now we use ChildrenOfType if alias is set. 2019-03-20 13:29:39 +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
Robert
32c0e02563 Merge pull request #4995 from umbraco/v8/bugfix/4992-nucache-panic 
bugfix nucache panic
 2019-03-20 12:31:09 +01:00
Bjarke Berg
64bc0cf973 Renamed SendingDashboardModelV2 to SendingDashboardSlimModel 2019-03-20 07:35:00 +01:00
Bjarke Berg
44beb81e71 Avoid removing a public method (used by forms 8.0.0) 2019-03-18 09:51:05 +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
Stephan
a6568e1952 NuCache: better fixing, cleanup 2019-03-15 08:22:40 +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
260a8ad874 NuCache: fix panic exception 2019-03-14 19:05:02 +01:00
Stephan
dc3e985fbb NuCache: troubleshooting 2019-03-14 19:05:02 +01:00
Stephan
b7a03f0153 NuCache: reorg some classes 2019-03-14 18:56:28 +01:00
Stephan
66f9ecd8e2 NuCache: rename things 2019-03-14 18:56:27 +01:00
Stephan
541c7e6955 NuCache: cleanup scoped objects 2019-03-14 18:56:27 +01:00
Warren Buckley
edb8340b32 Merge pull request #4364 from umbraco/abjerner-patch-1 
V8: fixed type of dashboards in EditorModelEventManager
 2019-03-14 15:00:34 +00:00
Robert
a3e842a315 Merge pull request #4844 from umbraco/dev-v8-4827-fix-for-image-mediapickervalueconverter 
V8: Fix for MediaPickerValueConverter when config is only images
 2019-03-12 11:59:54 +01:00
Shannon
95d1ceb529 overrides ToString on UrlInfo to return the correct result 2019-03-12 12:47:37 +11:00
Stephan
7e67bbea13 Do not inject IEnumerable but Collection in UmbracoContextFactory 2019-03-11 15:37:07 +01:00
Kenn Jacobsen
9062b400d4 Show the content app for media folders with content properties 2019-03-11 14:57:25 +01:00
Shannon
52beb01110 Removes faulty CustomRouteUrlProvider 2019-03-12 00:46:39 +11:00
Stephan
c85c055424 Upgrade to ModelsBuilder 8.0.2, support Custom Tool (#4881) 
* Upgrade to ModelsBuilder 8.0.2, support Custom Tool

* Upgrade to ModelsBuilder 8.0.3

* Fix controllers

* Upgrade MB

* Fix previous commit
 2019-03-11 23:14:32 +11:00
Shannon
52cea17816 Merge remote-tracking branch 'origin/dev-v8' into temp8-4873-register-api-controllers 2019-03-07 18:32:48 +11:00
Shannon Deminick
22d012c4db Merge pull request #4856 from umbraco/temp8-4775-components-sequence 
Better composer sequence
 2019-03-07 18:04:01 +11:00
Bjarke Berg
b406835c9c Code styling 2019-03-06 10:08:15 +01:00
Stephan
9f7fae2ca6 Enable adding api controllers 2019-03-05 19:23:57 +01:00
Stephan
7a0f11bc6f Fix NuCache url segments 2019-03-05 11:15:30 +01:00
Stephan
b665d4825d Better composer sequence 2019-03-05 08:53:37 +01:00
Stephan
55a374bb71 Introduce WebFinalComponent 2019-03-05 08:53:37 +01:00
Shannon Deminick
b294b83c9f Merge pull request #4753 from mvanhelmont/#4580 
Redirects management is broken #4580
 2019-03-05 16:04:11 +11: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
Stephan
31b293aa4d Fix distributed cache handler for medias (#4751) 2019-03-04 16:39:34 +01:00
Bjarke Berg
a43f8c4cbd Bugfix: https://github.com/umbraco/Umbraco-CMS/issues/4827 - Fixed MediaPickerValueConverter when config is Only Images 2019-03-04 14:31:45 +01:00
Stephan
8961e8b4be Merge pull request #4834 from umbraco/temp-4609-rte-not-rendering-macros-correctly 
Bugfix: Could not render macros in RTE
 2019-03-04 09:29:06 +01:00
Bjarke Berg
ed6d54e64a Bugfix: Don't use ToString :'( 2019-03-04 08:43:19 +01:00
Shannon Deminick
cfc04a9df0 Merge pull request #4799 from robertjf/dev-v8-uduf-4749 
v8 - uduf - Changed all references of umbracoUseSSL to Umbraco.Core.UseHttps to f…
 2019-02-28 18:20:25 +11: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 Deminick
eabc05d6f8 Merge pull request #4796 from skartknet/4790_-_Content_and_media_overloads_for_Udis 
4790 - added Content and Media Udi overloads
 2019-02-28 17:33:05 +11:00
Mario Lopez
093b57505a simplified GuidUdi checking. 2019-02-28 16:50:28 +11:00
Mario Lopez
f227f2ed61 added Content and Media Udi overloads 2019-02-28 13:55:14 +11:00
Shannon
3e9556fead Adds TODO note 2019-02-28 11:01:53 +10:00
Marcel van Helmont
ff708f4ad5 fixed correct destination url instead of #. 2019-02-26 12:17:20 +01:00
Marcel van Helmont
44212f6b53 Revert "the wrong id was used for getting the correct destination url." 
This reverts commit 5d1fccb2c4.
 2019-02-26 12:15:22 +01:00
Marcel van Helmont
5d1fccb2c4 the wrong id was used for getting the correct destination url. 2019-02-26 12:12:18 +01:00
Sebastiaan Janssen
9186b392c9 Merge branch 'dev-v7' into dev-v8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
#	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
 2019-02-25 19:57:18 +01:00
Stephan
aa86dfa956 Bugfix exception during install, live models collision 2019-02-22 19:13:48 +01:00
Stephan
ad62983327 Introduce ILivePublishedModelFactory 2019-02-21 19:15:35 +01:00