SpiritCroc
740364f733
Merge remote-tracking branch 'deepbluev7/nico/fix-at-room' into sc
...
Change-Id: I9587d87c60e70c2efc098b7379a6bac9f9c9be26
2022-12-31 08:24:15 +01:00
SpiritCroc
141b46dfc3
Fix clicking on bridge contact opening bridge bot in encrypted chats
...
Change-Id: I8749244f393639740885c7086a18cd127274baa7
2022-12-30 18:24:25 +01:00
SpiritCroc
25dddf7566
Merge tag 'v1.5.16' into sc
...
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2022-12-30 17:58:06 +01:00
Valere
d75d7a3695
Merge pull request #7843 from vector-im/bugfix/nfe/sync_filter_fix
...
sync filter params moved to matrix config
2022-12-28 11:04:40 +01:00
NIkita Fedrunov
d20121603a
sync filter params moved to matrix config
2022-12-23 13:10:27 +01:00
Onuray Sahin
2ddc3b6d05
Fix indentation.
2022-12-23 13:40:08 +03:00
Onuray Sahin
2085f7f17d
Merge branch 'develop' into feature/ons/increase_dm_test_coverage
2022-12-23 13:38:28 +03:00
Yoan Pintas
92ed663068
Replace the player timeline ( #7821 )
2022-12-22 14:05:43 +00:00
Onuray Sahin
a96f2d5771
Add changelog.
2022-12-22 15:39:10 +03:00
Benoit Marty
3c3c44b344
Merge pull request #7818 from vector-im/sync-emojis
...
Sync Emojis
2022-12-22 12:23:18 +01:00
Onuray Sahin
fcac1849c3
Write unit test for toggling ip address visibility.
2022-12-21 17:07:16 +03:00
Onuray Sahin
73e2f02c48
Increase coverage of devices view model.
2022-12-21 14:30:32 +03:00
jonnyandrew
50466792c6
[Rich text editor] Add support for links in the rich text editor ( #7746 )
2022-12-21 10:40:19 +00:00
SpiritCroc
82eabe0fb6
Tweak init sync / clear cache settings entry
...
Change-Id: I51d9f701169b67e3e09bbd7d028b5fd8037653a7
2022-12-21 10:00:29 +01:00
SpiritCroc
e054828370
Merge tag 'v1.5.14' into sc
...
Change-Id: Ib0162cc1f66cd563e15a24a2c090cfd18b5250c2
2022-12-21 09:57:40 +01:00
Benoit Marty
ff7be665ec
Merge branch 'hotfix/1.5.14-bis' into develop
2022-12-20 16:49:31 +01:00
Nikita Fedrunov
f4dca572c5
reply to threaded push notification now sent to thread not to main timeline ( #7805 )
2022-12-20 13:27:39 +01:00
Benoit Marty
95a29b83fe
ActiveSessionHolder is not supposed to start syncing. Instead, the MainActivity does it, if necessary.
...
Fixes a race condition when clearing cache.
2022-12-20 13:12:54 +01:00
Onuray Sahin
e95380ac9e
Merge pull request #7798 from vector-im/feature/ons/fix_device_manager_ui
...
Device Manager UI review fixes (PSG-1102)
2022-12-19 18:03:12 +03:00
Onuray Sahin
2c0d029dea
Fix separator UI.
2022-12-19 17:12:07 +03:00
Maxime NATUREL
b609c5ca10
Merge pull request #7793 from vector-im/fix/mna/long-press-select-in-other-sessions
...
[Session Manager] Other sessions list: cannot select/deselect session by a long press when in select mode (PSG-1111)
2022-12-19 14:50:19 +01:00
Maxime NATUREL
8dd2ebf249
Merge pull request #7791 from vector-im/fix/mna/filter-bottom-sheet-content-cut
...
[Session manager] Other sessions: Filter bottom sheet cut in landscape mode (PSG-1107)
2022-12-19 14:49:07 +01:00
Onuray Sahin
f08a3f7966
Merge pull request #7794 from vector-im/feature/ons/fix_current_session_ip_address_visibility
...
Fix current session ip address visibility (PSG-1109)
2022-12-19 16:33:18 +03:00
Yoan Pintas
d17fdbb913
Merge pull request #7816 from vector-im/yostyle/prompt_stop_voicebroadcast
...
[Voice Broadcast] Prompt the user before ending a live broadcast
2022-12-19 14:28:17 +01:00
Onuray Sahin
9fd6fe321d
Merge pull request #7790 from vector-im/feature/ons/fix_rename_session_keyboard_visibility
...
Automatically show keyboard after learn more bottom sheet is dismissed (PSG-1105)
2022-12-19 16:21:37 +03:00
Maxime NATUREL
ef7b5a4418
Merge pull request #7785 from vector-im/fix/mna/hide-filter-in-selection-mode
...
[Session manager] Other sessions list: filter option is displayed when selection mode is enabled (PSG-1113)
2022-12-19 14:11:37 +01:00
Maxime NATUREL
c7de0523e7
Merge pull request #7796 from vector-im/feature/mna/security-recommendations-tappable
...
[Session manager] Security recommendations cards: whole view should be tappable (PSG-1117)
2022-12-19 14:09:09 +01:00
Onuray Sahin
61685d3e4a
Merge branch 'develop' into feature/ons/fix_current_session_ip_address_visibility
2022-12-19 15:47:51 +03:00
Onuray Sahin
dd51293621
Fix unit test.
2022-12-19 15:46:58 +03:00
Onuray Sahin
3f510087d0
Code review fixes.
2022-12-19 14:44:36 +03:00
Onuray Sahin
65d26f180f
Fix alignment of content title and description.
2022-12-19 13:27:40 +03:00
Maxime NATUREL
5bde84c059
Better fix for scrollbar padding
2022-12-19 10:53:45 +01:00
Maxime NATUREL
7ea1f65fe3
Fixing padding of the scrollbar and avoid using rtl layout in RadioGroup
2022-12-19 10:19:56 +01:00
bmarty
764eadb696
Sync Emojis
2022-12-19 00:06:05 +00:00
yostyle
74f69b228f
Prompt the user before ending a voice broadcast
2022-12-17 21:00:01 +01:00
SpiritCroc
1c335194cf
Still show threads as replies when threads are disabled
...
Change-Id: Id08fd8be12bb7bfc589d21989ae96f9457961d15
2022-12-17 15:17:43 +01:00
SpiritCroc
7a83a44077
Fix threaded message rendering rich reply when they shouldn't
...
Change-Id: I5a1c1d177d896d203f2420bdd1536dfcbbd460d6
2022-12-17 11:34:52 +01:00
SpiritCroc
aa9e0bc627
Add read receipt debugging
...
Change-Id: I2cd0b5feb23962bc36295380fe3e77346f0ea694
2022-12-17 11:34:39 +01:00
SpiritCroc
ed3049f04e
Update Schildi help link
...
Change-Id: I56c195734c453b08bbec018b8bbbb8e14af08f75
2022-12-16 22:31:14 +01:00
Maxime NATUREL
8e2d82ea9a
Setting margin top of session details header to 32dp
2022-12-16 17:39:03 +01:00
Maxime NATUREL
62f742bf66
Using "Other sessions" title everytime
2022-12-16 17:22:40 +01:00
Onuray Sahin
913fb1e5dc
UI review fixes.
2022-12-16 17:07:26 +01:00
Yoan Pintas
14290abfcf
Merge pull request #7806 from vector-im/yostyle/update_live_status
...
[Voice Broadcast] Update live indicator color
2022-12-16 14:27:28 +01:00
SpiritCroc
1eacd0cca3
Make it harder to not find "initial sync" option in settings
...
Change-Id: Iff49485ebe036a14bf03e274791275d5ff27d864
2022-12-16 13:00:13 +01:00
SpiritCroc
987ca6dec4
Revert "stop listening timeline collection changes when app is not resumed ( #7734 )"
...
This makes the chat view get destroyed onPause, leading to
jump-to-bottom when clicking links, opening threads etc.
This reverts commit cf59c80100
2022-12-16 12:59:47 +01:00
yostyle
f2d2c0cb27
Update live indicator color
2022-12-16 10:32:50 +01:00
Maxime NATUREL
c2d25c8564
Collapsing header in other sessions screen
2022-12-16 09:46:52 +01:00
Maxime NATUREL
d7a729740e
Adding click listener on the whole custom view
2022-12-15 16:02:56 +01:00
Onuray Sahin
ce23b80698
Fix current session ip address visibility.
2022-12-15 17:29:37 +03:00
Onuray Sahin
bc9ca3fd12
Revert "Fix ip address visibility in the current session details."
...
This reverts commit f0dc6e478d
2022-12-15 17:26:39 +03:00
