Commit graph

17534 commits

Author SHA1 Message Date
Alfonso Grillo
5b334906d2
Merge pull request #6992 from vector-im/alfogrillo/learn_more_sheet
Add informational sheet for sessions (PSG-714)
2022-11-09 17:49:15 +01:00
aringenbach
58f5c43546
Merge pull request #7053 from vector-im/aringenbach/7052_fix_text_formatting_toggle
Rich-text editor: Fix text formatting enabled inconsistent state
2022-11-09 14:16:30 +01:00
Alfonso Grillo
794a071ac0 Add intrinsic sized bottom sheet 2022-11-09 12:05:47 +01:00
aringenbach
2184f1fdf5
Merge pull request #6993 from vector-im/aringenbach/6962_slash_commands
Fixed IRC-style message and commands support in Rich text editor
2022-11-09 10:31:14 +01:00
aringenbach
f611351e70 Rich-text editor: Fix text formatting enabled inconsistent state 2022-11-09 10:26:48 +01:00
Stefan Ceriu
c69c3b9bda Switch to using an API key for interactions with AppStoreConnect while on CI; update fastlane and dependencies 2022-11-09 10:53:20 +02:00
Alfonso Grillo
ab00c7e400 Refine bottom sheet layout 2022-11-08 18:04:42 +01:00
Alfonso Grillo
d5c3bd2e48 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-08 17:04:20 +01:00
Stefan Ceriu
b369ce6d7c Prepare for new sprint 2022-11-08 15:20:50 +02:00
Stefan Ceriu
57eacf83b6 Merge branch 'master' into develop 2022-11-08 15:20:46 +02:00
Stefan Ceriu
3cec6d38ca Merge branch 'release/1.9.11/master' 2022-11-08 15:20:41 +02:00
Stefan Ceriu
a28595385e finish version++ 2022-11-08 15:20:41 +02:00
Stefan Ceriu
2735ac94bf version++ 2022-11-08 15:16:55 +02:00
Stefan Ceriu
1533ad1e79 Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation 2022-11-08 15:16:55 +02:00
Stefan Ceriu
f3723a8fa7 Revert "Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation (#6679)"
This reverts commit 405c2d8e32.
2022-11-08 15:16:55 +02:00
Stefan Ceriu
f0b3395ccd Revert "Fix timeline items text height calculation"
This reverts commit 8f9eddee50.
2022-11-08 15:16:55 +02:00
Stefan Ceriu
4483b9795e Revert "Replace attributed string height calculation with a more reliable implementation"
This reverts commit 81773cd1e5.
2022-11-08 15:16:55 +02:00
Stefan Ceriu
53798be947 Prevent Unable to activate constraint with anchors .. because they have no common ancestor. crashes. Only link toasts to the top safe area instead of the navigation controller 2022-11-08 15:16:55 +02:00
Stefan Ceriu
081dff7140 Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation 2022-11-08 14:46:44 +02:00
Stefan Ceriu
a76f88fae9 Revert "Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation (#6679)"
This reverts commit 405c2d8e32.
2022-11-08 14:46:44 +02:00
Stefan Ceriu
996624e117 Revert "Fix timeline items text height calculation"
This reverts commit 8f9eddee50.
2022-11-08 14:46:44 +02:00
Stefan Ceriu
e1d55c690e Revert "Replace attributed string height calculation with a more reliable implementation"
This reverts commit 81773cd1e5.
2022-11-08 14:46:44 +02:00
Stefan Ceriu
01714ad000 Prevent Unable to activate constraint with anchors .. because they have no common ancestor. crashes. Only link toasts to the top safe area instead of the navigation controller 2022-11-07 17:38:25 +02:00
aringenbach
bacad0df3c
Merge pull request #6982 from vector-im/resilience-rc
Resilience rc
2022-11-07 15:57:09 +01:00
aringenbach
0742641beb Remove indication about plain text mode coming soon 2022-11-07 15:24:39 +01:00
aringenbach
37355b0976 Merge branch 'develop' into resilience-rc
# Conflicts:
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
#	project.yml
2022-11-07 15:05:25 +01:00
Aleksandrs Proskurins
475e887463
Merge pull request #7023 from vector-im/aleksandrs/7022_hide_push
Hide push toggles for http pushers when there is no server support
2022-11-07 15:24:25 +02:00
Gil Eluard
7ff30ee450
Merge pull request #7039 from vector-im/gil/7038-Threads_notification_count_in_main_timeline_including_unparticipated_threads
Threads notification count in main timeline including un participated…
2022-11-07 11:21:22 +01:00
Aleksandrs Proskurins
3c2b4a3d93
Merge pull request #7037 from vector-im/aleksandrs/7035_session_list_item_tap_fix
Device Manager: Session list item is not tappable everywhere
2022-11-07 08:36:44 +02:00
Gil Eluard
d005344905 Threads notification count in main timeline including un participated threads 2022-11-04 17:21:27 +01:00
paleksandrs
ef5aa4de14 changelog 2022-11-04 15:51:22 +02:00
paleksandrs
e6367cba4c Device Manager: Session list item is not tappable everywhere 2022-11-04 15:50:37 +02:00
Gil Eluard
43f2abeaef
Merge pull request #7030 from vector-im/gil/7029-Threads_add_support_to_labs_flag_for_read_receipts
Threads: add support to labs flag for read receipts
2022-11-04 13:38:59 +01:00
Gil Eluard
0fbc10472e
Merge pull request #7020 from vector-im/gil/6664-MSC3773_notifications_for_threads
Threads: added support to notifications count (MSC3773)
2022-11-04 13:38:50 +01:00
Gil Eluard
430473a214
Merge pull request #6964 from vector-im/gil/6663-MSC3771_read_receipts_for_threads
Threads: added support to read receipts (MSC3771)
2022-11-04 13:38:39 +01:00
Alfonso Grillo
d1560ded5d Amend copies 2022-11-04 12:53:57 +01:00
Gil Eluard
f790148c68 Merge branch 'gil/6663-MSC3771_read_receipts_for_threads' into gil/7029-Threads_add_support_to_labs_flag_for_read_receipts 2022-11-04 11:08:53 +01:00
Gil Eluard
5fbe3fd916 Merge branch 'gil/6663-MSC3771_read_receipts_for_threads' into gil/6664-MSC3773_notifications_for_threads 2022-11-04 11:08:41 +01:00
Gil Eluard
86f2074776 Merge branch 'develop' into gil/6663-MSC3771_read_receipts_for_threads 2022-11-04 11:07:13 +01:00
Alfonso Grillo
5b7343853b Amend title font 2022-11-04 11:06:01 +01:00
Alfonso Grillo
455118d22b Merge branch 'develop' into alfogrillo/learn_more_sheet
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift
2022-11-03 18:25:06 +01:00
Alfonso Grillo
09e9f3e176 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-03 17:29:01 +01:00
Alfonso Grillo
8f23b4623e
Merge pull request #7028 from vector-im/alfogrillo/show_ip_feature
Show/Hide IP in device manager (PSG-804)
2022-11-03 17:28:25 +01:00
Alfonso Grillo
3678a522db Fix failing test 2022-11-03 15:30:13 +01:00
Alfonso Grillo
4a98acda3c Add animations 2022-11-03 14:55:33 +01:00
Alfonso Grillo
164e1d103d Cleanup merge leftovers 2022-11-03 14:50:46 +01:00
Alfonso Grillo
110dfbc2ba Fix UTs 2022-11-03 14:47:09 +01:00
Alfonso Grillo
398cbd23da Add changelog.d file 2022-11-03 14:47:09 +01:00
Alfonso Grillo
5e143ed0ef Inject setting service in UserSessionOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo
765a3590a2 Add settings service in UserOtherSessionsViewModel 2022-11-03 14:47:09 +01:00