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

23067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
0971aa0ab6 fixes null check on image cropper 2018-04-09 13:35:18 +10:00
Shannon
fb74b1b75f Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11127 2018-04-09 13:25:02 +10:00
Mads Rasmussen
c5f27aeea5 fix language tree sync 2018-04-06 11:14:25 +02:00
Mads Rasmussen
8e0133f8af return selected variants 2018-04-06 10:37:10 +02:00
Shannon
d03a8098da Merge branch 'dev-v8' into temp-U4-11127 2018-04-06 14:52:28 +10:00
Shannon
c760d25479 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 2018-04-06 14:52:02 +10:00
Shannon
8499c01eac Merge remote-tracking branch 'origin/patch-v7' into dev-v7 2018-04-06 14:51:14 +10: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
Shannon
e10698532b Merge branch 'dev-v8' into temp-U4-11127 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
 2018-04-06 13:56:07 +10:00
Shannon
8b88bb68ed must always register install components 2018-04-06 13:54:42 +10:00
Shannon
c90d6be8ab U4-8861 Extract GlobalSettings to an interface and expose on the standard UmbracoConfig.For settings singleton including a bunch of cleanup, getting the installer and steps to be DI 2018-04-06 13:51:54 +10:00
Mads Rasmussen
7a4f7da0d6 a little bit of clean up 2018-04-05 21:10:38 +02: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
Mads Rasmussen
f1c78b45a7 set overlay button state + call temp publish method 2018-04-05 16:11:30 +02:00
Mads Rasmussen
0f32b653a1 Change "Save and publish" label to "Publish" 2018-04-05 16:01:26 +02:00
Mads Rasmussen
875e05b680 add support for setting the overlay submit button state from the controller 2018-04-05 16:00:39 +02:00
Shannon
7442c96be1 removes unused methods 2018-04-05 23:15:51 +10:00
Shannon
990ca51279 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2018-04-05 23:11:24 +10:00
Shannon
262c4afb16 Removes FormsAuthentication cookie format and replaces with standard aspnet identity format, removes a bunch of old obsolete and unused code, fixes the culture setting issue, simplifies the UmbracoBackOfficeIdentity since it no longer needs to be a FormsIdentity and just a straight forward ClaimsIdentity 2018-04-05 23:10:51 +10:00
Mads Rasmussen
7636cd5eb6 add new publish overlay 2018-04-05 14:40:57 +02:00
Mads Rasmussen
54c41dfb23 open publish dialog when clicking the save and publish button 2018-04-05 14:39:57 +02:00
Mads Rasmussen
63315f6162 dont indent first center/target overlays 2018-04-05 14:39:04 +02:00
Mads Rasmussen
a2356ea651 Restyle centered overlay 2018-04-05 14:37:58 +02:00
Mads Rasmussen
892eb56a2d fix backdrop z-index 2018-04-05 14:37:13 +02:00
Mads Rasmussen
d09d50e013 add global overlay component + add simple service for opening and closing 2018-04-05 14:35:47 +02:00
Stephan
eb6a08af31 v7@11d4189c8d 2018-04-05 14:12:15 +02:00
Warren
0dba812053 Merge branch 'patch-v7' into dev-v8 2018-04-05 10:44:34 +01:00
Warren
edb62b740b Merge branch 'patch-v7' into dev-v7 2018-04-05 10:42:41 +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
Shannon
798236dc85 removes unused code, cleans up web.confgi 2018-04-05 18:13:50 +10:00
Shannon
9bfe9e6bbf Ensures that the thread culture is set both in owin and in aspnet 2018-04-05 18:11:15 +10:00
Shannon
11d4189c8d Merge branch 'patch-v7' into dev-v7 2018-04-05 17:28:46 +10:00
Shannon
a62422fac3 ensure that debug is true when developing 2018-04-05 15:09:12 +10:00
Shannon
f32e787816 fixes dashboard.tabs.controller 2018-04-05 15:08:52 +10:00
Stephan
6da91b7770 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2018-04-04 17:43:26 +02:00
Stephan
f7a14a03f2 Fix build, still some weird csc.exe versionning 2018-04-04 17:41:55 +02:00
Stephan
612acfac15 Fix solution 2018-04-04 09:59:01 +02: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
4047fb119d Adds in missing $scope dependency for Dynamic Dashboard Controller 2018-04-04 08:35:58 +01:00
Warren
ebbd05dc97 Adds in missing $scope dependency for Dynamic Dashboard Controller 2018-04-04 08:30:33 +01:00
Warren
bdaa70592f Adds in missing $scope dependency for Dynamic Dashboard Controller 2018-04-04 08:28:41 +01:00
Shannon
6d1e50c44d Merge branch 'dev-v8' into temp-U4-11127 
# Conflicts:
#	src/Umbraco.Web.UI/web.Template.config
 2018-04-04 16:51:00 +10:00
Stephan
683b47bae5 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2018-04-04 08:32:10 +02:00
Stephan
1b804e07e5 Push web.template.config 2018-04-04 08:28:10 +02:00
Shannon
d89009bbe7 Changes targetFramework to 4.7, removes the huge assembly list, removes post build scripts since they don't work 2018-04-04 16:17:57 +10:00
Shannon
e5b0b2bfb7 Merge branch 'dev-v8' into temp-U4-11127 2018-04-04 16:01:23 +10:00
Shannon
471009cfd1 nuspec for examine was incorrect 2018-04-04 16:00:14 +10:00
Shannon
efeef98e55 fixes merge/build 2018-04-04 15:59:02 +10:00