yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,003 Commits 4 Branches 7 Tags
8920e10a94607ce0c155ac13f502732d2e7bdf42
Commit Graph

30003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ronald Barendse
8920e10a94 Removed usage of obsoleted DuplicateKeyException 2019-10-06 11:55:02 +02:00
Ronald Barendse
604919495d Removed usage of obsoleted EntityNotFoundException 2019-10-06 11:55:02 +02:00
Ronald Barendse
6350c8c05b Removed usage of obsoleted WontImplementException 2019-10-06 11:55:02 +02:00
Ronald Barendse
af1615bbb7 Removed usage of obsoleted FileSecurityException 2019-10-06 11:55:02 +02:00
Ronald Barendse
dc5cdfd3d1 Obsoleted exceptions that shouldn't be used anymore or be refactored 2019-10-06 11:54:53 +02:00
Ronald Barendse
77df15eeaa Added remarks about property serialization 2019-10-04 00:46:26 +02:00
Ronald Barendse
fade67bdb4 Updated exceptions with SerializableAttribute and constructor 2019-10-04 00:46:02 +02:00
Shannon
6fe3089207 Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
#	src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
 2019-07-17 22:31:54 +10:00
Shannon
26d4d056be bumps version 2019-07-17 22:28:06 +10:00
Shannon
6ad28f1103 Merge remote-tracking branch 'origin/v7/7.15' into v8/8.1 
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Services/EntityService.cs
#	src/Umbraco.Core/Services/IEntityService.cs
#	src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
#	src/Umbraco.Web/Controllers/UmbProfileController.cs
#	src/Umbraco.Web/Controllers/UmbRegisterController.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
#	src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebBootManager.cs
 2019-07-17 21:58:33 +10:00
Shannon
bfb69a34ef re-adds back in the serialization overloads for the custom exception, re-adds detailed error messages, adds more documentation. Adds unit tests. 2019-07-17 21:15:18 +10:00
Shannon
b675f6252c removes files (should have been part of cherry pick?), fixes logic 2019-07-16 23:07:31 +10:00
Shannon
d52420183e Cherry picks ValidateUmbracoFormRouteStringAttribute implementation and fixes up some logic 2019-07-16 23:03:26 +10:00
Shannon
0cbe0b4796 Cherry picks ValidateUmbracoFormRouteStringAttribute implementation 2019-07-16 22:34:34 +10:00
Shannon Deminick
06b136fdf6 Merge pull request #5895 from ronaldbarendse/v8/feature/validate-umbracoformroutestring 
Added attribute to validate Umbraco form route strings (ufprt)
 2019-07-16 22:01:32 +10:00
Bjarke Berg
c6246b5404 Merge remote-tracking branch 'origin/v8/dev' into v8/dev 2019-07-16 13:46:07 +02:00
Bjarke Berg
3062f40ef5 Missing file in project file 2019-07-16 13:43:10 +02:00
Bjarke Berg
dcd0d38419 Merge remote-tracking branch 'origin/v8/8.1' into v8/dev 2019-07-16 13:41:30 +02:00
Steve Megson
0feb053e51 Fixes #5852 - TablesForScheduledPublishing 2019-07-16 13:39:09 +02:00
Bjarke Berg
c01a8f8f13 Merge pull request #5887 from stevemegson/temp-content-migration 
PR fixes 7 -> 8 migration bugs for #5852 and #5864
 2019-07-16 13:37:08 +02:00
Bjarke Berg
09c8ae4e7e Fixed null ref exception in related links migrations 2019-07-16 13:36:16 +02:00
Shannon Deminick
f6413af3f4 Merge pull request #5885 from hifi-phil/v8/dev 
Change PropertyType.Alias to virtual
 2019-07-16 20:31:58 +10:00
skttl
2aaca865e7 changes innerjoin to left join, to allow folders in sql query 2019-07-16 07:26:26 +02:00
Shannon
77dda5a70f Fixes issue during upgrade where umbraco can't clear cdf log files 2019-07-15 14:34:32 +02:00
Bjarke Berg
440e649d6d Merge pull request #5861 from umbraco/v8/bugfix/cdf-upgrade-bug 
Fixes issue during upgrade where umbraco can't clear cdf log files
 2019-07-15 14:32:19 +02:00
