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

1294 Commits

Author SHA1 Message Date
Elitsa Marinovska
fba02ea2d6 Fix merge conflict 2021-08-16 14:21:37 +02:00
Elitsa Marinovska
5518867590 Merge remote-tracking branch 'v9/dev' into v9/bugfix/AB12681-unique-constraints-to-dictionary-tables 2021-08-16 14:21:13 +02:00
Elitsa Marinovska
b82320c9f3 Modifying the cmsLanguageText unique index to be just across the languageId and unqiueId fields 2021-08-16 13:26:42 +02:00
Zeegaan
3c4cefb17d Removed VariationContextAccessor from IUmbracoContext 2021-08-16 08:43:13 +02:00
Bjarke Berg
40b9109f65 Merge pull request #10834 from umbraco/v9/remove-system.configuration 
V9 Remove System.Configuration
 2021-08-12 09:02:48 +02:00
Bjarke Berg
d775de5ddd Fixed issue after merge 2021-08-11 19:38:23 +02:00
Bjarke Berg
2baa1abfc4 Merge remote-tracking branch 'origin/v8/8.16' into v9/feature/merge_v8_11082021 
# Conflicts:
#	.github/CONTRIBUTING.md
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Cache/AppCaches.cs
#	src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs
#	src/Umbraco.Core/Cache/DeepCloneAppCache.cs
#	src/Umbraco.Core/Cache/WebCachingAppCache.cs
#	src/Umbraco.Core/CompositionExtensions.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Models/PropertyGroupCollection.cs
#	src/Umbraco.Core/Models/PropertyTypeCollection.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
#	src/Umbraco.Core/ReadLock.cs
#	src/Umbraco.Core/Routing/SiteDomainMapper.cs
#	src/Umbraco.Core/UpgradeableReadLock.cs
#	src/Umbraco.Core/WriteLock.cs
#	src/Umbraco.Examine/ExamineExtensions.cs
#	src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
#	src/Umbraco.Infrastructure/Persistence/Dtos/ContentTypeDto.cs
#	src/Umbraco.Infrastructure/Persistence/Dtos/DictionaryDto.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
#	src/Umbraco.Infrastructure/Services/IdKeyMap.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/CacheHelperExtensions.cs
#	src/Umbraco.Web/Editors/RelationTypeController.cs
#	src/Umbraco.Web/Logging/WebProfilerProvider.cs
#	src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
#	src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs
#	src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
#	src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2021-08-11 19:11:35 +02:00
Warren Buckley
9112963224 Remove System.Configuration.ConfigurationManager 2021-08-11 13:25:13 +01:00
Warren Buckley
558352e3ac Merge pull request #10823 from umbraco/v9/feature/package_export_and_import_both_xml_and_zip 
V9: Package export and import both xml and zip
 2021-08-11 11:10:28 +01:00
Bjarke Berg
d520be52bc Merge pull request #10721 from umbraco/v9/bugfix/external-login-changes 
external login changes/enhancements
 2021-08-10 20:04:20 +02:00
Elitsa Marinovska
20a40ce001 New migration for dropping existing indexes in the dictionary tables and re-creating the new ones. Silently log in case the migration fails - due to duplicate records 2021-08-10 17:47:48 +03:00
Elitsa Marinovska
2362b9479b Update DictionaryDto and LanguageTextDto to have unique indexes. 2021-08-10 15:44:19 +03:00
Warren Buckley
73daca339e Adds in System.Configuration.ConfigurationManager that the Serilog package had a dependacy on 2021-08-10 11:45:53 +01:00
Warren Buckley
66194fe553 Remove unused usings 2021-08-10 10:19:29 +01:00
Warren Buckley
b82047ce00 Fix build & remove this constructor where you could pass in a custom filepath to read the XML settings from 2021-08-10 10:19:13 +01:00
Warren Buckley
2b36538b71 Uninstall OLD Serilog package that read config from XML values we use Serilog.Settings.Configuration instead now 2021-08-10 10:18:33 +01:00
Bjarke Berg
3ac5004d09 Fixed issue: 
Did not load media items if the folder was still there but the nested media was deleted/missing

## Testcase:
Add folder to media..

add multiple images into the folder

Create package with the folder and include decendents

Remove one of the items inside the folder + empty recycle bin

Install the package  - Now the missing item is still added (it was not before)
 2021-08-10 10:52:26 +02:00
