 JanNiklas Grabowski
|
1768fb5eee
|
Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' 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 |
|
 Andy Uhnak
|
d203630795
|
Fix some crashes
|
2023-02-09 08:44:31 +00:00 |
|
 Flescio
|
9ecfe523aa
|
"Mark as unread" dot appears on rooms that are actually unread, not marked as such (#7352)
* fix green dot only to appear for marked action
|
2023-02-09 09:01:16 +01:00 |
|
 Arnfried Griesert
|
66b2259f7c
|
MESSENGER-4034 app icon name
|
2023-02-08 14:53:45 +00:00 |
|
 aringenbach
|
5e167bb0ef
|
Merge pull request #7317 from vector-im/aringenbach/7316_indentation_support
Labs: Rich text editor: enable list items indentation
|
2023-02-01 09:44:45 +01:00 |
|
|
Anderas
|
bda06a9451
|
Merge pull request #7323 from vector-im/andy/reset_crypto
Reset Crypto SDK labs on logout
|
2023-01-31 16:35:39 +00:00 |
|
|
Andy Uhnak
|
27b59a2019
|
Fix develop
|
2023-01-31 16:29:17 +00:00 |
|
|
Flescio
|
3660bc878e
|
Merge pull request #7301 from vector-im/flescio/7253-Add_mar_kas_unread_option_for_rooms
Flescio/7253 add mar kas unread option for rooms
|
2023-01-31 12:37:40 +01:00 |
|
 Nicolas Mauri
|
6b48ecd7a6
|
Hide decryption errors only for voice broadcast chunks.
|
2023-01-30 16:37:58 +01:00 |
|
 aringenbach
|
c1968451bb
|
Labs: Rich text editor: enable list items indentation
|
2023-01-30 15:38:56 +01:00 |
|
|
Nicolas Mauri
|
70325c38e5
|
Inform the user about decryption errors during a voice broadcast
|
2023-01-25 17:23:42 +01:00 |
|
|
Flavio Alescio
|
7ba73cfc85
|
Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms
|
2023-01-25 10:28:37 +01:00 |
|
 Alfonso Grillo
|
3efc34e8a5
|
Improve code
|
2023-01-18 17:22:38 +01:00 |
|
|
Alfonso Grillo
|
264edf7716
|
Handle edge cases for plain “body”
|
2023-01-18 16:35:39 +01:00 |
|
|
Alfonso Grillo
|
e2287b920d
|
Improve formatter
|
2023-01-18 16:35:39 +01:00 |
|
|
Alfonso Grillo
|
252231ddf0
|
Add replacement logic for “Ended poll” text
|
2023-01-18 16:35:39 +01:00 |
|
|
Alfonso Grillo
|
ce9a982244
|
Add new localisation for ended poll replies
|
2023-01-18 16:35:39 +01:00 |
|
 Nicolas Mauri
|
3d8bf9d90f
|
Merge pull request #7266 from vector-im/nimau/PSF-1851_VB_sent_as_VM
Fix how is resent a voice broadcast chunk
|
2023-01-16 12:29:15 +01:00 |
|
 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 |
|