yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,183 Commits 4 Branches 7 Tags
3320e1a2f0e9a925a1d4274c787f14b3a2fe3b67
Commit Graph

10383 Commits

Author SHA1 Message Date
Benjamin Carleski
3320e1a2f0 Remove unused obsoletes from Umbraco.Web 2020-01-17 17:22:55 -08:00
Benjamin Carleski
94f42c3223 Update package references to fix compilation error 2020-01-17 17:21:50 -08:00
Shannon Deminick
0577877a41 Merge pull request #7432 from umbraco/netcore/feature/AB3986-handle-iregistedobject-and-remove-core-project 
Netcore: Handle IRegisteredObject and remove Umbraco.Core project
 2020-01-16 14:57:32 +11:00
Bjarke Berg
17609b70de Merge pull request #7459 from umbraco/netcore/feature/AB4519-move-property-editors-to-infrastructure 
Netcore: Move property editors to infrastructure (1st part)
 2020-01-15 10:33:08 +01:00
Bjarke Berg
ea398e1b80 AB3986 - Changed dictionary to be concurrent to ensure thread safety. 2020-01-15 09:31:09 +01:00
Shannon
29c2110b0a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3986-handle-iregistedobject-and-remove-core-project 2020-01-15 14:17:38 +11:00
Shannon
11f5d2f800 Fixes startup - no need for using "Current" which wasn't set at that point but shouldn't have been used anyways. 2020-01-15 13:53:21 +11:00
Shannon
c18b6e6c82 Don't eagerly create an IBulkSqlInsertProvider (fixes install boot), this is now created with the IDbProviderFactoryCreator which simplifies a bunch of ctors. 2020-01-15 13:40:35 +11:00
Shannon
cf818b2268 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4231-Move-SqlCe-stuff-to-seperate-project 2020-01-15 12:48:42 +11:00
elitsa
c588fc085b Migrating FileUploadPropertyEditor and its PropertyEditor dependencies. Fixing its tests due to the changes 2020-01-14 16:53:20 +01:00
elitsa
8655be1b28 Moving more PropertyEditors to Umbraco.Infrastructure 2020-01-14 16:50:22 +01:00
elitsa
2646a20647 Moving a bunch PropertyEditors From Umbraco.Web to Umbraco.Infrastructure 2020-01-14 16:35:50 +01:00
Bjarke Berg
51d0f7da94 AB4234 - Fixes namespaces and removed old unused property on user 2020-01-14 07:47:47 +01:00
Shannon
094f1c2539 Merge branch 'netcore/dev' into netcore/feature/AB4234-Move-Indentity-struff-to-web 2020-01-14 12:41:58 +11:00
Shannon Deminick
2c7c556c5f Merge pull request #7425 from umbraco/netcore/feature/AB3677-remove-current-from-core 
Netcore: Removed Current (Core)
 2020-01-14 12:37:41 +11:00
