Michael Telatynski
600375cafe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
...
Conflicts:
src/i18n/strings/en_EN.json
2021-09-08 15:38:13 +01:00
Michael Telatynski
68836b9c68
hide no-op m.room.encryption events and better word param changes
2021-09-06 14:59:30 +01:00
Michael Telatynski
6801ec76a7
Merge pull request #6738 from matrix-org/t3chguy/fix/18780
2021-09-06 11:40:55 +01:00
Michael Telatynski
fc84682c81
i18n
2021-09-06 11:35:02 +01:00
Travis Ralston
60e2d61d25
Merge pull request #6489 from psrpinto/better-pinned-messages
...
When pinning or unpinning messages, link to the specific message
2021-09-03 13:27:49 -06:00
David Baker
de01dcfd26
Merge pull request #6700 from SimonBrandner/feature/call-timer/18566
...
Show call length during a call
2021-09-03 17:17:36 +01:00
Michael Telatynski
419eb63e51
Add missing pluralisation i18n strings for Spaces
2021-09-03 13:20:35 +01:00
David Baker
25fb243d0b
Merge pull request #6731 from matrix-org/dbkr/prevent_multiple_calls
...
Fix bug where one party's media would sometimes not be shown
2021-09-03 12:01:54 +01:00
David Baker
1a0365f528
i18n
2021-09-02 19:00:30 +01:00
Dariusz Niemczyk
99a0bd935b
Merge pull request #6726 from SimonBrandner/feature/autoplay-split
...
Split autoplay GIFs and videos into different settings
2021-09-02 18:40:42 +02:00
Travis Ralston
b86a0dcc15
Merge branch 'develop' into travis/cross-room
2021-09-01 11:29:20 -06:00
Šimon Brandner
7fcb8ed488
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-01 17:28:16 +02:00
Michael Telatynski
979bc71609
Deduplicate join rule management between rooms and spaces
2021-09-01 15:52:56 +01:00
Germain
7621a9a0f3
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349
2021-09-01 08:47:10 +01:00
Michael Telatynski
0cd00ae64f
Remove non-functional DuckDuckGo Autocomplete Provider
2021-08-31 16:05:16 +01:00
Šimon Brandner
f75b5f1b17
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-27 16:39:25 +02:00
Šimon Brandner
0fae3ed233
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-27 09:22:30 +02:00
Travis Ralston
289ac34764
Add support for MSC2762's timeline functionality
...
See https://github.com/matrix-org/matrix-widget-api/pull/41
2021-08-25 18:16:40 -06:00
Germain Souquet
77a463e679
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-25 08:53:16 +01:00
Travis Ralston
9444995305
Merge pull request #6662 from matrix-org/travis/safe-labs
...
Flag a couple features as having dependencies
2021-08-25 01:12:48 -06:00
Travis Ralston
4790b4fc17
Remove advanced room logging setting
...
Fixes https://github.com/vector-im/element-web/issues/14602
This has proven to be less useful month over month, so it's time for it to go. The initial goal for keeping it was to track stability in the ~6 months post-release, which means it should have left around the start of 2021. At the time, Spaces was on the horizon with room list corruption issues though, so it was put on hold. These days, it's rock solid and doesn't appear to be causing issues. As such, the logging can leave in favour of more specific/targeted logging when we need it.
This might even speed things up as it's not hitting the SettingsStore every 0.2 seconds.
2021-08-24 13:17:12 -06:00
Travis Ralston
8237497bc4
Flag a couple features as having dependencies
2021-08-23 20:27:29 -06:00
Travis Ralston
32343f3382
Merge pull request #5698 from SimonBrandner/public-e2ee-warn
...
Add a warning on E2EE rooms if you try to make them public
2021-08-23 16:45:47 -06:00
Travis Ralston
15c731d574
Merge pull request #6507 from matrix-org/t3chguy/fix/18089
...
Allow pagination of the space hierarchy and use new APIs
2021-08-23 15:51:34 -06:00
Germain Souquet
edd4d42e7f
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-23 17:31:37 +01:00
David Baker
5344b86de4
Merge pull request #6633 from matrix-org/dbkr/fix_cross_signing_setup_settings
...
Fix cross signing setup from settings screen
2021-08-23 09:41:24 +01:00
Šimon Brandner
ac9ebd8a10
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-20 08:37:46 +02:00
Germain Souquet
ffc7326b0c
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-19 10:44:32 +01:00
David Baker
08b37eb7c5
Fix cross sisgning setup from settings screen
...
We previously called bootstrap without the cache callbacks set up
which meant it prompted you for you password once for each of the
three keys it fished out of SSSS. Instead, display the same dialog
we display from the verify toast.
Also, in the case where you hadn't verified yet, the button didn't
do anything at all, so make it trigger a verification & change the
caption appropriately.
Add a state to reflect when cross signing is set up but SSSS isn't
(ie. user hasn't yet set up backup / set a passphrase).
2021-08-18 19:22:42 +01:00
James Salter
23f70836b6
Update copy to indicate debug logs contain which UI elements you last interacted with
2021-08-18 17:05:15 +01:00
Germain Souquet
458f860a26
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-17 11:14:21 +01:00
Germain Souquet
e5024c4b71
Adapt threading UI to new backend
2021-08-17 10:38:09 +01:00
Dariusz Niemczyk
7b72931c42
Merge pull request #6422 from libexus/i18n-bracket-fix
...
Remove misplaced bracket in a translation string
2021-08-15 09:20:00 +02:00
Šimon Brandner
032d2866a3
Add "No answer" state
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:19:14 +02:00
Michael Telatynski
8ddaa7faf1
i18n
2021-08-12 12:08:57 +01:00
Michael Telatynski
85b1f166e8
post-merge tidy up
2021-08-12 12:03:14 +01:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092
2021-08-12 11:28:14 +01:00
Michael Telatynski
9d3569a577
Iterate PR based on feedback
2021-08-12 10:58:56 +01:00
Michael Telatynski
09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y
2021-08-11 23:18:52 +01:00
Michael Telatynski
54d85a3864
Iterate PR based on feedback
2021-08-11 16:32:48 +01:00
Germain Souquet
d971802789
Create ThreadView phase in RightPanel
2021-08-10 14:30:12 +02:00
Michael Telatynski
77cf5bf613
Update space create menu copy and add link to community migrator
2021-08-10 11:30:00 +01:00
Germain Souquet
7d4698da49
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-10 11:41:15 +02:00
Michael Telatynski
195b8714fc
Iterate PR based on feedback
2021-08-10 09:55:51 +01:00
Michael Telatynski
db951b43a3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-10 09:48:22 +01:00
Michael Telatynski
857bb9db44
Add some treeview labels
2021-08-10 09:46:25 +01:00
Germain
298318c0ee
Merge branch 'develop' into i18n-bracket-fix
2021-08-09 09:07:32 +01:00
Šimon Brandner
eb49960497
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:20:52 +02:00
Travis Ralston
6a9ebc6902
Merge pull request #6390 from SimonBrandner/feature/hidden-rrs
...
Support for MSC2285 (hidden read receipts)
2021-08-06 09:27:14 -06:00
Travis Ralston
f53451df65
Merge pull request #6349 from SimonBrandner/feature/collapse-pinned-mels/17938
...
Group pinned message events with MELS
2021-08-06 09:25:08 -06:00