Commit graph

444 commits

Author SHA1 Message Date
Doug
075d1c8779 Tidy up event formatter issues. 2023-04-18 17:43:21 +01:00
aringenbach
fbe625f8f9 Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-12 15:04:15 +02:00
aringenbach
f9623e351e Rename textDefaultFont to defaultFont and remove unnecessary definition in RoomInputToolbarView.h 2023-04-11 14:54:55 +02:00
aringenbach
e61c2f18ec Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-11 14:21:31 +02:00
Nicolas Mauri
dadeef7efa Fix: Continue to display pills for matrix.to permalinks if a custom permalinkBaseUrl is set. 2023-04-07 16:40:34 +02:00
Andy Uhnak
dfb4d7ca64 No event decoration if no decryption result 2023-04-03 17:36:45 +01:00
Andy Uhnak
39fdbc901e Simplify event encryption decoration 2023-03-27 14:58:10 +01:00
aringenbach
3b09fcc0c8 Use textDefaultFont in all variants of the InputToolbarView 2023-03-23 17:16:57 +01:00
Andy Uhnak
b33f29e0e7 Revert "Merge pull request #7430 from vector-im/andy/user_trust"
This reverts commit 7f5d3b46eb, reversing
changes made to 5a3adde8f7.
2023-03-22 15:57:25 +00:00
Nicolas Mauri
a660e3e883
Merge pull request #7432 from vector-im/nimau/PSB-59-pills
Turning permalinks into pills
2023-03-21 14:36:54 +01:00
Nicolas Mauri
13ba93ae13 Fix: the avatar was incorrect for the pill of a message if the event is not loaded. 2023-03-21 09:27:48 +01:00
Anderas
7f5d3b46eb
Merge pull request #7430 from vector-im/andy/user_trust
Refactor user / room encryption trust level
2023-03-20 12:52:46 +00:00
Nicolas Mauri
64ea1904fc Turning permalinks into pills
#7409: Permalinks to a room/space are pillified
#7411: Permalinks to a matrix user are pillified
#7412: Permalinks to messages are pillified
2023-03-17 16:58:59 +01:00
Andy Uhnak
5c669a7fee Refactor encryption trust level 2023-03-16 14:56:50 +00:00
manuroe
d672dffcdd Manage bad m.file attachment format
https://github.com/vector-im/element-ios/issues/7406

By using value type checker methods.

With this fix, attachments with a wrong size format are still displayed in the timeline. Only the size is omitted
2023-03-15 15:18:38 +01:00
Mauro Romito
5d1758de6d refactor completed 2023-03-06 14:59:03 +01:00
Flescio
9441f6955a
fix issue on timeline bubbles not showing proper content after decrypt (#7397)
* fix issue on timeline bubbles not showing proper content after decrypt

* Update Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.m
2023-03-02 11:30:26 +01:00
Anderas
835b2ddce4
Merge pull request #7369 from vector-im/andy/crypto_fixes
Do not reset device keys if migrating to CryptoSDK
2023-02-13 13:01:39 +00:00
Andy Uhnak
ef4044f0cb Do not reset device keys if migrating to CryptoSDK 2023-02-13 11:14:26 +00:00
Doug
ee149eddd6 Merge branch 'master' into develop 2023-02-10 13:39:22 +00:00
Andy Uhnak
9be98478db Fix some crashes 2023-02-09 08:44:31 +00:00
Flescio
1f8f6ffdf1
"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
Alfonso Grillo
c83ddda16d Sync with matrix feature branch 2023-02-08 17:29:30 +01:00
Alfonso Grillo
67eabe146c Fix last message for m.poll.end events 2023-02-08 15:30:05 +01:00
aringenbach
2aaef072e4
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
b1a1cb1813
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
097658f9f5 Fix develop 2023-01-31 16:29:17 +00:00
Flescio
54602b63ec
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
85925600bc Hide decryption errors only for voice broadcast chunks. 2023-01-30 16:37:58 +01:00
aringenbach
166ec54ac2 Labs: Rich text editor: enable list items indentation 2023-01-30 15:38:56 +01:00
Nicolas Mauri
c0e5697f07 Inform the user about decryption errors during a voice broadcast 2023-01-25 17:23:42 +01:00
Flavio Alescio
12e63a0080 Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms 2023-01-25 10:28:37 +01:00
Alfonso Grillo
2a2df206b5 Improve code 2023-01-18 17:22:38 +01:00
Alfonso Grillo
80ce6b7f51 Handle edge cases for plain “body” 2023-01-18 16:35:39 +01:00
Alfonso Grillo
69f3df0867 Improve formatter 2023-01-18 16:35:39 +01:00
Alfonso Grillo
a8d041da3b Add replacement logic for “Ended poll” text 2023-01-18 16:35:39 +01:00
Alfonso Grillo
8ad5489a5e Add new localisation for ended poll replies 2023-01-18 16:35:39 +01:00
Nicolas Mauri
f8717de59e
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
Nicolas Mauri
c8bdab7e18 Code cleanup 2023-01-13 15:29:51 +01:00
Nicolas Mauri
3d8d6e10bc Fix how is resent a voice broadcast chunk 2023-01-13 08:33:30 +01:00
Mauro Romito
1b9a26c3cc 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
50cf98e692 added the links color wherever possible 2023-01-12 16:45:43 +01:00
Mauro Romito
891ceb8546 fixed a test and some code improvements 2023-01-12 10:41:52 +01:00
Mauro Romito
b1a10750ff done 2023-01-11 23:40:35 +01:00
Mauro Romito
e40a36e462 this is required to enable custom colors for specific links 2023-01-11 21:39:09 +01:00
Mauro Romito
5335515252 fix 2023-01-11 21:29:02 +01:00
Flavio Alescio
fee0ebbef1 Add mark as unread option for rooms 2023-01-10 16:13:14 +01:00
Alfonso Grillo
f43936b516 Refine MXKEventFormatter 2023-01-10 12:20:34 +01:00
Alfonso Grillo
7a3fe14963 Fix poll.end read receipts 2023-01-10 12:20:34 +01:00
Alfonso Grillo
dd1cd703af Cleanup code 2023-01-10 12:20:34 +01:00