yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,953 Commits 4 Branches 7 Tags
993f11cd2c9c9a54afd59208942bea2652deeec0
Commit Graph

29953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Steve Megson
0feb053e51 Fixes #5852 - TablesForScheduledPublishing 2019-07-16 13:39:09 +02:00
Bjarke Berg
09c8ae4e7e Fixed null ref exception in related links migrations 2019-07-16 13:36:16 +02: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
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
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
Shannon
2252db0d55 Fixes 5822 by reinstating optional method overloads of loadBaseType 2019-07-12 13:40:21 +10:00
Claus
df896af476 adding build targets package. 2019-07-10 12:58:15 +02:00
Claus
78735ff349 Merge pull request #5798 from kjac/v8-fix-save-member 
V8: Can't save members without resetting their password
 2019-07-08 09:29:37 +02:00
Claus
4b605b2580 Merge pull request #5799 from kjac/v7-fix-save-member 
V7: Can't save members without resetting their password
 2019-07-08 09:28:46 +02:00
Kenn Jacobsen
80d7f1b2c9 Make it possible to save a member without resetting the password 2019-07-07 11:36:26 +02:00
Kenn Jacobsen
1af43498d9 Make it possible to save a member without resetting the password 2019-07-07 11:16:02 +02:00
Sebastiaan Janssen
5ada85df29 Provide the correct assembly redirects 2019-07-05 12:11:03 +02:00
Shannon
015ad64e30 Updates the exception thrown during upgrade to provide some meaningful feedback to the user. 2019-07-05 14:36:33 +10:00
Bjarke Berg
6dbb988903 Refactor to limit to only v7.14.0 - V7.15.* 2019-07-04 11:44:05 +02:00
Bjarke Berg
926acb910e Forces the initial migration state of V7 sites that are allowed to be migrated into v7.14 state. 2019-07-04 11:44:05 +02:00
Sebastiaan Janssen
57e3187e3a For some reason this file was not part of the project any more :-( 2019-07-03 22:10:01 +02:00
Bjarke Berg
988d51c4c8 Merge pull request #5767 from umbraco/v8/bugfix/5671-fix-for-different-version-number-in-modelbuilder-models-in-live-mode 
V8: Bugfix for Modelsbuilder models with different versions error
 2019-07-03 13:43:00 +02:00
Bjarke Berg
4733256ca1 Merge pull request #5772 from umbraco/v8/bugfix/fix-n1-issue 
Fixes N+1 Issues caused by the new bypass start nodes changes
 2019-07-03 13:15:55 +02:00
Bjarke Berg
4133a1fe76 Refactored the ModelBindingExceptionFilter to also handle InvalidCastException, and also ensure the models are the same type. 
Otherwise a infinite loop was introduced, when requesting a wrong model in the view.
Also refactored the why we do the retry from Html to Http headers
 2019-07-03 13:14:35 +02:00
Shannon
37bf6fe938 Automatically refresh the page if we encounter a ModelBindingException 2019-07-03 19:15:54 +10:00
Shannon Deminick
31716e574c Update src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs 
good catch!

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-07-03 18:34:11 +10:00
Shannon
126c4cbd46 ensures media is rebuild and adds more notes 2019-07-03 18:25:19 +10:00
Shannon
7cc91f71c2 Fixes pure live mode when changing doc types 2019-07-03 18:11:00 +10:00
Shannon
7c52b9602c Reduce some allocations and in advertent SQL calls along with inadvertent enumeration of the entire cache, adds some notes 2019-07-03 17:43:30 +10:00
Bjarke Berg
c5f1cc15fd Refactored dataTypeId when a guid into dataTypeKey 2019-07-03 08:33:30 +02:00
Shannon
d089518681 Fixes SQL generation to populate the nodedto object of the datatypedto 2019-07-03 15:40:18 +10:00
Shannon
cd6ef35bf9 comments out the fix during investigation - adds some notes 2019-07-03 15:17:51 +10:00
Shannon
47cdc79fcb Merge branch 'v8/dev' into v8/bugfix/5671-fix-for-different-version-number-in-modelbuilder-models-in-live-mode 2019-07-03 13:50:38 +10:00
Shannon
f7382255c2 Fixes N+1 Issues caused by the new bypass start nodes changes 2019-07-03 13:16:40 +10:00
Shannon Deminick
2167eada0c Merge pull request #5764 from umbraco/v8/bugfix/fixes-for-bypass-securtiy-after-merge 
V8: Bugfixes regarding the Bypass Security feature after merge from v7
 2019-07-03 11:27:55 +10:00
Shannon
df11935598 Revert and adjusts "Fixes issue when creating DateTypes of type Umbraco.MultiNodeTreePicker with type member, because -1 can't be casted to Udi" 2019-07-03 11:23:25 +10:00
Shannon
d3b4b9fe64 fix merge 2019-07-03 11:10:34 +10:00
Shannon
33aff7ff61 Merge branch 'v8/dev' into v8/bugfix/fixes-for-bypass-securtiy-after-merge 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
 2019-07-03 11:04:34 +10:00
Sebastiaan Janssen
4d2c551b79 Merge branch 'v7/dev' into v8/dev 2019-07-02 22:01:34 +02:00
Sebastiaan Janssen
5b7ae7150f Fix weird merge 2019-07-02 21:55:54 +02:00
Sebastiaan Janssen
5bf29a907a Fixes #5206 2019-07-02 21:47:14 +02:00
Bjarke Berg
96d5bdd7b2 https://github.com/umbraco/Umbraco-CMS/issues/5671 - If modelsbuilder is in live mode, we need to clear cache for all document types when at least one is cleared. This is due to modelsbuilder updating all the models to different versions. 2019-07-02 15:26:54 +02:00