Commit Graph

432 Commits

Author SHA1 Message Date
Frank Rotermund 8b0ff57d69 MESSENGER-4258 Fixes from Testprotocol 2023-02-16 15:40:21 +01:00
Arnfried Griesert 4264e3b02f MESSENGER-4034 app icon name 2023-02-08 14:53:45 +00: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 c156f76ec5 Refine MXKEventFormatter 2023-01-10 12:20:34 +01:00
Alfonso Grillo d965becd7a Fix poll.end read receipts 2023-01-10 12:20:34 +01:00
Alfonso Grillo 43d4ceb101 Cleanup code 2023-01-10 12:20:34 +01:00
Alfonso Grillo 64f904f8dd Fix reactions layout 2023-01-10 12:19:39 +01:00
Alfonso Grillo 96fca04471 Remove filter for poll.end events 2023-01-10 12:17:15 +01:00
Nicolas Mauri 15c68bfe3d Ensures that we only support reactions for a start event 2023-01-09 14:46:26 +01:00
Nicolas Mauri 94d14c581c add support for reactions on VB (#7179) 2023-01-06 12:18:19 +01:00
Alfonso Grillo 7b25ef20ee Amend comment 2023-01-03 13:25:56 +01:00
Alfonso Grillo 27c43d38c7 Fix navigation to replied message 2023-01-02 19:49:52 +01:00
Yoan Pintas f6670ec5d0 Update the room description in the rooms list in case of live broadcast (incoming or outgoing) (#7160) 2022-12-19 19:26:55 +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
Mauro Romito 71ceb2fc40 fix that works both iOS 15 and iOS 16 2022-12-15 16:33:25 +01:00
Velin92 1877206ab1 Merge pull request #7170 from vector-im/mauroromito/7109_fix_formatted_links
Fix for formatted links appearing in black
2022-12-15 12:37:38 +01:00
Mauro Romito 43729bd3a4 better comment 2022-12-15 12:36:44 +01:00
Mauro Romito aea1be4512 code improvement 2022-12-15 03:40:15 +01:00
Mauro Romito 6dca14ac2e better comment 2022-12-15 03:37:15 +01:00
Mauro Romito 0d569a28ff removed unused code 2022-12-15 01:44:26 +01:00
Mauro Romito da9b181fed fix 2022-12-15 01:41:45 +01:00
Andy Uhnak 9022362c7b Fix Sentry errors 2022-12-14 17:25:27 +00:00
Gil Eluard dd48718abe Merge pull request #7152 from vector-im/gil/7151-Thread_preview_doesnt_update_in_main_timeline
Thread preview doesn't update in main timeline
2022-12-09 15:55:59 +01:00
Gil Eluard 1254d12a51 Thread preview doesn't update in main timeline
- Fixed
2022-12-09 14:58:07 +01:00
Anderas 2e58d5ad80 Merge pull request #7115 from vector-im/andy/mandatory_crypto
Do not retry initial sync on fatal errors
2022-12-05 17:48:42 +00:00
Andy Uhnak 9104af5d05 Change fatal error range 2022-12-05 16:29:14 +00:00
Philippe Loriaux 76936e0e7c Remove the voice broadcast chunks from the attachments list 2022-12-02 11:51:33 +01:00
Frank Rotermund c30040c3a8 Feature/3732 pin login in new login flow 2022-11-29 10:56:18 +00:00
Andy Uhnak 3ae3271be2 Do not retry initial sync on fatal errors 2022-11-29 10:15:05 +00:00
Mauro Romito 9d77f65ac2 full screen improvements 2022-11-15 18:56:00 +01:00
Frank Rotermund 4510f99412 Merge branch 'feature/3880_pdf_sharing' into 'develop'
MESSENGER-3880 disallow pdf sharing

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!46
2022-11-15 15:39:43 +00:00
Frank Rotermund f4d1aac5f5 MESSENGER-3880 disallow pdf sharing 2022-11-15 16:28:42 +01:00
Frank Rotermund ef1294f0cb PSB-196 fix message bubbles by removing timestamps 2022-11-15 15:26:53 +01:00
Anderas b0b95f7053 Merge pull request #7068 from vector-im/andy/repeat_sync
Remove 10s wait on failed initial sync
2022-11-14 08:39:08 +00:00
Gil Eluard bd414aad2e Threads: removed "unread_thread_notifications" from sync filters for server that doesn't support MSC3773
- Update after review
2022-11-10 22:50:26 +01:00
Andy Uhnak 1eeaebfd8b Remove 10s wait on failed initial sync 2022-11-10 16:15:16 +00:00
Gil Eluard eb6d475f92 Threads: removed "unread_thread_notifications" from sync filters for server that doesn't support MSC3773 2022-11-10 13:22:55 +01:00
Stefan Ceriu 554280939b Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation 2022-11-08 14:46:44 +02:00
Stefan Ceriu 450af545a5 Revert "Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation (#6679)"
This reverts commit bd017d1a77.
2022-11-08 14:46:44 +02:00
Stefan Ceriu 1512133704 Revert "Fix timeline items text height calculation"
This reverts commit 27f4feb8d9.
2022-11-08 14:46:44 +02:00
Stefan Ceriu e00d8ee761 Revert "Replace attributed string height calculation with a more reliable implementation"
This reverts commit 47512127ec.
2022-11-08 14:46:44 +02:00
Gil Eluard 1648d49d1a 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 f85b218b57 Merge branch 'gil/6663-MSC3771_read_receipts_for_threads' into gil/7029-Threads_add_support_to_labs_flag_for_read_receipts 2022-11-03 13:35:24 +01:00
Gil Eluard 02ef0ae6e6 Merge branch 'gil/6663-MSC3771_read_receipts_for_threads' into gil/6664-MSC3773_notifications_for_threads 2022-11-03 13:35:01 +01:00
Gil Eluard 24bde96cec Merge branch 'develop' into gil/6663-MSC3771_read_receipts_for_threads 2022-11-03 13:34:27 +01:00
Gil Eluard 3d5ae643cd Threads: add support to labs flag for read receipts 2022-11-02 23:42:53 +01:00
Gil Eluard b6b4288cde Threads: added support to read receipts (MSC3771)
- Update after review
2022-11-02 15:23:54 +01:00
Frank Rotermund f4ca302faa Merge commit 'ace42be63764c1f1aec82d6e3448ca8980adc784' into feature/3746_merge_element_1.9.10
# Conflicts:
#	Config/AppConfiguration.swift
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Common/Avatar/AvatarView.swift
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	Riot/target.yml
#	fastlane/Fastfile
#	project.yml
2022-11-02 14:05:36 +01:00
Gil Eluard 2bf744cad2 Threads: added support to notifications count (MSC3773) 2022-11-01 22:57:39 +01:00
Gil Eluard 6bff73125d Threads: added support to read receipts (MSC3771)
- Update after review
2022-11-01 22:48:47 +01:00