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 |
|
Dinis Vieira
|
a31f15559f
|
PM-3350 Fix for colored html text on iOS
|
2023-11-11 15:05:51 +00:00 |
|
Dinis Vieira
|
e840dc2e30
|
Merge branch 'master' into feature/maui-migration
Fixed conflicts and added null check on ForwardEmailDomainName
# Conflicts:
# src/Core/Pages/Vault/CipherAddEditPage.xaml
# src/Core/Pages/Vault/CipherDetailsPage.xaml
# src/iOS.Core/Renderers/CollectionView/ExtendedGroupableItemsViewController.cs
|
2023-11-05 23:59:30 +00:00 |
|
Dinis Vieira
|
c6309173ba
|
PM-3349 PM-3350 Migrated IconLabelButton Frames to Borders to fix issue with TapGestureRecognizer in Android
Also fixed some minor "styles" for normal Button and IconLabelButton (both Android and iOS)
|
2023-11-04 17:48:59 +00:00 |
|
Dinis Vieira
|
3cdf1c2f0e
|
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 |
|
Federico Maccaroni
|
8ef9443b1e
|
PM-3349 PM-3350 MAUI Migration Initial
|
2023-09-29 11:02:19 -03:00 |
|
Kyle Spearrin
|
25d02cec25
|
load EEFLongWordList from file
|
2019-05-28 17:06:57 -04:00 |
|
Kyle Spearrin
|
576f44a924
|
DomainName helper class for getting base domain
|
2019-04-15 16:16:53 -04:00 |
|