Bjarke Berg
29140bc7ea AB4375 - Moved ITagQuery and TagModel to Umbraco.Abstractions 2020-01-08 15:39:07 +01:00
Bjarke Berg
bdf0f32a70 AB4375 - Moved Actions to Umbraco.Abstractions 2020-01-08 13:39:47 +01:00
Bjarke Berg
447e1ee1f0 AB4375 - Moved Sections to Umbraco.Abstractions 2020-01-08 13:36:48 +01:00
Bjarke Berg
39b7cb4201 AB4375 - Moved Tour to Umbraco.Abstractions 2020-01-08 13:35:05 +01:00
Bjarke Berg
33525f3ea9 AB4375 - Moved Media from Umbraco.Web to Umbraco.Infrastructure and added reference to System.Drawing.Common 2020-01-08 13:31:14 +01:00
Bjarke Berg
c7f60d8312 AB3986 - Wrapped System.Web.Hosting.IRegisteredObject in the AspNetHostingEnvironment. Updated Maindom to use our own new interface and the wrapper and moved to infrastructure. Removed the Umbraco.Core project now that it was empty. 2020-01-08 09:01:58 +01:00
Bjarke Berg
cdfd3df98a AB4231 - Moved SqlCe classes to separate project 2020-01-07 14:52:59 +01:00
Bjarke Berg
586b9c37f8 AB4234 - Moved stuff from core into web, that used identity. 2020-01-07 13:51:03 +01:00
Bjarke Berg
c6c0d7df54 AB4234 - Moved stuff from core into web, that used identity. 2020-01-07 13:50:38 +01:00
Bjarke Berg
d2443ea4c0 AB3677 - Removed the Core.Composing.Current.. Moved stuff to Web.Composing.Current and injected more stuff. 2020-01-07 13:08:21 +01:00
Bjarke Berg
58f9b48e16 Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core 
# Conflicts:
#	src/Umbraco.Abstractions/UriExtensions.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-01-07 09:46:42 +01:00
Bjarke Berg
c82772228c Minor changes.. Moved files and clean up 2020-01-07 09:36:40 +01:00
Bjarke Berg
439048bc4f Merge pull request #7380 from AndyButland/feature/7371-short-string-helper 
.NET Core transition: Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection (#7371)
 2020-01-07 09:05:28 +01:00
Bjarke Berg
09b480919b Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
 2020-01-07 07:35:34 +01:00
Bjarke Berg
44a36227f9 Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure 
Netcore/feature/ab4227 move files to infrastructure
 2020-01-06 14:59:17 +01:00
Warren Buckley
ad53b76308 Merge branch 'v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-03 11:59:05 +00:00
Claus
b613f8b56d Merge pull request #7315 from umbraco/v8/bug/3935-useractions-xsrf-validation 
Adding extra validation for anti forgery tokens
 2020-01-03 12:40:35 +01:00
Warren Buckley
48a51ea4ef Merge pull request #7315 from umbraco/v8/bug/3935-useractions-xsrf-validation 
Adding extra validation for anti forgery tokens
 2019-12-27 12:18:25 +00:00
Andy Butland
bd5b344a57 Merge branch 'netcore/dev' into feature/7371-short-string-helper 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/TypeExtensions.cs
#	src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
#	src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
#	src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web/Editors/CodeFileController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/ContentControllerBase.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/CurrentUserController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MacroRenderingController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Editors/RelationTypeController.cs
#	src/Umbraco.Web/Editors/TinyMceController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
 2019-12-24 09:08:47 +01:00
Andy Butland
0670caee15 Populated user and member password configuration from settings file. 2019-12-23 14:35:39 +01:00
Andy Butland
d469a2153b Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection. 2019-12-20 17:36:44 +01:00
Poornima Nayar
5148b3ca40 Merge pull request #6910 from kjac/v8/feature/member-type-search 
V8: Make member types searchable
 2019-12-20 09:43:44 +00:00
Niels Swimberghe
e578ca1b0f Add KeepAlive settings to resolve #7116 (#7164) 2019-12-20 08:14:42 +01:00
Kenn Jacobsen
22968b4af4 Reflect inherited permissions in child node menus (#6798) 2019-12-19 16:25:03 +00:00
Bjarke Berg
dfeb97caa4 AB3677 - Moved usages of Current (Core) to Current (Web) 2019-12-19 15:53:50 +01:00
Bjarke Berg
0e4ac7f7d1 Merge remote-tracking branch 'origin/netcore/feature/AB4227-move-files-to-infrastructure' into netcore/feature/AB3677-remove-current-from-core 
# Conflicts:
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
 2019-12-19 12:27:51 +01:00
Bjarke Berg
2ed6b11b6f Merge remote-tracking branch 'origin/netcore/feature/AB3791-Move-scoping-to-infrastructure-and-replace-callcontext' into netcore/feature/AB4227-move-files-to-infrastructure 
# Conflicts:
#	src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2019-12-19 11:34:08 +01:00
Bjarke Berg
67c54bec50 AB4227 - Review fixes - Added null logger + clean up 2019-12-19 11:23:31 +01:00
Bjarke Berg
d5527f0485 AB3677 - Removed lot of stuff from Current (Core) and uses Current (Web) instead 2019-12-19 10:43:34 +01:00
Poornima Nayar
2dfabae9b9 Merge pull request #6672 from kjac/v8/fix/actions-multiple-groups 
V8: Handle permissions for users in multiple groups
 2019-12-19 09:18:40 +00:00
Sebastiaan Janssen
8b225b8e58 Merge branch 'v8/dev' into v8/contrib 2019-12-19 09:18:02 +01:00
Dirk Seefeld
e423c93a16 Fix HelpController for isolated intranet solutions (#7163) 
* Fix HelpController for isolated intranet solutions

* remove debug catch & throw lines
 2019-12-19 09:05:47 +01:00
Bjarke Berg
7f9fbe9877 AB4227 - Removed StringExtensions from core.. 2019-12-18 18:55:00 +01:00
Paul Seal
fa26e2ee02 removed unused _domainService 2019-12-18 14:39:53 +01:00
Bjarke Berg
b3c06be83a AB4227 - Moved a mix of files 2019-12-18 13:42:34 +01:00