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

48 Commits

Author SHA1 Message Date
Shannon
457fb1c45d Merge branch 'netcore/netcore' into netcore/bugfix/smidge-nuglify 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-10-15 14:45:15 +11:00
Bjarke Berg
acc7065fa1 Fixed issue with models builder 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 14:22:53 +02:00
Mole
75608919cd Merge pull request #8925 from umbraco/netcore/feature/use-serilog-to-log-all-messages 
Netcore: Use serilog to log all messages and use appsettings as config
 2020-09-23 09:37:43 +02:00
Bjarke Berg
6fdf7082a0 Fixed issue models builder config and changed default mode to nothing 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 14:16:00 +02:00
berg
f11391961f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/use-serilog-to-log-all-messages 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web/UmbracoApplicationBase.cs
 2020-09-18 08:31:09 +02:00
berg
738bdfbbdd Moved umbraco file logging into minimal config 
Signed-off-by: berg <mail@bergmania.dk>
 2020-09-18 07:46:36 +02:00
Bjarke Berg
380bec0e2f Fixed wrong config file path 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-18 07:05:40 +02:00
Bjarke Berg
8b7a2f490d remove connectionstring from config 2020-09-17 09:38:50 +02:00
Bjarke Berg
7d3bc9be1c Moved serilog config to appsettings and configured it to also catch MS logging messages. 
Added Console log for Development
 2020-09-17 09:01:10 +02:00
Bjarke Berg
ce2da18304 Fixed based on review comments 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-14 21:27:31 +02:00
Bjarke Berg
8141e7c6c8 Bugfix 2020-09-14 14:35:57 +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
Nikolaj
2bb3612bcb Enable models builder 2020-09-08 10:57:15 +02:00
Nikolaj
00b30f74c7 Fix 2020-09-07 09:06:46 +02:00
Nikolaj
8fd1d0a867 Add appsettings change 2020-09-02 14:47:18 +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
c0d4516e15 Updated default config files 2020-08-24 14:15:53 +02:00
Bjarke Berg
379454cd4b fix appsettings.json 2020-08-07 14:36:45 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Bjarke Berg
c672f61c53 Revert appsettings.json 2020-08-04 08:14:30 +02:00
Shannon
4edf7fdf83 Ensure all back office controllers are plugin controllers and use constant 2020-08-04 12:27:21 +10:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Shannon
7f47540341 ensure bg image is set in config so it shows up 2020-05-26 18:21:00 +10:00
Elitsa Marinovska
16d805e6f5 Adding Smtp section in appsettings, registering IEmailSender as an email service and ofc the MailKit nuget in Infrastructure proj 2020-05-20 00:24:55 +02:00
Bjarke Berg
e3f9b94fd0 AB#6233 - Added HttpPost to ensure only posts are possible 2020-05-07 10:13:54 +02:00
Bjarke Berg
e4dfdbb504 AB#6233 - renamed extensions namespace to Umbraco.Extensions 2020-05-07 10:08:23 +02:00
Bjarke Berg
8f7c022f2d AB#6233 - Handle ApplicationUrl 2020-05-07 09:34:16 +02:00
Bjarke Berg
13197eb5ff AB#6233 - Cleanup / Fixes from review 2020-05-05 14:28:01 +02:00
Bjarke Berg
305ed42b48 Moved the sqlce db to root/App_Data/umbraco.sdf, instead of wwwroot/App_Data/umbraco.sdf 2020-05-04 14:40:11 +02:00
Bjarke Berg
f3d81702ac AB#6233 - revert connectionstring 2020-05-01 13:47:44 +02:00
Bjarke Berg
da1e83c0d1 AB#6233 - Added application url on IHostingEnvironment. Still need a way to figure out how to get this value 2020-05-01 08:26:05 +02:00
Bjarke Berg
59501eba86 AB#6233 - Cleanup 2020-04-29 16:11:56 +02:00
Bjarke Berg
64dfa009f5 #6233 - version in config removed 2020-04-28 12:31:15 +02:00
Bjarke Berg
bc4713a51c #6233- SqlCE stuff 2020-04-28 07:02:14 +02:00
Shannon
60abdd60b5 Starts fixing up integration tests 2020-04-03 13:16:01 +11:00
Bjarke Berg
55426515c0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-03-31 15:36:25 +02:00
Bjarke Berg
117bfd1f12 AB#8522 - Smidge reset updates the version string to the current ticks 2020-03-31 10:47:08 +02:00
Bjarke Berg
ffc6ce6553 AB#8522 - Smidge implementation of the Runtime Minifier 2020-03-30 21:27:35 +02:00
Bjarke Berg
8a0f031d6d AB#5822 - Moved config 2020-03-25 13:29:40 +01:00
Bjarke Berg
92afbfc6fc AB#5820 - Initialize the webprofiler in asp.net core 2020-03-25 05:39:25 +01:00
Elitsa Marinovska
ccfaebb09f More of the Smidge initial implementation. Adding TODOs for next steps 2020-03-24 17:34:34 +01:00
Elitsa Marinovska
85730eadb0 Setting up Smidge 2020-03-24 10:51:53 +01:00
Bjarke Berg
b93b4f7c4f Changed CharCollection input to not special case : 2020-03-19 18:43:39 +01:00
Bjarke Berg
00418959f2 Extracted IConfigManipulator from IConnectionStrings, and implemented a XML (legacy) and JSON version. 2020-03-18 19:17:51 +01:00
Bjarke Berg
3e75c889ab Imaging settings 2020-03-17 17:56:00 +01:00
Bjarke Berg
51879c0b80 Implemented config for asp.net core 2020-03-16 14:02:08 +01:00
Bjarke Berg
5517186cb7 Added Web.Website 2020-02-24 10:51:48 +01:00