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

26234 Commits

Author SHA1 Message Date
Frans de Jong
1c6bf55e5d GetCurrentLoginStatus() 
In the summary of MembershipHelper.GetCurrentLoginStatus() it states that null will be returned when no member is logged in but that isn't the case (anymore?).
 2019-07-23 13:02:11 +02:00
Bjarke Berg
c246044ac7 Merge pull request #5972 from stevemegson/v8/temp-checkboxlist 
Content migration - Include CheckBoxList in ValueListPreValueMigrator
 2019-07-23 12:47:13 +02:00
Shannon
27223738c6 Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2019-07-23 19:05:06 +10:00
Warren Buckley
bb8356d7db Merge pull request #5924 from umbraco/v/bugfix/5035-slot-swap2 
Fixes race condition in PublishedSnapshotService and more...
 2019-07-23 09:18:44 +01:00
Warren Buckley
66ff4d191a Merge pull request #5946 from umbraco/v8/bugfix/5886-fixes-Children 
Fixes issue with Children(culture) method
 2019-07-22 14:54:49 +01:00
Shannon
21218b0332 Merge remote-tracking branch 'origin/v7/7.15' into v8/8.1 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
 2019-07-22 13:59:14 +10:00
Shannon
6148ce4e52 oops no es6 support in 7.x 2019-07-22 13:41:26 +10:00
Shannon
06850ed25c Merge branch 'v7/7.15' into v7/hotfix/5835-AB#1693-add-null-checks-when-using-dataTypeId 2019-07-22 13:40:35 +10:00
Shannon
0320a56cb5 Fixes up dataTypeId var declarations 2019-07-22 13:27:51 +10:00
Steve Megson
968463912a Include CheckBoxList in ValueListPreValueMigrator 2019-07-21 14:47:37 +01:00
Warren Buckley
b9e44f381b Merge pull request #5923 from umbraco/v8/hotfix/5902-migration-should-not-warn-about-build-in-renamed-data-types 
V8: Migration should not warn about build in data types that is handled correct but renamed
 2019-07-19 10:56:38 +01:00
Bjarke Berg
67f680a675 Revert "https://github.com/umbraco/Umbraco-CMS/issues/5921 - AB#1794 - Remove trashed nodes from sql when building xml for previews" 
This reverts commit 47c3e3a7
 2019-07-19 11:24:01 +02:00
Bjarke Berg
47c3e3a79f https://github.com/umbraco/Umbraco-CMS/issues/5921 - AB#1794 - Remove trashed nodes from sql when building xml for previews 2019-07-19 11:20:31 +02:00
Shannon
02f49a0039 Cherry picks fix for 5894 and makes adjustments 2019-07-19 16:00:42 +10:00
Shannon Deminick
05c6b856f9 Merge pull request #5897 from kjac/v8-fix-media-type-add-property 
V8: Fix YSOD when editing media types
 2019-07-19 15:57:01 +10:00
Shannon
b07df63422 Adds some better notes to the api docs 2019-07-19 15:49:39 +10:00
Shannon
487e45b45b updates note 2019-07-19 15:26:31 +10:00
Shannon
929c84822a Fixes the Children ext method and adds unit tests 2019-07-19 15:18:00 +10:00
Warren Buckley
993f11cd2c Merge pull request #5898 from umbraco/v8/hotfix/5846-AB#1695-Fix-for-migration-of-corrupt-data 
V8: Give better exception if a json exception happens doing migration
 2019-07-18 13:36:35 +01:00
Warren Buckley
6544b5c272 Update src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-07-18 13:03:14 +01:00
Shannon
817a458334 Merge remote-tracking branch 'origin/v7/7.15' into v8/8.1 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/packages.config
 2019-07-18 16:22:38 +10:00
Shannon
f3bfc1ffb2 Puts back UmbracoAntiForgeryAdditionalDataProvider for backwards compat reasons but it is not used 2019-07-18 16:18:11 +10:00
Shannon
3603090421 Fixes race condition in PublishedSnapshotService and more... 2019-07-17 22:51:14 +10: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
Bjarke Berg
79159b684d https://github.com/umbraco/Umbraco-CMS/issues/5902 
- Fixed issue with migration of Umbraco.Date if it was never saved in v7, the default format was added the time-part.
- Fixed issue with warnings of migrations of build in types, that was renamed between v7 and v8. These are handled correct.
- Added constants for some of the legacy property editor aliases.
 2019-07-17 14:30:02 +02: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
89cd655df2 Merge remote-tracking branch 'origin/v7/bugfix/build-without-vs2017' into v7/7.15 2019-07-17 21:48:21 +10:00
Shannon
14c4c4815d bumps version 2019-07-17 21:35:43 +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
Kenn Jacobsen
da71a94c39 Use IsCollectionEmpty() as per review 2019-07-16 12:45:27 +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
Bjarke Berg
f6a8d487cc AB#1695 - https://github.com/umbraco/Umbraco-CMS/issues/5846 
Give better exception, if a json exception happens doing migration of grid properties in ConvertTinyMceAndGridMediaUrlsToLocalLink
 2019-07-15 13:06:47 +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
Kenn Jacobsen
d60fc63e78 Fix YSOD when editing media types 2019-07-15 12:23:09 +02: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