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

6823 Commits

Author SHA1 Message Date
Marc Goodson
0eceb3c7fc U4-11369 - Add list of content types where a composition content type is used to compositions dialog (#2668) 2018-06-06 22:35:10 +02:00
Sebastiaan Janssen
d8ba0d352e Merge pull request #2633 from maarten-kieft/dev-v7 
Make base AnchestorOrSelf public
 2018-06-06 09:58:55 +02:00
Claus
ccc8868f68 fixes U4-11338 Language dropdown fails when invalid cultures are present 2018-06-01 13:06:13 +02:00
Maarten Kieft
8e7630cd9c Make Base AnchestorOrSelf function public 
By making this function public, developers can use it to iterate over the tree on different property / function than the ones which are created. It makes umbraco easier to extend. Now we have to copy existing code in order to do this.
 2018-05-17 12:09:15 +02:00
Dan Booth
9a8f71dd81 Fixed issue where TypedMedia didn't work with UDI strings 2018-05-11 14:53:03 +01:00
Shannon
1a99d0e4d0 Merge remote-tracking branch 'origin/patch-v7' into dev-v7 2018-04-30 15:27:27 +10:00
Shannon Deminick
da0fe5e5a3 Merge pull request #2602 from ProNotion/issues/U4-8516 
Fixes U4-8516 Copied node now sets the current user as the creator of the new node.
 2018-04-30 15:25:07 +10:00
Simon Dingley
dbad0d261e Fixes U4-8516 Copied node now sets the current user as the creator of the new node. 2018-04-27 16:18:25 +01:00
Sebastiaan Janssen
bfca8c555e Removes Package repository config setting and related unnecessary code 2018-04-19 19:12:42 +02:00
Robert
9384cd0f27 Merge pull request #2574 from umbraco/temp-U4-11195 
fixes U4-11195 Mapping complex properties slow down some queries
 2018-04-19 12:22:12 +02:00
Robert
0262b4aa76 Changed ContentPropertyDto modifier back to override which rendered content with tags unable to be saved 2018-04-19 12:10:39 +02:00
Sebastiaan Janssen
96761efe4d Merge branch 'patch-v7' into dev-v7 2018-04-19 09:55:16 +02:00
Shannon
75fb070825 U4-11246 When user belongs to groups and none of them have browse access and one or more have a custom start node applied a YSOD occurs 2018-04-19 16:20:18 +10:00
Sebastiaan Janssen
694f3d71e2 Merge branch 'patch-v7' into dev-v7 2018-04-18 16:05:15 +02:00
Robert
15eb40aedb Removed code that populates content tree with duplicate start nodes. 2018-04-18 16:01:01 +02:00
Dave Woestenborghs
21a8395142 U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593) 
U4-11216 set min and max number when used as parameter editor

(cherry picked from commit f25233ac2b)
 2018-04-18 10:22:09 +02:00
Dave Woestenborghs
f25233ac2b U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593) 
U4-11216 set min and max number when used as parameter editor
 2018-04-18 10:21:12 +02:00
Sebastiaan Janssen
61cd59b237 Merge branch 'patch-v7' into dev-v7 2018-04-17 15:47:41 +02:00
Sebastiaan Janssen
d63061fade Merge pull request #2564 from leekelleher/U4-11184 
U4-11184 - Nested Content PropertyValueEditor - return converted value, not update reference value
 2018-04-17 15:33:14 +02:00
Claus
0c191a3ef7 updating to use includeProperties, fixing modifier keywords for methods, and passing includeProperties from list views. 2018-04-17 08:36:36 +02:00
Sebastiaan Janssen
1594adf3ed Makes code a bit more readable and uses ToList instead of ToArray 2018-04-15 22:38:09 +02:00
Sebastiaan Janssen
23fcb38d69 Merge branch 'temp-U4-11150' of https://github.com/dawoe/Umbraco-CMS into dawoe-temp-U4-11150 2018-04-15 22:15:36 +02:00
Bjarne Fyrstenborg
588f5a3789 Fix some wrong descriptions 2018-04-15 21:41:23 +02:00
Sebastiaan Janssen
29d9dcffb8 Manually applying PR: Three new healthchecks #1522 2018-04-12 18:38:00 +02:00
Sebastiaan Janssen
30f8885aa9 Merge branch 'u4-9983' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9983 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
#	src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
 2018-04-12 17:59:11 +02:00
