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

18884 Commits

Author SHA1 Message Date
Sebastiaan Janssen
862fdf27e4 Merge pull request #2545 from dawoe/temp-U4-11155 
U4-11155 fixed error when creating member groups
 2018-04-09 08:10:53 +02:00
Shannon Deminick
e25d648f44 Merge pull request #2556 from dawoe/temp-U4-11167 
U4-11167 Fixes rare syncTree error
 2018-04-06 14:46:23 +10:00
leekelleher
7225ec29fe Nested Content - enabled support for property-editors: 
- Umbraco.CheckBoxList
- Umbraco.DropDownMultiple
- Umbraco.MacroContainer
- Umbraco.RadioButtonList
- Umbraco.MultipleTextstring
 2018-04-05 17:17:34 +01: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
Warren Buckley
43e32e66b6 Merge pull request #2550 from dawoe/temp-U4-11161 
U4-11161 fix for adding multiple items in a single content picker
 2018-04-05 10:15:39 +01:00
Dave Woestenborghs
859cb6ce1a U4-11167 removed the time out..only check if the syncTree method exists 2018-04-04 09:44:29 +02:00
Warren
bdaa70592f Adds in missing $scope dependency for Dynamic Dashboard Controller 2018-04-04 08:28:41 +01:00
Dave Woestenborghs
27b19a0a33 U4-11167 only wrap in time out when syncTree method is undefined 2018-04-03 07:37:37 +02:00
Shannon
047a05cfb3 bumps version 2018-04-03 11:38:13 +10:00
Shannon
e77ebc0c1c Fixes all references to assetsService.load* that do not pass in a required scope object and changes assets.service to always use the $rootScope of an explicit scope is not passed 2018-04-03 11:27:53 +10:00
Shannon
a27ea994b7 updates the loadMomentLocaleForCurrentUser to always return a promise 2018-04-03 10:59:55 +10:00
Shannon
e019c94207 changes back to correct version 2018-04-03 10:42:57 +10:00
Dave Woestenborghs
f6263aad5b U4-11167 wrap syncTree method to handle rare occasions where it is not defined yet 2018-03-31 15:09:30 +02:00
Dave Woestenborghs
28a0e30315 U4-11164 fixed blank screen for about 30 seconds after logging in. Because of q.all we don't need to wait until promise is resolved, because all promises are resolved when this is hit 2018-03-30 11:20:41 +02:00
Dave Woestenborghs
d1eb6b1aa8 U4-11161 don't show help text when it's not a multipicker 2018-03-28 17:07:56 +02:00
Dave Woestenborghs
458d023ff4 U4-11161 set min and max number in default config 2018-03-28 17:03:35 +02: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
Claus
7c264b4da0 adding using statement to preview file to prevent missing htmlhelper error. 2018-03-23 11:57:29 +01:00
Claus
716020602d adding using statement to preview file to prevent missing htmlhelper error. 2018-03-23 11:55:23 +01:00
Sebastiaan Janssen
8c0ec489c2 Bump version to 7.11 2018-03-23 09:54:11 +01:00
Sebastiaan Janssen
19e5715a84 Whoops, that was not supposed to say beta 2018-03-22 14:55:02 +01:00
Sebastiaan Janssen
59f9a64e81 Merge branch 'dev-v7' into dev-v7.10 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-03-22 11:27:26 +01:00
Sebastiaan Janssen
4bb75d73dd Bump version to 7.9.3 2018-03-22 10:50:12 +01:00
Shannon Deminick
dd8e43d80a Fixes U4-10472 Cannot upgrade to 7.7+ when using MySql (#2493) 
* Fixes U4-10472 Cannot upgrade to 7.7+ when using MySql

* Fixes dropping the FK for the AddUserGroupTables migration
 2018-03-22 10:35:41 +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
Sebastiaan Janssen
b4a0dadee9 Re-apply the nice C# syntax James provided 2018-03-21 19:53:20 +01:00
Lee Kelleher
014ac98d0b U4-11052 - Enabled IntegerValueConverter to handle Int64 source values (#2500) 
* Enabled IntegerValueConverter to handle `Int64` source values
 2018-03-21 19:08:24 +01: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
97d7e3db84 Forgot add the new namespace 2018-03-21 10:46:42 +01:00
Robert
0d2df4de81 Some cleanup 2018-03-21 10:22:08 +01:00
Shannon
b361cfebb7 updates npm build dependencies 2018-03-21 13:55:01 +11:00
Shannon
ebea5e8170 fixes boolean pre-value editor Html Id 2018-03-21 13:53:54 +11:00
Shannon
995f3f38a3 Fixes upgrade issue with copying the preview.old directory and updates the link to the the correct public one 2018-03-21 12:52:17 +11: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
Sebastiaan Janssen
edf7038848 U4-11020 Deleting a member group that is part of a Public Access feature, from the system, does not also remove the corresponding rows from the umbracoAccessRule table. 2018-03-20 15:00:09 +01:00
Sebastiaan Janssen
79ecaecc9e Merge pull request #2503 from umbraco/temp-U4-11070 
Adds support for *not* closing an overlay on enter
 2018-03-20 11:14:57 +01:00