Warren Buckley
47dcd37d1d Merge pull request #5784 from nathanwoulfe/5768-log-viewer-chart-naming 
V8: Make log naming and colors consistent between Log Search and Log Overview
 2019-07-15 11:47:20 +01:00
Ronald Barendse
b0c4042e87 Removed UmbracoAntiForgeryAdditionalDataProvider 2019-07-15 10:16:09 +02:00
Shannon
da525513a3 Merge remote-tracking branch 'origin/v7/dev' into v8/dev 
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/UmbracoHelper.cs
 2019-07-15 16:18:04 +10:00
Shannon Deminick
2ac5e61e44 Merge pull request #5881 from bjarnef/dev-v7-link-picker-url-anchors 
v7: Fix link picker url and anchors
 2019-07-15 13:02:47 +10:00
Ronald Barendse
101a8b6c78 Added ValidateUmbracoFormRouteStringAttribute to public controllers 2019-07-14 23:18:21 +02:00
Ronald Barendse
f7a10e3a15 Added attribute to validate Umbraco form route strings (ufprt) 2019-07-14 23:18:06 +02:00
Steve Megson
4e0dd728a8 Fixes #5864 - migrate prevalues for Umbraco.DropDown.Flexible 2019-07-14 16:48:33 +01:00
Steve Megson
320ccf8105 Fixes #5852 - TablesForScheduledPublishing 2019-07-14 16:46:01 +01:00
hifi-phil
62f924a757 Change PropertyType.Alias to virtual 
When unit testing PropertyType.Alias needs to be virtual to make it mockable. The underlying code on the set triggers IOC logic and makes it hard to test anything that uses Property Types.
 2019-07-14 09:45:12 +01:00
Bjarne Fyrstenborg
c47a08b553 Add overload for NiceUrl 2019-07-13 16:40:01 +02:00
Bjarne Fyrstenborg
de9241bcf5 Add UmbracoHelper overload methods to get url by guid 2019-07-13 14:50:25 +02:00
Bjarne Fyrstenborg
7c03fe3c1f Adjust parameter 2019-07-13 14:49:35 +02:00
Bjarne Fyrstenborg
82eb241119 Add overload method for Udi 2019-07-13 14:49:05 +02:00
Bjarne Fyrstenborg
1073e6257c Adjust comments 2019-07-13 14:48:35 +02:00
Nathan Woulfe
bc3e4847fe Merge branch '5768-log-viewer-chart-naming' of https://github.com/nathanwoulfe/umbraco-cms into 5768-log-viewer-chart-naming 2019-07-13 13:50:21 +10:00
Nathan Woulfe
1a7251909c fix empty array - was checking index against empty array, so condition was never met 2019-07-13 13:45:13 +10:00
Warren Buckley
61a18297d9 Make v8/dev now 8.2.0 2019-07-12 13:03:20 +01:00
Warren Buckley
bdd413f9ee Merge branch 'v8/dev' into 5768-log-viewer-chart-naming 2019-07-12 12:30:32 +01:00
Bjarke Berg
fd8ca35e63 Merge pull request #5869 from umbraco/v8/bugfix/logviewer-error-count 
V8: Fixes LogViewer Error Count search result click
 2019-07-12 12:56:08 +02:00
Warren Buckley
fdd9aee773 Fixes LogViewer Error Count search result clickthrough to include errors & fatal without exception as well 2019-07-12 11:07:15 +01:00
Bjarke Berg
2748c3635d Merge pull request #5863 from umbraco/v7/bugfix/5822-entityservice-overloads 
Fixes Change to Entity Service GetByKey isn't breaking in 7.15 #5822
 2019-07-12 09:29:45 +02:00
Nathan Woulfe
3c2a92d3b6 map log values into logtypedata array - removes need to add these in the correct order. 2019-07-12 14:21:28 +10:00
Nathan Woulfe
cf49e6160a critical => fatal 2019-07-12 14:20:28 +10:00
Shannon
2252db0d55 Fixes 5822 by reinstating optional method overloads of loadBaseType 2019-07-12 13:40:21 +10:00
Shannon
ec93030e21 Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev 2019-07-12 11:23:51 +10:00