Michael Telatynski
b9be0896f1
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/pins
2021-07-09 07:48:12 +01:00
Šimon Brandner
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
David Baker
013a81148b
Merge pull request #6337 from matrix-org/dbkr/devicelistener_megolm_key
...
Make DeviceListener also update on megolm key in SSSS
2021-07-08 21:44:41 +01:00
David Baker
197b6aeefe
Make DeviceListener also update on megolm key in SSSS
...
The device listener checks for a megolm key stored in SSSS but didn't
update when one was added, so the encryption upgrade toast would not
disappear after the key was fixed by https://github.com/matrix-org/matrix-js-sdk/pull/1776
2021-07-08 21:16:19 +01:00
Šimon Brandner
7a1381135a
Simplifie some code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 18:31:47 +02:00
Šimon Brandner
27db0da437
Simpler code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:40:41 +02:00
Šimon Brandner
6401577fe4
focus_composer -> focus_send_message_composer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:37:39 +02:00
Šimon Brandner
68d194444a
FocusComposer -> FocusSendMessageComposer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:36:31 +02:00
Šimon Brandner
7734f8aeef
Handle focusing multiple composers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:33:49 +02:00
Michael Telatynski
4978c27dd5
Merge pull request #6326 from matrix-org/revert-6135-t3chguy/fix/17494
2021-07-08 14:56:55 +01:00
Michael Telatynski
48306a6bbb
Merge pull request #6334 from matrix-org/t3chguy/fix/17306
2021-07-08 14:53:31 +01:00
Michael Telatynski
f8907a6ea4
Fix bug which prevented more than one event getting pinned
2021-07-08 14:48:06 +01:00
Michael Telatynski
8e7e4c9e8d
Convert MessageContextMenu to Typescript
2021-07-08 14:47:36 +01:00
Michael Telatynski
94a7812039
Extract MXCs from _matrix/media/r0/ URLs for inline images in messages
2021-07-08 14:22:38 +01:00
Michael Telatynski
1c2bdf3cf4
delint
2021-07-08 13:35:26 +01:00
Michael Telatynski
00a3f5d469
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494
2021-07-08 13:29:10 +01:00
Michael Telatynski
5d72ea5e19
Fix Space Create menu not disabling the alias field when busy
2021-07-08 13:24:56 +01:00
Michael Telatynski
fc05395dba
Don't close settings dialog when opening spaces feedback prompt
2021-07-08 13:24:16 +01:00
Michael Telatynski
1cdae54880
Fix text wrapping for Link Preview Widget
2021-07-08 13:16:58 +01:00
Šimon Brandner
14687f3630
Merge remote-tracking branch 'upstream/develop' into fix/focus-composer-reaction/11023
2021-07-08 13:19:46 +02:00
Šimon Brandner
64f32a9fc1
Focus composer after reacting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:12:57 +02:00
Germain Souquet
16dc3c47e1
Make ghost button background transparent
2021-07-08 10:37:40 +02:00
David Baker
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage
...
Update import location for types
2021-07-08 09:18:31 +01:00
Michael Telatynski
a0432b5211
Merge pull request #6329 from matrix-org/t3chguy/blurhash-components
2021-07-08 09:16:14 +01:00
Germain
bda83e8140
Merge pull request #6320 from SimonBrandner/feature/proper-codeblock-colors
2021-07-08 09:07:21 +01:00
David Baker
086a8cbbb3
Update import location for types
...
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
2021-07-07 20:19:52 +01:00
Michael Telatynski
d8bf618d73
unrelated: move @types/commonmark to devDeps
2021-07-07 20:08:52 +01:00
Michael Telatynski
4ce3723e84
Switch to blurhash-react instead of homegrown component
...
this has the advantage of resolution scaling logic to do more gpu accelerated scaling
2021-07-07 20:00:31 +01:00
Michael Telatynski
06d589d769
Lower number of blurhash components and apply image ratio to it
2021-07-07 19:43:12 +01:00
Michael Telatynski
882e66e215
remove stale comment, we include vias now
2021-07-07 18:17:33 +01:00
Michael Telatynski
4a6af5a4d7
fix test missing required prop
2021-07-07 18:12:31 +01:00
Michael Telatynski
b9a539eaa2
Improve URL Previews
...
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
2021-07-07 18:04:30 +01:00
Šimon Brandner
d017f3d06c
Merge remote-tracking branch 'upstream/develop' into feature/proper-codeblock-colors
2021-07-07 18:37:00 +02:00
Germain
209cafb1f5
Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire
2021-07-07 16:30:54 +01:00
Šimon Brandner
14303a4ca8
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:20:31 +02:00
Šimon Brandner
f91b35a0a0
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:12:19 +02:00
Michael Telatynski
25dab1eb64
Merge pull request #6307 from matrix-org/t3chguy/fix/17858
...
Fix instances of the Edit Message Composer's save button being wrongly disabled
2021-07-07 16:03:27 +01:00
Germain
33930c296f
Merge pull request #6327 from matrix-org/gsouquet/ci-pure-lockfile
...
Do not generate a lockfile when running in CI
2021-07-07 15:23:20 +01:00
Germain Souquet
5fb7dbee3e
Do not generate a lockfile when running in CI
2021-07-07 16:11:47 +02:00
Michael Telatynski
30fa5419db
Revert "ignore hash/fragment when de-duplicating links for url previews"
2021-07-07 14:30:08 +01:00
Šimon Brandner
5b5ef5e04c
Handle servers from settings
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 13:59:02 +02:00
Šimon Brandner
255ab49ccb
Handle edge cases
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 13:48:48 +02:00
Germain
b916b789aa
Merge pull request #6324 from matrix-org/gsouquet/fix-lockfile
...
Update lockfile with correct dependencies
2021-07-07 11:15:36 +01:00
Šimon Brandner
b94dc2d0e5
Remember the last used server for room directory searches
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 12:14:51 +02:00
Šimon Brandner
1220ad37ce
Remove the usage of symbol
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 12:14:44 +02:00
Germain Souquet
06337e72fa
Update lockfile with correct dependencies
2021-07-07 12:10:35 +02:00
David Baker
e1fb811088
Merge pull request #6321 from matrix-org/dbkr/clarify_abbreviations
...
Clarify the keys we use when submitting rageshakes
2021-07-07 11:06:39 +01:00
David Baker
984dc40f9c
Clarify the keys we use when submitting rageshakes
...
'pk' is a bit opaque in a context with both private keys and public keys
2021-07-07 10:54:21 +01:00
Šimon Brandner
b5bad0cc23
Add comments
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:28:29 +02:00
Šimon Brandner
2cd2015e36
Use atom-one-light for light theme
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:24:59 +02:00