Shannon
ab84490535 Fixes email sending notifications so they are checked if they are handled. 2021-08-09 13:42:08 -06:00
Bjarke Berg
2a3ac1961d Temp commit 2021-08-09 06:28:26 +02:00
Shannon
afb952fa38 Needs a null check so it doesn't explode when saving content during a migration. 2021-08-06 15:54:50 -06:00
Shannon
d4be031b78 Fixes an error caused by v8-v9 merge 2021-08-06 14:12:25 -06:00
Shannon
53bc53a377 Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 
# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
 2021-08-06 13:47:41 -06:00
Bjarke Berg
b7801f6940 Fixed merge issue 2021-08-06 13:55:41 +02:00
Bjarke Berg
a030506c6a Merge remote-tracking branch 'origin/v9/dev' into v9/update-all-the-things 2021-08-06 13:39:53 +02:00
Andy Butland
9732381933 Added unit test for TryGetBasicAuthCredentials extension method and minor code tidy. 2021-08-06 12:13:16 +02:00
Warren Buckley
139c2db3b3 Update MS Nuget Packages 2021-08-06 10:33:25 +01:00
Warren Buckley
2c9502c0ef Update MailKit 2021-08-06 10:14:27 +01:00
Warren Buckley
116cd3238b Update Serilog Nuget Packages 2021-08-06 10:11:41 +01:00
Bjarke Berg
2d6b382ce7 Added support for Ip Ranges 2021-08-06 10:41:21 +02:00
Bjarke Berg
0e7f9d93ca Introduced IBasicAuthService 2021-08-06 09:51:08 +02:00
Nikolaj Geisle
eca3536dc7 Merge pull request #10660 from vsilvar/v9/feature/modelsbuilders-nullable-references-maybenull 
Added MaybeNullAttribute to ModelsBuilder generated files
 2021-08-04 15:13:31 +02:00
Bjarke Berg
cb81b96c4a Merge pull request #10716 from lars-erik/patch-separate-sqlce-from-integration-tests 
Testable BTree to ContentCache in V9 / Separate SqlCe from integration tests
 2021-08-04 15:02:49 +02:00
Bjarke Berg
f9b91cd272 Merge pull request #10661 from vsilvar/v9/feature/10648-umbracobuilder-extensions-chaining 
Updated public IUmbracoBuilder extension methods to allow chaining
 2021-08-04 12:45:33 +02:00
Bjarke Berg
e1dab63123 Merge remote-tracking branch 'origin/v9/dev' into patch-separate-sqlce-from-integration-tests 2021-08-04 10:50:33 +02:00
Bjarke Berg
30badd7d69 Fixed migration to support updating from 8.15rc (and before),8.15 final and 9.0rc1 2021-08-04 09:44:34 +02:00
Bjarke Berg
ac2f567f0e Still do ToArray as the first thing, to avoid test fails. 2021-08-03 12:29:15 +02:00
Bjarke Berg
e84fcd31a1 Moved namespaces 2021-08-03 09:58:41 +02:00
Bjarke Berg
4ab0b65238 post merge fix - Moved migration to infrastructure 2021-08-03 09:56:32 +02:00
Bjarke Berg
43ae1fa3e4 Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_dev_03082021 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/ContentEditing/ContentTypesByKeys.cs
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_15_0/AddCmsContentNuByteColumn.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheSerializerComponent.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
 2021-08-03 09:48:34 +02:00
Shannon
29ebb42a01 Fixes ugly classes not structured correctly and removes dead code, simplifies how db types are initialized and removes hacks. Fixes datetimeoffset definition. 2021-07-27 10:41:46 -06:00
Shannon
499a0608ec Fixes sql server DateTimeOffset mapping. Makes Custom DB types much more flexible and usable by 3rd parties. 2021-07-27 10:15:45 -06:00
Shannon
d218cb4599 Fixes migration and redirect 2021-07-26 16:55:41 -06:00
Shannon
b939da3668 adds invited date to back office user 2021-07-26 11:51:54 -06:00
Shannon
c8d36cfc4f Fix ordering of css files and set correct defautl icon for external providers. 2021-07-26 11:10:37 -06:00
Shannon
4759bcac69 Fixes migrations for external login table. 2021-07-26 10:54:06 -06:00
Shannon
15e65f0c1e Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 2021-07-26 10:44:51 -06:00
Shannon Deminick
f1bc76e709 Merge pull request #10670 from cleversolutions/temp-10656 
Umbraco 9 - LoginProvider Duplicate Key
 2021-07-27 02:43:01 +10:00
Shannon
68737f8682 Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 2021-07-26 09:58:43 -06:00
Shannon
ed5ab8b866 Fix delete user clause 2021-07-22 16:34:30 -06:00
Mole
4f4caeba6a Merge pull request #10691 from umbraco/v9/feature/package-manifest-bundle-options 
Adds bundle options to the package manifest
 2021-07-20 08:28:48 +02:00