yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,593 Commits 4 Branches 7 Tags
3c3c9a6a4772b94de30171b7c6f48ab59620d625
Commit Graph

400 Commits

Author SHA1 Message Date
Bjarke Berg
8141e7c6c8 Bugfix 2020-09-14 14:35:57 +02:00
Bjarke Berg
dc643ab6a6 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
#	src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
#	src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
#	src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
#	src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
 2020-09-10 14:01:38 +02:00
Bjarke Berg
fc054e6546 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.html
#	src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
#	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
#	src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	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/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
 2020-09-09 19:13:37 +02:00
Bjarke Berg
d14e2a99bc Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Intall/InstallHelper.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
 2020-09-09 14:16:46 +02:00
Bjarke Berg
06713ea03a Clean up + reintroduced some notes, that will maybe be usefull when website rendering is ready 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-09 12:46:23 +02:00
Nikolaj
fc83ea5edd Remove more generated files 2020-09-08 11:23:27 +02:00
Nikolaj
2bb3612bcb Enable models builder 2020-09-08 10:57:15 +02:00
Nikolaj
7ac4e6c387 Disabling pre compiled view should be a workaround and not default 2020-09-08 10:42:39 +02:00
Nikolaj
b6be2b4a0c Remove pure live generated cs files 
They will cause a myriad of trouble
 2020-09-08 10:27:05 +02:00
Bjarke Berg
3efee8284a Post merge fixes 2020-09-07 15:28:58 +02:00
Nikolaj
00b30f74c7 Fix 2020-09-07 09:06:46 +02:00
Bjarke Berg
c8669b18c2 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 14:30:48 +02:00
Bjarke Berg
7b465de164 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/reset_password 2020-09-04 10:40:32 +02:00
Nikolaj
8fd1d0a867 Add appsettings change 2020-09-02 14:47:18 +02:00
Nikolaj
1eb7e9c1eb Add further progress 2020-09-02 14:44:01 +02:00
Shannon
775360ef78 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/integration-tests-examine-indexes 2020-09-02 18:27:53 +10:00
Shannon
f84a93ae20 Adds IUmbracoBuilder to build the config so it's easier to split apart, ensures background tasks don't run in integration tests, uses a custom CoreRuntime to ensure we use SimpleMainDom, re-wires the UmbracoWebApplicationFactory so that duplicate Hosts are not running at the same time, fixes issues with overriding/shadowing, uses RAMDirectory in lucene for tests, fixes CoreRuntime's events that we're moved incorrectly and not backwards compat, adds new real non static events which we can use in integration tests to install the DB before the runtime state is calculated 2020-09-02 18:10:29 +10:00
Bjarke Berg
97e6d76ec9 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 2020-09-02 10:03:53 +02:00
Bjarke Berg
edca4af7f4 Fix MaxFailedAccessAttemptsBeforeLockout from config 2020-09-02 10:03:35 +02:00
Shannon
a110d4d216 Ensures Smidge is configured to use Nuglify 2020-08-31 22:46:17 +10:00
Bjarke Berg
4a150859cd Fixed reset password for functionality 2020-08-31 13:39:29 +02:00
Andy Butland
2a59a8385c Merge branch 'netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
#	src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
 2020-08-27 09:03:01 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Bjarke Berg
ca3f65891d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-25 14:00:59 +02:00
Andy Butland
2ea89acaaa Merge branch 'netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
 2020-08-25 10:09:54 +02:00
Bjarke Berg
b5b492106d Clean up by moving stuff from Startup.cs into extention methods 2020-08-24 14:23:08 +02:00
Bjarke Berg
c0d4516e15 Updated default config files 2020-08-24 14:15:53 +02:00
Andy Butland
c3c8d79720 Merge branch 'netcore/netcore' into feature/8651-config-options-patten 2020-08-24 09:45:25 +02:00
Andy Butland
7884e4ca17 Resolved issues such that application boots and back-office is navigable. 2020-08-24 09:29:40 +02:00
Andy Butland
2cd91a5a54 Converted to IOptions over IOptionsSnapshot due to the latter only working in scoped services. 
Further amends to return to booting application.
 2020-08-23 23:36:48 +02:00
Andy Butland
510bd92e78 Amended injection of further settings to use IOptionsSnapshot. 2020-08-21 14:52:47 +01:00
Bjarke Berg
66a0125d3f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB7446-ModelsBuilderEmbedded-migration 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
 2020-08-21 13:26:00 +02:00
Bjarke Berg
1c3090b078 Remove files that should not have been added to git 2020-08-20 11:51:51 +02:00
Bjarke Berg
091a777b62 Conditional load of netframework dlls 2020-08-19 19:51:06 +02:00
Bjarke Berg
bd4c536a47 renamed Umbraco to umbraco 2020-08-19 12:49:04 +02:00
Bjarke Berg
9049469f70 Bugfix cannot parse StringValues as bool. Use ToString first. 2020-08-19 08:42:45 +02:00
Bjarke Berg
5f6de61391 Fix iss issue 2020-08-18 11:36:45 +02:00
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
9ae878a185 Hardcode verion 9 in text, and change assembly versions to 0.5.0 2020-08-17 09:34:27 +02:00
Bjarke Berg
7b95494e30 Merge pull request #8572 from umbraco/netcore/bugfix/6970-backoffice-controller 
Migrates remaining non-oauth actions on back office controller to netcore
 2020-08-17 08:29:59 +02:00
Bjarke Berg
f9ba200c21 LazyLoad casing 2020-08-16 11:30:49 +02:00
Bjarke Berg
95c30d4cd0 Fix for packages 2020-08-12 15:59:30 +02:00
Bjarke Berg
996130b58d Post merge fix 2020-08-12 13:26:24 +02:00
Bjarke Berg
3ec13b3190 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	build/NuSpecs/UmbracoCms.SqlCe.nuspec
 2020-08-12 13:25:24 +02:00
Bjarke Berg
cdd2dc51b4 Copy files on publish 2020-08-12 10:03:40 +02:00
Bjarke Berg
f7e0b115aa copy language files on publish 2020-08-11 15:00:39 +02:00
Bjarke Berg
7b6d64872f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 10:05:55 +02:00
Bjarke Berg
1481804014 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
 2020-08-11 10:01:17 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 08:33:11 +02:00
Bjarke Berg
3c2f2ac0b3 Netcore: Let build.ps1 create the dotnet new templates (#8591) 
* Creates the Umbraco.Templates.nuspec on build

* Update nuspec to match nuget packages

* Updated namespace of Program.cs and Startup.cs and replace these with the project name in templates

* Bugfixes for sqlce

* Simplified template to have one template with --UseSqlCe as option

* Update build/build.ps1

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-08-11 08:28:16 +02:00