61a5b495b7
Remove duplicate CSS selector
2021-10-18 12:23:09 +01:00
13d6456200
Convert CryptographyPanel to a table
2021-10-18 09:36:16 +01:00
f05e35bd94
Merge pull request #6958 from andybalaam/separate-cryptography-setting-component
...
Break 'Cryptography' settings into a separate component
2021-10-18 09:34:55 +01:00
78890ab3aa
Run i18n generation
2021-10-18 09:20:58 +01:00
4d63e1239b
Merge pull request #6962 from CicadaCinema/patch-3
2021-10-18 09:17:40 +01:00
d93c220aae
Merge pull request #6898 from oliver-pham/issue-19180
2021-10-18 08:47:28 +01:00
fd2a7fe0f4
Merge pull request #6961 from RafaelGoncalves8/move-error-message
2021-10-18 08:43:17 +01:00
a9c9e5b778
appease the linter
2021-10-16 14:58:10 +01:00
7b893366f2
Add spacing to Room settings - Notifications subsection
2021-10-16 14:52:29 +01:00
2fb802eb9e
Move error message closer to password field
...
Signed-off-by: Rafael Goncalves <rafaelgoncalves@riseup.net>
2021-10-15 16:01:35 -03:00
0941b38b5d
Name CryptographyPanel CSS classes consistent with style
2021-10-15 16:09:36 +01:00
4fb0d021ae
Merge pull request #6897 from SimonBrandner/task/colors-4
...
Color de-duplication #4
2021-10-15 16:07:07 +01:00
a547ee4654
Break 'Cryptography' settings into a separate component
2021-10-15 16:02:44 +01:00
495f824f0f
Merge pull request #6957 from matrix-org/gsouquet/fix-appearance-settings
2021-10-15 15:45:05 +01:00
ac23afe9f1
Allow EventTile to be rendered with mock events
2021-10-15 15:36:06 +01:00
1b7277b8f0
Merge pull request #6943 from matrix-org/fayed/emoji-compare-buttons
...
Update the button styling on the emoji comparison dialog during cross-signing
2021-10-15 10:34:25 -04:00
0a6e78fd38
Merge remote-tracking branch 'upstream/develop' into task/colors-4
2021-10-15 16:23:40 +02:00
cee0d6894f
Merge pull request #6951 from matrix-org/gsouquet/fix-thread-root-hidden
2021-10-15 15:00:17 +01:00
93fc24c875
Adding renderThreadInfo comment to explain data accessor
2021-10-15 14:47:02 +01:00
904147b194
Merge branch 'develop' into gsouquet/fix-thread-root-hidden
2021-10-15 14:45:11 +01:00
ade53a5bd7
Do more re-ordering to keep things working
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:44:41 +02:00
3ec05c9cbd
Merge pull request #6952 from matrix-org/gsouquet/display-new-thread
2021-10-15 14:41:58 +01:00
f8c516d927
Add new thread message preview ( #18958 ) ( #6953 )
...
Closes https://github.com/vector-im/element-web/issues/18958
2021-10-15 14:29:17 +01:00
bc93954577
Remove repeated comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:24:19 +02:00
71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:23:32 +02:00
9c753765d5
Merge pull request #6955 from andybalaam/table-for-devicespanel
...
Switch DevicesPanel to use table (for screen readers)
2021-10-15 14:16:45 +01:00
690893ea6b
Merge duplicate CSS selectors
2021-10-15 13:32:39 +01:00
f0ff3a26cc
Merge pull request #6954 from aaronraimist/download-tooltip
2021-10-15 11:57:39 +01:00
7edec291ac
Switch DevicesPanel to use table (for screen readers)
2021-10-15 11:50:49 +01:00
8cdb1c667d
Fix tooltip when downloading unencrypted file
2021-10-15 05:23:59 -05:00
6baa6c8f65
Listen to new thread to render info on timeline
2021-10-15 11:08:33 +01:00
af55ac7b8c
Merge pull request #6950 from matrix-org/gsouquet/threads-replies-compat
...
Add 'm.thread' relation to replies when replying to a threaded event
2021-10-15 10:27:40 +01:00
17c4cc91af
Reconcile threads root with its children before displaying it
2021-10-15 10:26:04 +01:00
3dcf0d0b7e
Fix incorrect logic to hide thread relations
2021-10-15 10:25:42 +01:00
2ad11b3af7
Merge pull request #6949 from matrix-org/gsouquet/threads-relations
2021-10-15 08:58:57 +01:00
99ad603d91
Merge branch 'develop' into gsouquet/threads-relations
2021-10-15 08:43:51 +01:00
5fccbd4ef7
Remove auto-import
2021-10-14 17:40:00 +01:00
378536ee2a
Add 'm.thread' relation for replies to a threaded event
2021-10-14 17:22:06 +01:00
d315641056
Make threads use 'm.thread' relation
2021-10-14 17:04:27 +01:00
2dd6dddc67
Fix incorrect liveTimeline reference ( #6948 )
...
Fixes https://github.com/vector-im/element-web/issues/19400
2021-10-14 15:37:56 +00:00
c31bd8c647
Remove unnecessary adapter in ThreadPanel-test.tsx ( #6946 )
2021-10-14 15:42:54 +01:00
562a880c7d
Create room threads list view ( #6904 )
...
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads
In addition:
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
2021-10-14 15:27:35 +02:00
6bb47ec710
Merge pull request #6945 from matrix-org/t3chguy/fix/19390
2021-10-14 13:40:27 +01:00
069a8d05f1
Space Room View should react to join rule changes down /sync
2021-10-14 12:06:24 +01:00
4d8346f364
Merge pull request #6884 from matrix-org/t3chguy/fix/19010
2021-10-14 11:11:29 +01:00
020eca6922
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19010
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/rooms/MemberList.tsx
src/components/views/rooms/RoomList.tsx
2021-10-14 11:05:29 +01:00
4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969
2021-10-14 09:59:34 +01:00
a37c10b256
Merge pull request #6920 from matrix-org/t3chguy/fix/17410
2021-10-14 09:58:45 +01:00
53d7c9d2e5
Merge pull request #6921 from matrix-org/t3chguy/fix/19003.1
2021-10-14 09:58:28 +01:00
2a3c483f96
Merge pull request #6919 from matrix-org/t3chguy/fix/19146
2021-10-14 09:58:19 +01:00
Andy Balaam