 Frank Rotermund
|
9f6deb9110
|
Merge commit '2e9bb7067e9f1596f29b986729822184145906db' 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 |
|
 Nicolas Mauri
|
36188fdcf3
|
Code cleanup
|
2023-01-13 15:29:51 +01:00 |
|
|
Nicolas Mauri
|
3aefcd579f
|
Fix how is resent a voice broadcast chunk
|
2023-01-13 08:33:30 +01:00 |
|
 Mauro Romito
|
4c81b71afd
|
replaced UIColor link with ThemeService links color everywhere it was used, and included the ThemeService in NSE and SiriIntents
|
2023-01-12 17:54:44 +01:00 |
|
|
Mauro Romito
|
a9f9b77fb5
|
added the links color wherever possible
|
2023-01-12 16:45:43 +01:00 |
|
|
Mauro Romito
|
6662be9d66
|
fixed a test and some code improvements
|
2023-01-12 10:41:52 +01:00 |
|
|
Mauro Romito
|
5641e350b0
|
done
|
2023-01-11 23:40:35 +01:00 |
|
|
Mauro Romito
|
b843daf5e0
|
this is required to enable custom colors for specific links
|
2023-01-11 21:39:09 +01:00 |
|
|
Mauro Romito
|
3c2ab08e02
|
fix
|
2023-01-11 21:29:02 +01:00 |
|
 Flavio Alescio
|
8fd6baa3c9
|
Add mark as unread option for rooms
|
2023-01-10 16:13:14 +01:00 |
|
 Alfonso Grillo
|
40ea4406dc
|
Refine MXKEventFormatter
|
2023-01-10 12:20:34 +01:00 |
|
|
Alfonso Grillo
|
8b9de882e9
|
Fix poll.end read receipts
|
2023-01-10 12:20:34 +01:00 |
|
|
Alfonso Grillo
|
8596b36257
|
Cleanup code
|
2023-01-10 12:20:34 +01:00 |
|
|
Alfonso Grillo
|
4bc37ba146
|
Fix reactions layout
|
2023-01-10 12:19:39 +01:00 |
|
|
Alfonso Grillo
|
562f36775d
|
Remove filter for poll.end events
|
2023-01-10 12:17:15 +01:00 |
|
|
Nicolas Mauri
|
9845d161a5
|
Ensures that we only support reactions for a start event
|
2023-01-09 14:46:26 +01:00 |
|
|
Nicolas Mauri
|
315bed3fe6
|
add support for reactions on VB (#7179)
|
2023-01-06 12:18:19 +01:00 |
|
|
Alfonso Grillo
|
03af34deac
|
Amend comment
|
2023-01-03 13:25:56 +01:00 |
|
|
Alfonso Grillo
|
844c358af4
|
Fix navigation to replied message
|
2023-01-02 19:49:52 +01:00 |
|
 Yoan Pintas
|
79e9f8ee40
|
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
|
0fca000b8d
|
Merge commit '3d672a05b2a7117ade2e4e87bd2b5762063d7922' 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
|
6010e87d38
|
fix that works both iOS 15 and iOS 16
|
2022-12-15 16:33:25 +01:00 |
|
 Velin92
|
0ebc1e20c1
|
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
|
afa6621edd
|
better comment
|
2022-12-15 12:36:44 +01:00 |
|
|
Mauro Romito
|
00af62ebf6
|
code improvement
|
2022-12-15 03:40:15 +01:00 |
|
|
Mauro Romito
|
01107d5f63
|
better comment
|
2022-12-15 03:37:15 +01:00 |
|
|
Mauro Romito
|
abc8529c26
|
removed unused code
|
2022-12-15 01:44:26 +01:00 |
|
|
Mauro Romito
|
43ee462f58
|
fix
|
2022-12-15 01:41:45 +01:00 |
|
 Andy Uhnak
|
556176606b
|
Fix Sentry errors
|
2022-12-14 17:25:27 +00:00 |
|
 Gil Eluard
|
720d74b428
|
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
|
79bd2c0ef1
|
Thread preview doesn't update in main timeline
- Fixed
|
2022-12-09 14:58:07 +01:00 |
|
|
Anderas
|
073a175388
|
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
|
cb26a5f3f3
|
Change fatal error range
|
2022-12-05 16:29:14 +00:00 |
|
 Philippe Loriaux
|
d6d5cabc0d
|
Remove the voice broadcast chunks from the attachments list
|
2022-12-02 11:51:33 +01:00 |
|
|
Frank Rotermund
|
cb78e6d70f
|
Feature/3732 pin login in new login flow
|
2022-11-29 10:56:18 +00:00 |
|
|
Andy Uhnak
|
c28b57ae4a
|
Do not retry initial sync on fatal errors
|
2022-11-29 10:15:05 +00:00 |
|
|
Mauro Romito
|
3902b12a04
|
full screen improvements
|
2022-11-15 18:56:00 +01:00 |
|
|
Frank Rotermund
|
8a1987d5f8
|
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
|
ffc74789ec
|
MESSENGER-3880 disallow pdf sharing
|
2022-11-15 16:28:42 +01:00 |
|
|
Frank Rotermund
|
ab8c98183d
|
PSB-196 fix message bubbles by removing timestamps
|
2022-11-15 15:26:53 +01:00 |
|
|
Anderas
|
0813bee021
|
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
|
30c6903570
|
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
|
857538e162
|
Remove 10s wait on failed initial sync
|
2022-11-10 16:15:16 +00:00 |
|
|
Gil Eluard
|
b0b57ac5e5
|
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
|
0f16585853
|
Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation
|
2022-11-08 14:46:44 +02:00 |
|
|
Stefan Ceriu
|
c0ad32079e
|
Revert "Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation (#6679)"
This reverts commit 405c2d8e324c08c1a40e037aeb3c54e93f30bc9f.
|
2022-11-08 14:46:44 +02:00 |
|
|
Stefan Ceriu
|
8a16b00456
|
Revert "Fix timeline items text height calculation"
This reverts commit 8f9eddee501702de84192316bd5b2ff9512d681a.
|
2022-11-08 14:46:44 +02:00 |
|
|
Stefan Ceriu
|
b2e29aa432
|
Revert "Replace attributed string height calculation with a more reliable implementation"
This reverts commit 81773cd1e515cc391c1f21b499f61141cb03c810.
|
2022-11-08 14:46:44 +02:00 |
|
|
Gil Eluard
|
41bff6e310
|
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
|
95b54ec57c
|
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 |
|