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

7943 Commits

Author SHA1 Message Date
Warren Buckley
e86b7a5982 Updates name of variant model mappign in list views - to use same logic as the content tree if a variant has not been set - we fallabck to the base/master lanaguage of the node name 2018-09-10 16:20:23 +01:00
Shannon Deminick
fe6b2bb43f Merge pull request #2944 from umbraco/temp8-18-ListViewVariants 
List View - Updates Node Name based on selected Variant
 2018-09-10 18:31:18 +10:00
Warren Buckley
94a6639bc7 Remove unecessary string null check - the culture ext in mapping code will deal with this 2018-09-10 09:29:50 +01:00
Warren Buckley
2fcabdee0a Use ResolutionContext as opposed to an inline AfterMap function with a CustomResolver class 2018-09-10 09:09:24 +01:00
Shannon
09aecddf6f Merge remote-tracking branch 'origin/temp8' into temp8 2018-09-10 11:34:50 +10:00
Shannon
47347ed966 updates wording 2018-09-10 11:32:49 +10:00
Warren Buckley
f368b493de Updates Content Controller - that uses the Mapping AfterMap to allow us to update the Name of the node based on the culturename passed into the WebAPI 2018-09-07 15:02:44 +01:00
Stephan
69e8b11a79 Fix tests 2018-09-07 11:43:57 +02:00
Stephan
04c654c290 Fix merges 2018-09-06 15:59:10 +02:00
Mads Rasmussen
33df7647d2 Merge pull request #2900 from umbraco/temp8-validation-quirks 
v8 validation quirks
 2018-09-06 15:00:05 +02:00
Stephan
d9d51584ea Fix merge 2018-09-06 14:10:26 +02:00
Stephan
bbd8315176 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs 2018-09-06 13:57:34 +02:00
Stephan
612c38654d Merge branch origin/dev-v7 into temp8 2018-09-06 13:07:09 +02:00
Shannon
729177ffef Fixes issue with not showing validation errors in the dialogs when creating content and saving/publishing when the names haven't been filled out, adds unit tests to support. 2018-09-06 20:33:32 +10:00
Shannon
20c0185ddf Adds unit tests for content controller 2018-09-06 17:37:47 +10:00
Shannon
bf666fc6d3 fixes saving invariant content 2018-09-06 15:21:02 +10:00
Shannon
3f4e6dfce8 Gets success notifications showing in the save/publish dialogs 2018-09-04 16:16:11 +10:00
Stephan
34fb19ac76 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs 2018-09-03 17:24:58 +02:00
Shannon
f9657ae04d Gets mixed validation and success messages returning when persisting multiple variants at once. 2018-09-04 01:13:26 +10:00
Shannon
124e1691fc Fixes how culture validation is reported and fixes the problem of validating required langs after we've changed the publish state. 2018-09-03 22:46:24 +10:00
Sebastiaan Janssen
83ce9050e8 Fix U4-10029 Umbraco.ReplaceLineBreaksForHtml should return an IHtmlString #2881 2018-08-31 21:07:56 +02:00
Sebastiaan Janssen
d8cd2c109f Merge branch 'feature/remove-logout-aspx' of https://github.com/imranhaidercogworks/Umbraco-CMS into imranhaidercogworks-feature/remove-logout-aspx 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
 2018-08-31 21:07:32 +02:00
Sebastiaan Janssen
61ce1bcdca Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-08-31 20:21:58 +02:00
Sebastiaan Janssen
9ea9c5d6b7 Don't repeat the code to check for and create a template 2018-08-31 20:20:37 +02:00
Sebastiaan Janssen
fee9bce110 Merge branch 'U4-11589' of https://github.com/mvanhelmont/Umbraco-CMS into mvanhelmont-U4-11589 2018-08-31 20:11:50 +02:00
Sebastiaan Janssen
222720aea4 Merge pull request #2884 from AliSheikhTaheri/temp-u4-8310 
Temp u4 8310 - Fixed can't rename of a document type alias by changing its casing
 2018-08-31 20:06:07 +02:00
Sebastiaan Janssen
075fcdc155 Merge pull request #2881 from skttl/patch-10 
U4-10029 Umbraco.ReplaceLineBreaksForHtml should return an IHtmlString
 2018-08-31 19:42:57 +02:00
Shannon
f359648215 fixes U4-11463 MembershipHelper is not working with basic auth on the initial request 2018-08-30 09:57:16 +02:00
Ali.Taheri
541e546f7b u4-8310 - Added error message to the xml file. 2018-08-29 14:35:20 +01:00
Ali.Taheri
26a8d680d4 u4-8310 - Fixed rename content type with the same alias but with different casing. 2018-08-29 14:28:33 +01:00
Stephan
451b58ee50 Fix for Serilog PR 2018-08-29 11:41:04 +02:00
Stephan
3e183a057e Fix for Serilog PR 2018-08-29 11:37:36 +02:00
Shannon
aed9ad3a66 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
 2018-08-29 12:24:38 +10:00
Shannon
09ee58ddad Removes more refs to umbraco_client, fixes up nuspecs 2018-08-29 10:49:55 +10:00
Marcel van Helmont
ec1a3f0fe8 make sure alias is camelCase format 2018-08-28 22:44:53 +02:00
Marcel van Helmont
8ce200bd16 added toggles to allow creating templates for collection and collection item 2018-08-28 21:32:18 +02:00
Søren Kottal
a6fd377f31 Update UmbracoHelper.cs 2018-08-28 20:21:49 +02:00
Søren Kottal
ba22ac4e83 Update HtmlStringUtilities.cs 2018-08-28 20:18:12 +02:00
Shannon
029eff1f8a Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core. 2018-08-29 01:15:46 +10:00
Stephan
eaacdc0514 Deal with fixmes in IContent IsCultureSomething 2018-08-28 15:11:13 +02:00
Shannon Deminick
a151829b26 Merge pull request #2845 from umbraco/temp8-serilog 
Bye bye Log4Net, Hello Serilog
 2018-08-28 20:31:12 +10:00
Shannon
61c52913dd Fixes MediaCacheRefresher, it wasn't checking if there was an IMedia cache 2018-08-28 16:50:56 +10:00
Stephan
f2090e9fc7 U4-11599 - do not abort inst processing on error 2018-08-27 08:10:39 +02:00
Ben Palmer
b09bf518c6 U4-9237 Validate application parameter when getting application trees (#2315) 2018-08-26 18:12:07 +02:00
Sebastiaan Janssen
49df6e7c9d Merge branch 'U4-8550' of https://github.com/drpeck/Umbraco-CMS into drpeck-U4-8550 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2018-08-26 17:45:34 +02:00
Sebastiaan Janssen
16155ea416 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-08-26 17:25:18 +02:00
Sebastiaan Janssen
342ac7b1b2 Merge branch 'U4-11166' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-11166 2018-08-26 16:52:58 +02:00
Sebastiaan Janssen
f5ac5f20a8 Merge pull request #2869 from Bazmech/temp-U4-11594 
U4-11594 HasFocalPoint in ImageCropDataSet does not return correct value
 2018-08-26 16:44:19 +02:00
Robert
3b4aa66516 Merge branch 'temp8' into temp8-141 2018-08-24 14:43:15 +02:00
Arbie Sarkissian
e4d8fcf019 U4-11506 - Fix Gregorian DateTime.MinValue is out of range for some calendars (like PersianCalendar) (#2821) 2018-08-24 11:15:53 +02:00