bitwarden-android/src/Core
Dinis Vieira eceb506c77
Merge branch 'master' into feature/maui-migration
Fixed conflicts

# Conflicts:
#	src/App/Resources/AppResources.cs.Designer.cs
#	src/App/Resources/AppResources.da.Designer.cs
#	src/App/Resources/AppResources.de.Designer.cs
#	src/App/Resources/AppResources.es.Designer.cs
#	src/App/Resources/AppResources.fi.Designer.cs
#	src/App/Resources/AppResources.fr.Designer.cs
#	src/App/Resources/AppResources.hi.Designer.cs
#	src/App/Resources/AppResources.hr.Designer.cs
#	src/App/Resources/AppResources.hu.Designer.cs
#	src/App/Resources/AppResources.id.Designer.cs
#	src/App/Resources/AppResources.it.Designer.cs
#	src/App/Resources/AppResources.ja.Designer.cs
#	src/App/Resources/AppResources.nl.Designer.cs
#	src/App/Resources/AppResources.pl.Designer.cs
#	src/App/Resources/AppResources.pt-BR.Designer.cs
#	src/App/Resources/AppResources.pt-PT.Designer.cs
#	src/App/Resources/AppResources.ro.Designer.cs
#	src/App/Resources/AppResources.ru.Designer.cs
#	src/App/Resources/AppResources.sk.Designer.cs
#	src/App/Resources/AppResources.sv.Designer.cs
#	src/App/Resources/AppResources.th.Designer.cs
#	src/App/Resources/AppResources.tr.Designer.cs
#	src/App/Resources/AppResources.uk.Designer.cs
#	src/App/Resources/AppResources.vi.Designer.cs
#	src/App/Resources/AppResources.zh-Hans.Designer.cs
#	src/App/Resources/AppResources.zh-Hant.Designer.cs
#	src/Core/Controls/Settings/BaseSettingControlView.cs
#	src/Core/Pages/Accounts/EnvironmentPageViewModel.cs
#	src/Core/Pages/Accounts/HomePage.xaml.cs
#	src/Core/Pages/Accounts/HomePageViewModel.cs
#	src/Core/Pages/Accounts/SetPasswordPageViewModel.cs
#	src/Core/Pages/Settings/SecuritySettingsPageViewModel.cs
#	src/Core/Pages/TabsPage.cs
#	src/Core/Services/StateMigrationService.cs
#	src/Core/Utilities/BoolToColorConverter.cs
2023-11-19 15:06:02 +00:00
..
Abstractions Merge branch 'master' into feature/maui-migration 2023-11-19 15:06:02 +00:00
Attributes EC-487 Added helper to localize enum values and also a converter to use in xaml (#2048) 2022-08-23 12:34:29 -03:00
Behaviors PM-3349 PM-3350 Added the partial MAUI Community Toolkit implementation for TouchEffect. This is a temporary solution until they finalize this and add it to their nuget package. 2023-11-13 09:59:54 +00:00
Controls Merge branch 'master' into feature/maui-migration 2023-11-19 15:06:02 +00:00
Effects PM-3349 Replaced the FabShadowEffect with the new MAUI Shadow to fix the buggy shadows on the Android Fab Button. 2023-10-16 00:47:52 +01:00
Enums [PM-2671] Update mobile client to use regions (#2798) 2023-11-07 12:15:32 +00:00
Exceptions [PM-3726] prevent legacy user login (#2769) 2023-09-20 15:56:51 -04:00
Lists PM-3349 PM-3350 Removed AsyncCommand "wrapper" and added AsyncRelayCommand directly in all ViewModels that were using the other one. 2023-11-16 22:31:01 +00:00
Models Merge branch 'master' into feature/maui-migration 2023-11-19 15:06:02 +00:00
Pages Merge branch 'master' into feature/maui-migration 2023-11-19 15:06:02 +00:00
Resources Merge branch 'master' into feature/maui-migration 2023-11-19 15:06:02 +00:00
Services Merge branch 'master' into feature/maui-migration 2023-11-19 15:06:02 +00:00
Utilities Merge branch 'master' into feature/maui-migration 2023-11-19 15:06:02 +00:00
App.xaml PM-3349 PM-3350 MAUI Migration Initial 2023-09-29 11:02:19 -03:00
App.xaml.cs Merge branch 'master' into feature/maui-migration 2023-11-19 15:06:02 +00:00
BitwardenIcons.cs [PM-1575] Display Passkeys (#2523) 2023-07-26 17:59:49 -03:00
Constants.cs [PM-3273][PM-4679] New owner/admin permission on login (#2837) 2023-11-09 17:21:00 +00:00
Core.csproj PM-3350 Updated PCL Crypto to latest alpha version to fix "Dll not found NCrypt" issue 2023-11-14 18:43:23 -03:00
ExternalLinksConstants.cs [PM-2658] Settings Reorganization feature (#2702) 2023-09-27 16:26:12 -03:00
MauiProgram.cs PM-3349 PRM-3350 Replaced XZing with Camera.MAUI for QRCodes 2023-10-23 15:17:14 +01:00