yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,363 Commits 4 Branches 7 Tags
093548b933d78a238d85ca56232a4c045a4e648a
Commit Graph

11663 Commits

Author SHA1 Message Date
Mole
f13f754bf0 Removed old JsonNetResult, MinifyJavaScriptResultAttribute, UmbracoViewPage 2020-10-14 14:19:18 +02:00
Mole
e2b1fb335e Remove old UmbracoAuthorizedJsonController 2020-10-14 13:46:08 +02:00
Mole
296217c917 Remove old BackOfficeServerVariables and LightInjectContainer 2020-10-14 13:40:10 +02:00
ChadC
f12f539d84 Prevent InvalidCastException being thrown when ContentPicker has picked a UDI. Trying to convert to an int will fail for Udis with an InvalidCastException. 2020-10-14 09:13:00 +10:00
Sebastiaan Janssen
e1e7a1777e Merge branch 'v8/8.8' into v8/8.9 2020-10-13 16:49:17 +02:00
Sebastiaan Janssen
7a8c9b1167 Merge branch 'v8/8.8' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-10-13 16:48:39 +02:00
Sebastiaan Janssen
2d55d54a44 Merge branch 'v8/8.7' into v8/8.8 2020-10-13 16:47:38 +02:00
Sebastiaan Janssen
8778e9c84d Merge branch 'v8/8.6' into v8/8.7 2020-10-13 16:46:14 +02:00
Sebastiaan Janssen
841c4b5012 Merge branch 'v8/8.6' into v8/dev 2020-10-13 16:45:27 +02:00
Arkadiusz Biel
b96776949f make composers and components public 
(cherry picked from commit f288a63342)
 2020-10-13 16:41:26 +02:00
Arkadiusz Biel
f288a63342 make composers and components public 2020-10-13 16:40:52 +02:00
Mole
9e5fda6c42 Remove old UnhandedExceptionLoggerConfigurationAttribute and UnhandledExceptionLogger 2020-10-13 13:05:08 +02:00
Mole
50f4d7abde Migrate UmbracoUserTimeoutFilterAttribute 2020-10-12 13:32:25 +02:00
Niels Lyngsø
dc072293f9 New dialogs for asking about Preview mode 2020-10-08 16:36:25 +02:00
Bjarke Berg
c7cdfaa775 Update nuget packages 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-08 14:49:24 +02:00
Warren Buckley
cf7b7a7ed1 More mappings - this seems to have fixed it. Got to update tests & verify export/import doctype to UDA & package.xml export/import 2020-10-07 20:20:13 +01:00
Mole
17c68176e0 Merge pull request #9100 from umbraco/netcore/task/6964-legacy-password-format 
Adds support for the super old password format so we can handle upgrades
 2020-10-07 11:25:51 +02:00
Bjarke Berg
d31fbdf7bb Fix csproj 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-07 09:34:14 +02:00
Bjarke Berg
fa6b79eba7 post merge fixes Clean up after merge 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-07 09:32:15 +02:00
Bjarke Berg
b7e5d28584 Merge remote-tracking branch 'origin/v8/dev' into netcore/merge_umbraco_id_into_netcore_dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Factories/ExternalLoginFactory.cs
#	src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
#	src/Umbraco.Core/Services/IExternalLoginService.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ExternalLoginService.cs
#	src/Umbraco.Tests/Services/ExternalLoginServiceTests.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web/OwinExtensions.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Security/BackOfficeUserStore.cs
#	src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web/Security/MembershipProviderBase.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-10-07 09:06:40 +02:00
Bjarke Berg
c4cedceda1 Merge 2020-10-07 08:49:37 +02:00
Shannon
eaa295095d Gets password roll forward working 2020-10-07 16:56:48 +11:00
Shannon
e5c272b5d2 Adds support for the super old password format so we can handle upgrades 2020-10-07 15:20:43 +11:00
Bjarke Berg
3551d6e65e Clean up and fixed todos 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-06 21:23:15 +02:00
Søren Kottal
d7bf980f12 Adds icons from App_Plugins/**/Icons/*.svg (#8884) 
(cherry picked from commit 3b551bdc5d)
 2020-10-06 15:09:56 +02:00
Søren Kottal
3b551bdc5d Adds icons from App_Plugins/**/Icons/*.svg (#8884) 2020-10-06 15:06:03 +02:00
Bjarke Berg
a56e3615d1 Merge remote-tracking branch 'origin/netcore/feature/migrate-logging' into netcore/feature/migrate-logging 2020-10-06 11:41:52 +02:00
Sebastiaan Janssen
29a6b7a5c0 Merge branch 'v8/8.8' into v8/8.9 2020-10-06 09:13:54 +02:00
Sebastiaan Janssen
cfd20833c7 Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
 2020-10-06 09:12:35 +02:00
Mole
7a8a7104c7 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
 2020-10-06 08:13:29 +02:00
Sebastiaan Janssen
e9627f2ee9 Merge branch 'v8/dev' into v8/contrib 2020-10-05 21:12:51 +02:00
Sebastiaan Janssen
ed24a695e4 Merge branch 'v8/8.9' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-10-05 20:58:47 +02:00
Ronald Barendse
2bfef74191 Fix casing of 'URL' (#9080) 2020-10-05 20:48:38 +02:00
Bjarke Berg
b729c44505 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	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/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
 2020-10-02 16:43:23 +02:00
Bjarke Berg
2b7980fcb9 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Services/IIconService.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Services/IconService.cs
 2020-10-02 16:38:12 +02:00
Warren Buckley
7e34dda131 Trying more things & prep for dealing with package XML for Label On Top 2020-10-02 15:08:24 +01:00
Warren Buckley
1b7f095048 Trying to get the model mapping done correctly - but still stuggling. 
This can be persisited to DB correctly but does not hydrate model correctly back to a model
 2020-10-02 13:32:23 +01:00
Niels Lyngsø
c264cc9691 configure label position on Property level 2020-10-01 17:30:03 +02:00
Niels Lyngsø
d14e9ee3b4 revert POC approach 2020-10-01 17:29:52 +02:00
Niels Lyngsø
5a96b1cd8d Merge branch 'v8/dev' into v8/feature/property-label-on-top 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs
 2020-10-01 16:15:31 +02:00
Claus
978d245f00 Merge remote-tracking branch 'origin/v8/8.8' into v8/8.9 2020-10-01 12:37:56 +02:00
Claus
94d4fef088 Merge remote-tracking branch 'origin/v8/8.6' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Logging/WebProfilerComponent.cs
 2020-10-01 08:55:28 +02:00
Bjarke Berg
74f8c6fb74 Clean up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-01 08:15:34 +02:00
Bjarke Berg
3b1f7ad042 Clean up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-01 07:41:23 +02:00
Bjarke Berg
3607dd14f1 Clean up + Removed old SignalR code 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-01 07:09:54 +02:00
Bjarke Berg
81e2ebda96 Cleanup 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-29 10:42:06 +02:00
Sebastiaan Janssen
0a08c668a9 Merge branch 'v8/8.6' into v8/8.7 
# Conflicts:
#	src/SolutionInfo.cs
 2020-09-28 19:59:47 +02:00
Mole
d750d2c2c1 Use generic logger more places and clean up 2020-09-28 14:59:17 +02:00
Mole
b5aedde616 Do some ILogger cleaning 2020-09-28 08:48:49 +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