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

528 Commits

Author SHA1 Message Date
Bjarke Berg
5953c9ebe7 Fixed issues with confusion about when to use umbracoPath and when to use the const. 
Now it is possible to change the location of backoffice.
{
  "Umbraco": {
    "CMS": {
      "Global": {
       "UmbracoPath": "~/my-secret-loginpanel",
        "IconsPath": "~/my-secret-loginpanel/assets/icons"
      }
    }
  }
}
 2021-09-01 07:50:17 +02:00
Shannon
6f8344a349 removes unneeded deps on package controller. 2021-08-18 12:03:23 -06:00
Shannon
8ede33f6ba Updates how package migrations are run. Only publish a single notification. 2021-08-18 12:01:56 -06:00
Shannon
4b57366ca0 Suppress scope notifications during migrations 2021-08-17 11:13:46 -06:00
Elitsa Marinovska
81ea232ecb Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/Refractor_UmbracoContextAccessor 2021-08-17 13:11:45 +02:00
Elitsa Marinovska
d8b3a1bbe5 Get rid of some more duplicate code 2021-08-17 13:09:25 +02:00
Bjarke Berg
831efead10 Merge pull request #10623 from umbraco/v9/bugfix/image-cropping 
V9: Fix ImageSharp integration and add support for custom crops
 2021-08-17 07:49:32 +02:00
Zeegaan
33ab3a32ec Merged v9/dev into this branch 2021-08-16 10:41:36 +02:00
Bjarke Berg
3c6efa6cb5 Merge pull request #10787 from umbraco/v9/bugfix/member_validation_doesnt_update_properly 
v9: Fixed a bug where validation didnt update properly
 2021-08-13 19:19:37 +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
Bjarke Berg
c5e882680b Fixed issue with model state marked as invalid on the entire model, where we handle it for each item separately 2021-08-11 15:43:41 +02:00
Bjarke Berg
c5752b5db5 Revert "Fixed issue with saving content when having an empty variant. Aligned codebase with how it is in v8" 
This reverts commit 5ae0b64b36.
 2021-08-11 14:50:39 +02:00
Bjarke Berg
5ae0b64b36 Fixed issue with saving content when having an empty variant. Aligned codebase with how it is in v8 2021-08-11 14:32:08 +02:00
Zeegaan
c07fe97edd Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/Refractor_UmbracoContextAccessor 2021-08-11 14:01:00 +02:00
Zeegaan
81807f76dc Fixed last 4 classes that used old UmbracoContextAccessor to use new TryGetUmbracoContext 2021-08-11 13:33:34 +02:00
Shannon
1917c51115 Another fix required for the user invite flow. 2021-08-10 12:41:24 -06:00
Ronald Barendse
22814036a1 Update FocalPointPosition and CropCoordinates constructors/properties 2021-08-10 17:20:03 +02:00
Ronald Barendse
0b9f1f4f86 Remove usage of obsolete image URL generation properties (width/height ratio, default crop, upscale and animation process mode) 2021-08-10 11:23:37 +02: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
Nikolaj Geisle
61b343da8b Merge pull request #10722 from umbraco/v9/bugfix/fix-multi-url-picker 
V9: Fix multi url picker
 2021-08-05 08:11:31 +02:00
Bjarke Berg
d1a004078f Merge pull request #10781 from umbraco/v9/feature/merge_v8_dev_03082021 
V9: Merge v8/dev 03082021
 2021-08-04 10:40:34 +02:00
Zeegaan
d11b79421d fixed a bug where validation didnt update properly 
adressed in
https://github.com/umbraco/Umbraco-CMS/pull/10688
 2021-08-04 09:46:01 +02:00
Nikolaj Geisle
1b54013873 Merge pull request #10687 from umbraco/v9/bugfix/translations-everywhere 
V9: Fix translations not shown everywhere
 2021-08-03 14:52:00 +02:00
