 JanNiklas Grabowski
|
6dcf4ea8b6
|
revert '813f9ad6302d421864736a6be596093c23cf35d7' 4889_deactivate_rust_for_prod
|
2023-07-17 08:54:43 +00:00 |
|
|
JanNiklas Grabowski
|
982879c47e
|
Feature/4889 deactivate rust for prod
|
2023-06-28 05:59:03 +00:00 |
|
 Arnfried Griesert
|
51e98cfe61
|
merged element 1.10.12 into bum
|
2023-06-07 15:45:59 +02:00 |
|
 Nicolas Mauri
|
ecc9f50de0
|
Fix a flickering issue when the timeline datasource is reloaded.
|
2023-04-28 16:23:48 +02:00 |
|
 aringenbach
|
1cd3b97d7e
|
Fix typo
|
2023-04-21 13:47:15 +02:00 |
|
|
aringenbach
|
26b2d0b6d8
|
Fix comment typo
|
2023-04-20 17:12:09 +02:00 |
|
|
aringenbach
|
f6646f9059
|
Rework MXKSlashCommands to a more Swift-friendly form and use it in suggestion module
|
2023-04-20 16:45:08 +02:00 |
|
|
Nicolas Mauri
|
23e34f06df
|
Fix: Calculation of the frame for a bubble component
|
2023-04-20 10:14:51 +02:00 |
|
 Andy Uhnak
|
4e626f48f1
|
Deprecate MXLegacyCrypto
|
2023-04-18 12:45:39 +01:00 |
|
|
Arnfried Griesert
|
3736b8c9fd
|
Merged element 1.10.9 into bum
|
2023-04-11 11:46:44 +02:00 |
|
|
Andy Uhnak
|
d55ad2dbea
|
No event decoration if no decryption result
|
2023-04-03 17:36:45 +01:00 |
|
|
Andy Uhnak
|
7a01147bd8
|
Simplify event encryption decoration
|
2023-03-27 14:58:10 +01:00 |
|
|
Andy Uhnak
|
e55a733d0c
|
Revert "Merge pull request #7430 from vector-im/andy/user_trust"
This reverts commit 12ee84f607, reversing
changes made to 3644b647f6.
|
2023-03-22 15:57:25 +00:00 |
|
|
Andy Uhnak
|
ddb181ffa0
|
Refactor encryption trust level
|
2023-03-16 14:56:50 +00:00 |
|
|
Arnfried Griesert
|
28852aa790
|
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
|
2023-03-16 12:19:26 +01:00 |
|
 Mauro Romito
|
09daa04dd4
|
refactor completed
|
2023-03-06 14:59:03 +01:00 |
|
 Flescio
|
725afd6484
|
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 |
|
|
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 |
|
|
Anderas
|
bb0986a59c
|
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
|
2bc314e994
|
Do not reset device keys if migrating to CryptoSDK
|
2023-02-13 11:14:26 +00:00 |
|
 Doug
|
56f2ff19b7
|
Merge branch 'master' into develop
|
2023-02-10 13:39:22 +00: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 |
|
 Alfonso Grillo
|
f47ad395b0
|
Sync with matrix feature branch
|
2023-02-08 17:29:30 +01:00 |
|
|
Arnfried Griesert
|
4264e3b02f
|
MESSENGER-4034 app icon name
|
2023-02-08 14:53:45 +00:00 |
|
|
Alfonso Grillo
|
a7fec65b33
|
Fix last message for m.poll.end events
|
2023-02-08 15:30:05 +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
|
129140b729
|
Add new localisation for ended poll replies
|
2023-01-18 16:35:39 +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 |
|
|
Flavio Alescio
|
d542c40f8f
|
Add mark as unread option for rooms
|
2023-01-10 16:13:14 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|