 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 |
|
 Andy Uhnak
|
599e20ea01
|
Fix some crashes
|
2023-02-09 08:44:31 +00:00 |
|
 Flescio
|
1a33d6976d
|
"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
|
4264e3b02f
|
MESSENGER-4034 app icon name
|
2023-02-08 14:53:45 +00:00 |
|
 aringenbach
|
32beb2393c
|
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
|
7950518db7
|
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
|
c2ace3e350
|
Fix develop
|
2023-01-31 16:29:17 +00:00 |
|
|
Flescio
|
35d6d9ada3
|
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
|
0d49c043a7
|
Hide decryption errors only for voice broadcast chunks.
|
2023-01-30 16:37:58 +01:00 |
|
 aringenbach
|
a903196e48
|
Labs: Rich text editor: enable list items indentation
|
2023-01-30 15:38:56 +01:00 |
|
|
Nicolas Mauri
|
13b7f78de7
|
Inform the user about decryption errors during a voice broadcast
|
2023-01-25 17:23:42 +01:00 |
|
|
Flavio Alescio
|
89ffbcfa3f
|
Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms
|
2023-01-25 10:28:37 +01:00 |
|
 Alfonso Grillo
|
a9791f507a
|
Improve code
|
2023-01-18 17:22:38 +01:00 |
|
|
Alfonso Grillo
|
a65bb5a826
|
Handle edge cases for plain “body”
|
2023-01-18 16:35:39 +01:00 |
|
|
Alfonso Grillo
|
b576b90448
|
Improve formatter
|
2023-01-18 16:35:39 +01:00 |
|
|
Alfonso Grillo
|
ba7c0f0484
|
Add replacement logic for “Ended poll” text
|
2023-01-18 16:35:39 +01:00 |
|
|
Alfonso Grillo
|
129140b729
|
Add new localisation for ended poll replies
|
2023-01-18 16:35:39 +01:00 |
|
 Nicolas Mauri
|
39e275c5cb
|
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
|
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 |
|
|
Nicolas Mauri
|
1c9d998dae
|
Code cleanup
|
2023-01-13 15:29:51 +01:00 |
|
|
Nicolas Mauri
|
9896fb124b
|
Fix how is resent a voice broadcast chunk
|
2023-01-13 08:33:30 +01:00 |
|
 Mauro Romito
|
b2b2771ca8
|
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
|
30fcb3a1de
|
added the links color wherever possible
|
2023-01-12 16:45:43 +01:00 |
|
|
Mauro Romito
|
dba5ff387f
|
fixed a test and some code improvements
|
2023-01-12 10:41:52 +01:00 |
|
|
Mauro Romito
|
9505bec521
|
done
|
2023-01-11 23:40:35 +01:00 |
|
|
Mauro Romito
|
7dcb9ddbef
|
this is required to enable custom colors for specific links
|
2023-01-11 21:39:09 +01:00 |
|
|
Mauro Romito
|
7a7d7c71b9
|
fix
|
2023-01-11 21:29:02 +01:00 |
|
|
Flavio Alescio
|
d542c40f8f
|
Add mark as unread option for rooms
|
2023-01-10 16:13:14 +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 |
|