Bjarke Berg
e84fcd31a1 Moved namespaces 2021-08-03 09:58:41 +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
5cec6ab8f4 Fixes issue with resolving a scheme name since that is managed via IOptions but we were capturing it. 2021-07-27 16:12:23 -06:00
Shannon
d218cb4599 Fixes migration and redirect 2021-07-26 16:55:41 -06:00
Shannon
a89a92efea Fixing upgrade redirect when using external providers. 2021-07-26 13:28:18 -06:00
Shannon
27fc159e28 ensures the last login date, etc... are updated with external logins 2021-07-26 13:12:29 -06:00
Shannon
68737f8682 Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 2021-07-26 09:58:43 -06:00
Mole
615008c0ab Rename udi to id in EntityController.GetUrl 2021-07-22 11:10:02 +02:00
Shannon
1155210209 Fixes error reporting for external login 2021-07-21 14:32:55 -06:00
Shannon
b16bf2f583 Adds BundlingOptions for better bundling support and moves all logic to the bundler (don't manually process urls). 2021-07-15 14:06:33 -06:00
Shannon
df9c4a0160 Adds bundle options to the package manifest 
to more control over how bundling works for static file processing for app_plugins
 2021-07-15 13:26:32 -06:00
Mole
33f53fcf35 Force authentication of user when getting localized text and get culture from user identity 2021-07-15 14:10:52 +02:00
Mole
5cd0545b2f Tweak xml header 2021-07-14 14:27:36 +02:00
Mole
2ea40a103a Make ValidationProblem methods unambiguous 2021-07-14 14:18:22 +02:00
Shannon Deminick
720aa6202a Update src/Umbraco.Web.BackOffice/Controllers/EntityController.cs 
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2021-07-13 02:09:15 +10:00
Shannon
5a1a24556e Gets packaging scripts and partial views working and fixes packaging stylesheets and cleans things up a bit. 2021-07-08 13:11:39 -06:00
Shannon
f7d0e417d6 packages partial views associated with macros. 2021-07-07 16:16:14 -06:00
Shannon
3eb54831cb Remove OriginalMediaPathScheme, changes how we extract the media file path and use that correctly instead of hacks. 2021-07-07 14:36:52 -06:00
Shannon
58a4e600db Pretty much gets zip package format working with media install 2021-07-07 09:41:11 -06:00
Shannon
9178e28485 Merge branch 'v9/dev' into v9/task/package-refactor 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/PackageController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
 2021-07-05 15:06:26 -06:00
Bjarke Berg
23293b77f6 Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8-05072021 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/Constants-SqlTemplates.cs
#	src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
#	src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
#	src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
#	src/Umbraco.Core/HealthChecks/Checks/Services/SmtpCheck.cs
#	src/Umbraco.Core/Models/IReadOnlyContentBase.cs
#	src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
#	src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/PropertyEditors/MediaPicker3Configuration.cs
#	src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/PropertyEditors/PropertyCacheCompression.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/Services/ILocalizedTextService.cs
#	src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Examine/UmbracoContentIndex.cs
#	src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs
#	src/Umbraco.Infrastructure/IPublishedContentQuery.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Models/MediaWithCrops.cs
#	src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ImageCropperConfiguration.cs
#	src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs
#	src/Umbraco.Infrastructure/PublishedContentQuery.cs
#	src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs
#	src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs
#	src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs
#	src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs
#	src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs
#	src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
#	src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs
#	src/Umbraco.Web.Common/Macros/MacroRenderer.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Compose/NotificationsComponent.cs
#	src/Umbraco.Web/Composing/ModuleInjector.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/CurrentUserController.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
#	src/Umbraco.Web/Editors/MemberTypeController.cs
#	src/Umbraco.Web/Editors/NuCacheStatusController.cs
#	src/Umbraco.Web/Editors/UserGroupsController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/CompilationDebugCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/CustomErrorsCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/MacroErrorsCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/TraceCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/TrySkipIisCustomErrorsCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
#	src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
#	src/Umbraco.Web/Models/Trees/MenuItemList.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataModel.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/Runtime/WebRuntime.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
#	src/Umbraco.Web/Trees/ApplicationTreeController.cs
#	src/Umbraco.Web/Trees/MemberTreeController.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
 2021-07-05 20:58:04 +02:00
Mole
530da072b1 Merge pull request #10547 from umbraco/v9/bugfix/10459_show_cultures_with_english_names 
V9: Show cultures in dropdown with english names
 2021-07-02 09:02:15 +02:00
Bjarke Berg
c365d5de4b Merge pull request #10534 from umbraco/v9/task/cleanup-validation-results 
Streamlines response handling in controllers
 2021-07-01 23:04:45 +02:00
Bjarke Berg
9e4dead0f5 Merge remote-tracking branch 'origin/v9/dev' into v9/task/package-refactor 
# Conflicts:
#	src/Umbraco.Core/Migrations/IMigration.cs
#	src/Umbraco.Core/Migrations/MigrationPlan.cs
#	src/Umbraco.Infrastructure/Migrations/IMigrationContext.cs
#	src/Umbraco.Infrastructure/Runtime/RuntimeState.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
 2021-06-29 14:23:08 +02:00
Bjarke Berg
451f98173f #10459 - Show cultures in dropdown with english names to make it consistent. 2021-06-28 18:43:46 +02:00
Bjarke Berg
6e9abb17e7 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
 2021-06-28 08:57:38 +02:00
Shannon
7f76884ba2 removes UmbracoNotificationSuccessResponse and use OK method 2021-06-25 10:42:09 -06:00