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

29360 Commits

Author SHA1 Message Date
Elitsa Marinovska
d483f2ccbd Marking asp.net action filters as migrated to net core 2020-04-20 22:56:36 +02:00
Elitsa Marinovska
487e3c54a8 Reimplementing action filters to asp.net core 2020-04-20 22:55:40 +02:00
Bjarke Berg
bf1784f9d1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
 2020-04-17 11:43:04 +02:00
Shannon
d1524cdafe Merge branch 'v8/dev' into v8/bugfix/7868-nucache-null-parent 
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
 2020-04-17 15:04:10 +10:00
Shannon
d5e2c12685 fixes merge issue 2020-04-17 13:20:57 +10:00
Bjarke Berg
9f56aa1358 Merge remote-tracking branch 'origin/netcore/dev' into feature/7898-netcore-model-unit-tests-3 2020-04-16 19:28:05 +02:00
Bjarke Berg
3406bdb40b Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	NuGet.Config
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs
 2020-04-16 19:00:51 +02:00
Bjarke Berg
d2f361e816 Merge remote-tracking branch 'origin/v8/8.6' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
 2020-04-16 18:54:45 +02:00
Shannon
52ecd59c11 fixes test 2020-04-17 00:01:26 +10:00
Shannon
94bd9f4a9f Merge branch 'v8/8.6' of https://github.com/umbraco/Umbraco-CMS into v8/8.6 2020-04-16 23:54:09 +10:00
Shannon
3310ef9d8d fix tests 2020-04-16 23:53:52 +10:00
Sebastiaan Janssen
271669581a Merge pull request #7847 from umbraco/v8/bugfix/7773-memory-leak 
Fixes Memory Leak in GetCacheItem cache dependency #7773

(cherry picked from commit b8abc04417)
 2020-04-16 15:21:54 +02:00
Sebastiaan Janssen
41f98a41fb Added fix from #7832 since the test was somehow cherry picked into 8.6.1 already 2020-04-16 14:58:56 +02:00
Shannon
eabc9583f0 adds more named params 2020-04-16 22:39:32 +10:00
Shannon
153daa9fc5 fixes nameof 2020-04-16 22:35:53 +10:00
Shannon
6a5366469e fixes null checks in ctor 2020-04-16 22:34:15 +10:00
Shannon
0bfb61f1c1 Merge branch 'v8/8.6' of https://github.com/umbraco/Umbraco-CMS into v8/8.6 2020-04-16 22:27:26 +10:00
Shannon
d2c05bf681 Fixes issue with RelationTypeFactory swapping the parent/child 2020-04-16 22:27:05 +10:00
Shannon
6cd7e5d055 removes the extra unneeded variable 2020-04-16 22:04:27 +10:00
Bjarke Berg
b09d736c1b Bump verison to 8.6.1 2020-04-16 13:47:23 +02:00
Andy Butland
2278b0d318 Merge branch 'netcore/dev' into feature/7898-netcore-model-unit-tests-3 2020-04-16 12:19:04 +02:00
Andy Butland
33853eee43 Added setup method to instantiate clean builder for all model unit tests within the class. 2020-04-16 12:18:06 +02:00
Andy Butland
89a419e4d1 Clarified comment. 2020-04-16 11:46:02 +02:00
Andy Butland
068100cc8e Removed resetting of unit test builders. 2020-04-16 11:39:30 +02:00
Shannon
d9bf7dfa96 changes back isBidrectional spelling in case someone is using it with a named parameter binding :/ 2020-04-16 18:53:45 +10:00
Shannon
53824cac25 fix isBidirectional spelling 2020-04-16 18:46:00 +10:00
Shannon
feeff07d5c Cherry pick - Possible fix for issue #7870 2020-04-16 18:39:02 +10:00
Shannon
b72abd50a0 fixes relation type ctor 2020-04-16 17:47:43 +10:00
Sebastiaan Janssen
0d7b0b9674 Add back ctor to revert a breaking change 2020-04-15 21:11:14 +02:00
Shannon Deminick
4a071f6e05 Nucache NullReferenceException when copying (#7961) 
(cherry picked from commit b30db05cc7)

# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
 2020-04-15 20:55:11 +02:00
Bjarke Berg
26e16cee7a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-04-15 15:52:22 +02:00
Niels Lyngsø
aab629808d slightly more shadow on content-grid items 2020-04-15 15:08:10 +02:00
Sebastiaan Janssen
055f18d639 Add back ctor to revert a breaking change 2020-04-15 09:52:07 +02:00
Shannon
61c39eea64 Nicer sql template constants 2020-04-15 12:49:38 +10:00
Bjarke Berg
ad4bce3b73 AB#5819 - Cleanup 2020-04-14 16:26:01 +02:00
Bjarke Berg
d0135eae2b Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5819-initialize-composers 2020-04-14 07:29:59 +02:00
Andy Butland
597489fba2 Added missing builder property values when building macro properties. 2020-04-13 19:33:39 +02:00
Andy Butland
a9a8cb7f6f Migrated macro unit tests to new project and builder pattern. 2020-04-13 19:22:31 +02:00
Andy Butland
f961916245 Introduced a reset of the unit test builders to support re-use within a test. 2020-04-12 09:47:44 +02:00
Andy Butland
a5aa1e19a5 Fixed failing integration tests following amends to UserBuilder. 2020-04-11 18:37:10 +02:00
Andy Butland
3085ce52f9 Migrated parth validation tests to new project and builder pattern. 2020-04-11 17:21:27 +02:00
Andy Butland
4456a784b0 Migrated user extension tests new project pattern. 2020-04-11 16:41:28 +02:00
Andy Butland
b3fd94e023 Migrated user tests into new project and builder pattern. 2020-04-11 16:35:33 +02:00
Andy Butland
f4ad8176c4 Removed references to moved projects introduced by merge. 2020-04-10 17:51:57 +02:00
Andy Butland
766826f462 Merge branch 'netcore/dev' into feature/netcore-model-unit-tests-2 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
 2020-04-10 17:11:41 +02:00
Andy Butland
82feb93243 Merge branch 'netcore/dev' into feature/netcore-model-unit-tests-2 2020-04-10 17:05:46 +02:00
Andy Butland
650126cfc8 Amended PropertyBuilder to return IProperty and removed some unnecessary default properties from built test class. 2020-04-10 17:01:47 +02:00
Bjarke Berg
8aaff38a6d Merge pull request #7895 from AndyButland/feature/netcore-model-unit-tests 
Netcore: Further model unit test migrations into new project and builder pattern
 2020-04-10 16:28:19 +02:00
mattchanner
d0eee32f1d Added null check on raw JSON to prevent null reference error deserializing the grid 
(cherry picked from commit bcea0f645a)
 2020-04-09 16:51:02 +02:00
Benjamin Carleski
5f5773b0c0 7879: Handle for multiple picked media relations 
(cherry picked from commit 9f7c44c64e)
 2020-04-09 16:50:41 +02:00