yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,915 Commits 4 Branches 7 Tags
568ce57e6773d5db26e14ce2c86d9de52c19ed29
Commit Graph

35915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lyngsø
5d9389b37c adjust default size of umb-button-ellipsis and its apperance in umb-tree 2020-09-28 19:53:23 +02:00
Niels Lyngsø
956c81ff32 8.8 Revert icon styling, to ensure backwards compatibility (#8941) 2020-09-28 19:44:58 +02:00
Bjarke Berg
ee4de08653 Migrated more tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-28 15:43:28 +02:00
Mole
d750d2c2c1 Use generic logger more places and clean up 2020-09-28 14:59:17 +02:00
Niels Lyngsø
ebe3c26cb7 use block.edit() 2020-09-28 14:13:43 +02:00
Bjarke Berg
8dd3208e1c Migrated GetUmbracoMvcAreaNoCache tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-28 12:51:12 +02:00
Warren Buckley
1868c215d9 Merge pull request #8850 from umbraco/v8/feature/umb-property-info-button 
Review Feature: umb-property-info-button
 2020-09-28 11:49:24 +01:00
Bjarke Berg
5e7b34e3a3 Merge pull request #8960 from umbraco/v8/feature/configure-cypress-through-nodejs-install 
create enviroment configuration through install script
 2020-09-28 11:01:56 +02:00
Mole
b5aedde616 Do some ILogger cleaning 2020-09-28 08:48:49 +02:00
Bjarke Berg
46805cbf1d Merge remote-tracking branch 'origin/temp8-4742-no-assembly-scanning-for-dashboards' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
 2020-09-28 08:45:19 +02:00
Niels Lyngsø
b053ad1423 set to be required 2020-09-25 14:02:22 +02:00
Niels Lyngsø
b5374152a1 make baseUrl an optional part of configuration 2020-09-25 12:45:45 +02:00
Niels Lyngsø
4085468125 update dependency name 2020-09-25 12:01:40 +02:00
Niels Lyngsø
b46dad39ff only write config if file does not already exist 2020-09-25 11:50:57 +02:00
Niels Lyngsø
78724c11eb updated readme 2020-09-25 11:36:43 +02:00
Niels Lyngsø
9286282eca updated text 2020-09-25 11:36:28 +02:00
Niels Lyngsø
26905078ca create enviroment configuration through install script 2020-09-25 11:22:49 +02:00
Bjarke Berg
ddc2fea0e9 Migrated unit tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-25 09:41:56 +02:00
Sebastiaan Janssen
19b4035359 Merge branch 'v8/dev' into v8/contrib 2020-09-24 14:44:26 +02:00
Bjarke Berg
8109186499 Bump to alpha003 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-24 13:41:58 +02:00
Shannon
e4c5010759 Fixes issue with exceptions in logs because we are trying to unbind from httpapplication events but you cannot do that. 
(cherry picked from commit 5ed94065a7)
 2020-09-24 11:43:34 +02:00
Claus
f24c54acad bump version to 8.6.5 2020-09-24 11:38:08 +02:00
Shannon
5ed94065a7 Fixes issue with exceptions in logs because we are trying to unbind from httpapplication events but you cannot do that. 2020-09-24 18:45:26 +10:00
Mole
7369ffc5fd Change name of ContentApp back 2020-09-24 10:29:53 +02:00
Bjarke Berg
2779b19737 Fixed test 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-24 10:13:22 +02:00
Mole
25f13629cb Register logging before trying to use ILoggerFactory in UmbracoCoreServiceCollectionExtensions 
Before we used serviceProvider.GetService<ILoggerFactory>() with a service provider that were build before logging was configured, therefore the loggerfactory was empty and a lot of logs were missing
 2020-09-24 09:39:48 +02:00
Bjarke Berg
35443f0e71 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
 2020-09-24 08:24:35 +02:00
Bjarke Berg
1587d7f4b7 Changed test to use to use 0.5.0.0 version 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 19:46:53 +02:00
Bjarke Berg
cfc0722a5f Merge branch 'netcore/alpha002' into netcore/netcore 2020-09-23 18:25:22 +02:00
Bjarke Berg
0ba059903f Changed version in assembly to 0.5.0 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 18:24:31 +02:00
Bjarke Berg
88dfc0708b Added launchSettings to template 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 17:23:01 +02:00
Bjarke Berg
26a04ea2fe Added launchSettings to template 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 17:22:06 +02:00
Sebastiaan Janssen
fe3f604122 Move the IIconService and IconModel to the Umbraco.Core project 
See issue #8919

(cherry picked from commit 0531fce9e2)
 2020-09-23 16:21:34 +02:00
Sebastiaan Janssen
0531fce9e2 Move the IIconService and IconModel to the Umbraco.Core project 
See issue #8919
 2020-09-23 16:20:55 +02:00
Mole
0e737c0903 Use a SiriLogger that logs to console in UmbracoIntegrationTest 
AFAIK ConsoleLoggerFactory gets disposed when host is disposed causing all tests but the ones from the first test fixture to fail. As far as I'm aware it's not possible to make it not dispose ConsoleLoggerFactory, however it is possible with Sirilog
 2020-09-23 15:37:19 +02:00
Bjarke Berg
18dcf4975b update nuspec to use ImageSharp.Web 1.0.0 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 14:50:49 +02:00
Bjarke Berg
ec7db00bd2 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore 2020-09-23 14:29:42 +02: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
Bjarke Berg
435cf2623a Updated ImageSharp.Web to 1.0.0 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 14:00:08 +02:00
Mole
8258178c5a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
#	src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Tests/Models/MediaXmlTest.cs
#	src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
 2020-09-23 13:32:49 +02:00
Bjarke Berg
0d731e7a40 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	build/build-bootstrap.ps1
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs
#	src/Umbraco.Web/Logging/WebProfilerComponent.cs
 2020-09-23 13:28:36 +02:00
Mole
ca5868d52c Merge pull request #8771 from umbraco/netcore/bugfix/reset_password 
Fixed reset password for functionality
 2020-09-23 13:09:47 +02:00
Mole
2bd4f683f2 Remove empty line in BackOfficeController 2020-09-23 13:06:18 +02:00
Bjarke Berg
e3c8bd8ced Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Web/Security/MembershipHelper.cs
#	src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
 2020-09-23 12:54:13 +02:00
Sebastiaan Janssen
f5affd0521 Merge branch 'v8/8.6' into v8/8.7 2020-09-23 11:32:22 +02:00
Bjarke Berg
56820b164f Fixed issue in AngularValueResetPasswordCodeInfoScript 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 11:30:16 +02:00
Sebastiaan Janssen
75830e1d3e Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/Umbraco.Web/Security/MembershipHelper.cs
 2020-09-23 11:24:32 +02:00
Sebastiaan Janssen
f29c5f0e3b Merge branch 'v8/dev' into v8/contrib 2020-09-23 11:18:43 +02:00
Sebastiaan Janssen
95a46580d6 Merge branch 'v8/8.7' into v8/dev 2020-09-23 11:10:56 +02:00
Sebastiaan Janssen
d6275f34f7 Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/Umbraco.Web/Security/MembershipHelper.cs
 2020-09-23 11:09:40 +02:00