 JanNiklas Grabowski
|
b4d4330109
|
Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' into feature/4260_merge_foss_1_10_2
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
# Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
# Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
# Riot/Modules/Home/AllChats/AllChatsViewController.swift
# Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
# Riot/Modules/Room/Settings/RoomSettingsViewController.m
# fastlane/Fastfile
|
2023-02-15 14:56:55 +01:00 |
|
 Arnfried Griesert
|
10e66e2e96
|
merged release_2_2_0 into develop
|
2023-01-24 09:24:47 +01:00 |
|
|
Arnfried Griesert
|
cbc4903e34
|
Updated element version to 1.9.14
|
2023-01-16 14:03:41 +01:00 |
|
 Frank Rotermund
|
d9057cd0cb
|
Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' into feature/4068_merge_foss_1_9_15
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile.lock
# Riot/Assets/de.lproj/Localizable.strings
# Riot/Modules/Room/RoomViewController.m
# RiotNSE/NotificationService.swift
# fastlane/Fastfile
|
2023-01-16 12:11:51 +01:00 |
|
 Alfonso Grillo
|
5b99d71824
|
Inject AvatarViewMode as EnvironmentObject
|
2023-01-13 12:57:21 +01:00 |
|
|
Alfonso Grillo
|
2b9a6b69c1
|
Fix UTs
|
2022-12-30 12:13:56 +01:00 |
|
|
Alfonso Grillo
|
830b6d0cd2
|
Fix display session name
|
2022-12-30 11:37:06 +01:00 |
|
|
Alfonso Grillo
|
3fcdb9fe99
|
Update fonts
|
2022-12-19 17:59:38 +01:00 |
|
|
Alfonso Grillo
|
dfe55587d4
|
Update chevron image
|
2022-12-19 15:12:52 +01:00 |
|
|
Frank Rotermund
|
67dd4f918e
|
Merge commit '35b2fdc538dfc1f8fac2585704526ab26148a9ab' into feature/3977_merge_element_1_9_13
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile.lock
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
# Riot/Modules/LaunchLoading/LaunchLoadingView.swift
# Riot/Modules/LaunchLoading/LaunchLoadingView.xib
# Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
# Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
# Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
# Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
# Riot/Modules/TabBar/MasterTabBarController.m
# fastlane/Fastfile
|
2022-12-19 14:36:30 +01:00 |
|
|
Alfonso Grillo
|
394e12e8e5
|
Fix UI tests
|
2022-12-16 18:23:40 +01:00 |
|
|
Alfonso Grillo
|
23958190f1
|
Fix chevron icon
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
581477ce3f
|
Add line limit for sessions’ names
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
d7bbc0d2ab
|
Fix font
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
b01ef74fc2
|
Fix UserSessionOverview layout
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
5443ca28bc
|
Fix icon alignment in UserSessionListItem
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
cc89ee9f47
|
Fix shield size in UserSessionCardView
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
d9a319e0d2
|
Add missing separators in UserSessionsOverview
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
5c19963ab5
|
Fix borders
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
cc2c1344b9
|
Fix UserSessionCardView cta top padding
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
3e5a9dad40
|
Fix paddings in UserSessionsOverview
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
44d471f45a
|
Refine UserOtherSessionsHeaderView layout
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
4d5c8b3fd5
|
SecurityRecommendationCard H spacing
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
a42ee97be0
|
Fix security recommendations layout
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
a8565d9587
|
Hide verification badge in session card
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
1a1b289180
|
Fix background color in session details
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
c172e13e12
|
Fix nav bar item color
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
ffeced9dfd
|
Fix border color
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
bd58a47d8d
|
Fix landscape layout in UserSessionsOverview
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
aff42bb277
|
Fix info in UserSessionCardView
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
11af3ce809
|
Remove long press interaction from sessions list
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
a39d503f94
|
Fix security card tappability
|
2022-12-16 17:44:54 +01:00 |
|
|
Alfonso Grillo
|
5e9730adf1
|
Refine UTs
|
2022-12-13 15:45:37 +01:00 |
|
|
Alfonso Grillo
|
ad3028257a
|
Add UTs
|
2022-12-13 15:35:18 +01:00 |
|
|
Alfonso Grillo
|
e776e6944d
|
Delete old devices in account data
|
2022-12-13 14:19:55 +01:00 |
|
|
Alfonso Grillo
|
ea6fcb1e36
|
Fix test
|
2022-12-05 19:43:29 +01:00 |
|
|
Alfonso Grillo
|
c76dbb7a5b
|
Update copies
|
2022-12-05 17:20:20 +01:00 |
|
|
Alfonso Grillo
|
363eedbad0
|
Add VerificationState.isUnverified
|
2022-11-18 10:50:53 +01:00 |
|
|
Alfonso Grillo
|
e08e6e9d00
|
Improve unit tests
|
2022-11-16 11:52:22 +01:00 |
|
|
Alfonso Grillo
|
679c2c251b
|
Add tests
|
2022-11-16 11:18:03 +01:00 |
|
|
Alfonso Grillo
|
59b3b25050
|
Add localisation for UserSessionCardViewData
|
2022-11-16 10:42:08 +01:00 |
|
|
Alfonso Grillo
|
de9b77c754
|
Fix verification state algorithm
|
2022-11-16 10:29:04 +01:00 |
|
 Alfonso Grillo
|
f73bb70129
|
Merge pull request #7065 from vector-im/alfogrillo/increase_dm_code_coverage
Increase dm code coverage (PSG-925)
|
2022-11-11 18:46:02 +01:00 |
|
|
Alfonso Grillo
|
a01f18e9ff
|
Fix accessibility id in UserOtherSessions
|
2022-11-11 16:18:27 +01:00 |
|
 paleksandrs
|
5d6bb6430b
|
Fixup session list item is not tappable everywhere
|
2022-11-11 09:55:33 +02:00 |
|
|
paleksandrs
|
8a0e07ae0a
|
Revert "Device Manager: Session list item is not tappable everywhere"
This reverts commit 221f4ad106.
|
2022-11-11 09:29:55 +02:00 |
|
|
Alfonso Grillo
|
9dd329fa01
|
Cleanup unused code
|
2022-11-10 12:12:32 +01:00 |
|
|
Alfonso Grillo
|
2e791eed56
|
Fix typo
|
2022-11-10 11:29:36 +01:00 |
|
|
Alfonso Grillo
|
1ccd53b51b
|
Test empty state for UserOtherSessions
|
2022-11-10 11:16:02 +01:00 |
|
|
Alfonso Grillo
|
97292d43bd
|
Improve UserSessionNameViewModelTests
|
2022-11-10 10:57:14 +01:00 |
|