Sebastiaan Janssen
5003a55aca Cherry picked - Fix scope leaks caused by database messenger [U4-11207] #2580 2018-04-12 16:32:34 +02:00
Claus
d9b1598fa2 use scope when writing instructions. 2018-04-12 14:26:47 +02:00
Stephan
4a47c5e129 U4-11207 - fix scope leaks caused by database messenger 2018-04-12 11:13:00 +02:00
Claus
5380b62504 fixes U4-11195 Mapping complex properties slow down some queries 2018-04-09 15:43:17 +02:00
Sebastiaan Janssen
f003c3602c Merge pull request #2545 from dawoe/temp-U4-11155 
U4-11155 fixed error when creating member groups
 2018-04-09 08:28:03 +02:00
leekelleher
cf1069e0e1 NestedContentPropertyEditor - code tidy-up 
A little tidy-up of these class method. I noticed we were calling `ToString()` twice in places,
and the `ConfigureForDisplay` prevalues are already available as a Dictionary, so there's no need for an additional `ToDictionary` allocation.
 2018-04-05 17:16:34 +01:00
leekelleher
99ce88228c U4-11184 - Nested Content PropertyValueEditor - return converted value, not update reference value 
ConvertDbToString

We were updating the `property.Value` reference, which was having adverse effects on the editor value.
In the majority of cases this wasn't an issue, but it did mean that any prevalue-ID-based editors (e.g. dropdown list) had problems.

I've removed the call to the base method, we don't need it - here's what it does...
https://github.com/umbraco/Umbraco-CMS/blob/release-7.4.0/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs#L367

It attempts to convert the value to an XML-safe string, which is ultimately `ToString()` (if not null):
https://github.com/umbraco/Umbraco-CMS/blob/release-7.4.0/src/Umbraco.Core/ObjectExtensions.cs#L544

ConvertDbToEditor

Same as ConvertDbToString, we were updating the `property.Value` reference when we shouldn't be.
We should be returning the converted value, not updating the original reference value itself.

I've removed the call to the base method, we don't need it - it attempts to deserialize the JSON string that we've literally just serialized...
https://github.com/umbraco/Umbraco-CMS/blob/release-7.4.0/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs#L283

So we can pass the List<object> value back, as this will be handled by Umbraco and handed by Angular.
 2018-04-05 17:14:15 +01:00
Dave Woestenborghs
cf871196f2 U4-11155 changed namespace back to previous value so creating member groups works again 2018-03-27 16:11:07 +02:00
Dave Woestenborghs
36d6b6a254 U4-11150 merged where statements in to one statement 2018-03-27 14:22:51 +02:00
Dave Woestenborghs
29bb86ea13 Filter tours based on current users culture 2018-03-23 16:37:13 +01:00
Dave Woestenborghs
fa171e4553 Added culture property to Backoffice tour 2018-03-23 15:33:42 +01:00
Shannon
c4e5ab54d2 redirects preview to login when not authorized 2018-03-22 19:55:55 +11:00
Shannon
53bfec8a04 Merge branch 'dev-v7' into dev-v7.10 2018-03-22 19:22:34 +11:00
Robert
35a79a8598 Merge pull request #2525 from umbraco/temp-U4-11020 
U4-11020 Deleting a member group that is part of a Public Access feat…
 2018-03-21 13:47:02 +01:00
Robert
3c4f052a27 Moved some code around based on feedback 2018-03-21 13:45:44 +01:00
Robert
0d2df4de81 Some cleanup 2018-03-21 10:22:08 +01:00
Shannon
2ad79956d9 Re-apply Drop Down Flexible "Merge pull request #2502 from umbraco/temp-U4-11032"" 2018-03-21 12:37:26 +11:00
Shannon
96c6a17d03 Merge branch 'dev-v7' into dev-v7.10 2018-03-21 12:36:55 +11:00
Shannon
e2e0dd0c73 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-03-21 12:34:15 +11:00
Shannon
1a590664e7 Revert "Merge pull request #2502 from umbraco/temp-U4-11032" 
This reverts commit 2aa0dfb2c5, reversing
changes made to 2c6e7e46c2.
 2018-03-21 12:32:27 +11:00
Shannon Deminick
64fd6ee7c5 Merge pull request #2477 from Shazwazza/U4-10992 
U4-10992 (UDUF) TourController Object reference not set to an instance of an…
 2018-03-21 12:24:50 +11:00
Shannon Deminick
2ed5b6c1ee Merge pull request #2436 from umbraco/temp-U4-10957_2 
U4-10957 If RequiredSection is not defined in a tour - backoffice wil…
 2018-03-21 12:24:10 +11:00
Shannon
b46add81f0 Merge branch 'dev-v7.10' into temp-u4-10756 2018-03-21 11:39:28 +11:00
Shannon
ff31cd9f72 Changes Set to Populate, changes Fetch to Query and makes GetById public 2018-03-21 11:31:30 +11:00
Shannon
084af43dab Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10 2018-03-21 10:20:20 +11:00