Commit graph

4688 commits

Author SHA1 Message Date
Šimon Brandner
96c16354ca
Fix soft crash
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-22 15:47:15 +02:00
Jaiwanth
94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
Dariusz Niemczyk
7bd3535b9f
Merge pull request #6454 from SimonBrandner/feature/image-view-load-anim/18186
* Give lightbox a background load animation
* Extends IMediaEventContent by thumbnail info
* Give image view panel a loading animation
* Initial implementation of loading animation
* Take panel height into account
* Update animation speed
* Add some null guards
* Fix animation issues
* Move animations into _animations
* Where does that magic number come from?
* Remove awaiting setState()
* Use CSS var in JS
* Handle prefers-reduced-motion
* More prefers-reduced-motion friendliness

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-21 18:05:13 +02:00
Dariusz Niemczyk
2d1d42b90e
Globally replace all console.logs via codemod (#6827)
This commit replaces all the `console.log` to `logger.log` via an automated script.
Related: vector-im/element-web#18425
2021-09-21 09:48:09 -06:00
Šimon Brandner
7022ab4f8a
Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186 2021-09-21 17:36:26 +02:00
Travis Ralston
a655dde5eb
Merge pull request #6839 from SimonBrandner/task/rooms-ts
Convert `/src/components/views/rooms` to TS
2021-09-21 09:13:23 -06:00
Travis Ralston
2eea606442
Merge pull request #6815 from SimonBrandner/task/elements-ts
Convert `/src/components/views/elements` to TS
2021-09-21 09:12:56 -06:00
Germain
14c92b72b2
Merge pull request #6842 from matrix-org/gsouquet/fix-19016 2021-09-21 10:14:01 +01:00
Šimon Brandner
f84a98b933
Fix enum casing once again
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-21 08:25:25 +02:00
Šimon Brandner
bce4d44d0d
Revert Firefox composer delation hacks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-20 17:32:54 +02:00
Šimon Brandner
6d916bfdde
Fix enum casing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-20 17:10:22 +02:00
Travis Ralston
5b8279dd16
Merge pull request #6837 from SimonBrandner/fix/ctrl-backspace
Don't `fakeDeletion()` when `CTRL` is pressed
2021-09-20 08:34:31 -06:00
Šimon Brandner
60e47c759d
Convert AppsDrawer to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-20 16:20:00 +02:00
David Baker
b69f3f2dff
Merge pull request #6830 from matrix-org/t3chguy/fix/npe2
Fix accessing field on oobData which may be undefined
2021-09-20 13:38:20 +01:00
Germain Souquet
0a5e1772a5 hide thread info when there are 0 replies 2021-09-20 12:55:57 +01:00
Šimon Brandner
d9e8c32341
Convert E2EIcon to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-20 13:41:38 +02:00
Šimon Brandner
4eda5b186a
Handle MacOS option key
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-19 07:37:25 +02:00
Šimon Brandner
649b655a48
Don't fake deletion when CTRL is pressed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-18 20:43:23 +02:00
Travis Ralston
eb0859c4a6
Merge pull request #6831 from SimonBrandner/fix/end-of-line-emoji-edit/19084
Convert end-of-line emoji when editing
2021-09-18 00:47:06 -06:00
Šimon Brandner
36decbb6dd
Fix pill deletion on FF 78
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-17 19:25:28 +02:00
Šimon Brandner
b1ba5fb48c
Convert end-of-line emoji when editing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-17 19:13:46 +02:00
Michael Telatynski
1db2a745e8 Fix accessing field on oobData which may be undefined 2021-09-17 18:03:31 +01:00
Šimon Brandner
e1445f71bd
Convert AppTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-17 18:47:15 +02:00
Šimon Brandner
9a2d61bf20
Merge remote-tracking branch 'upstream/develop' into fix/emoji-dupe/19073 2021-09-17 17:54:07 +02:00
Michael Telatynski
af42a31794 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064 2021-09-17 10:22:57 +01:00
Michael Telatynski
68768002bb use more generic room type instead of boolean flag 2021-09-17 10:19:30 +01:00
Šimon Brandner
a5ee20febf
Simplifie code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-16 21:04:55 +02:00
Šimon Brandner
f4f40ce558
Fix code to move end of range more simply and safely
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-16 21:02:28 +02:00
Dariusz Niemczyk
0be6073058
Fix PR comments 2021-09-16 17:13:41 +02:00
Dariusz Niemczyk
d6788b023b
Fix PR comments 2021-09-16 16:04:18 +02:00
Dariusz Niemczyk
78587558d8
Transcriptify thread events a bit 2021-09-16 16:02:06 +02:00
Michael Telatynski
28bc8010a7 Say Joining space instead of Joining room where we know its a space 2021-09-16 11:20:01 +01:00
Michael Telatynski
4bb9eeb7a5 Convert RoomPreviewBar to Typescript 2021-09-16 11:09:58 +01:00
David Baker
4f53e6cddd Merge remote-tracking branch 'origin/develop' into dbkr/fix_roomlist_prompt 2021-09-15 15:13:52 +01:00
David Baker
0f98c9127d Fix checks to show prompt to start new chats
We compared the length of the list rooms but not historical or favourite.

Caught by new version of typescript when I tried to upgrade.
2021-09-15 15:08:23 +01:00
Travis Ralston
7b9dc09cd4
Merge pull request #6784 from SimonBrandner/fix/end-of-line-emoji
Replace plain text emoji at the end of a line
2021-09-14 13:33:34 -06:00
Travis Ralston
333418232d
Merge pull request #6808 from SimonBrandner/task/context_menus-ts
Convert `/context_menus` and `/avatars` to TS
2021-09-14 13:07:15 -06:00
Eric Eastwood
fddc20dd89
Remove replies from hidden events when shown with messages.ViewSourceEvent (#6796)
As discovered in https://github.com/vector-im/element-web/issues/10391#is

Previously, if you turned on the `showHiddenEventsInTimeline` labs flag, edit (`m.replace`) events
that also have a `m.in_reply_to` field, will show the reply in the timeline.

ex.
```
{
  "type": "m.room.message",
  "content": {
    "body": " * foo",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo",
      "msgtype": "m.text"
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$yvuev9bF2nLRf8fscG55njpVjY3FHJzWgZ4BKI9_0eg",
      "m.in_reply_to": {
        "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
      }
    }
  }
}
```
2021-09-14 12:28:28 -05:00
Šimon Brandner
5baaa6b77e
Convert MemberStatusMessageAvatar to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:12 +02:00
Michael Telatynski
e37f6b96d7 Fix RoomTile subscribing to wrong event emitter for room name 2021-09-14 14:36:11 +01:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Dariusz Niemczyk
e913f03a67
Add missing types 2021-09-13 22:11:43 +02:00
Šimon Brandner
1a128c3a00
Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 15:32:44 +02:00
Šimon Brandner
f4ca073b4a
Don't auto replace if not enabled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 10:26:15 +02:00
Šimon Brandner
fd022310b3
Merge remote-tracking branch 'upstream/develop' into fix/end-of-line-emoji
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 10:21:56 +02:00
Michael Telatynski
41676b4a9b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891 2021-09-10 11:09:52 +01:00
Michael Telatynski
aff9be6120 Surface unsent messages on the sublist notification badge too 2021-09-10 10:58:13 +01:00
Michael Telatynski
bbe714257e Show unsent message warning on Space panel button 2021-09-10 09:17:31 +01:00
Germain
d475b7f1ea
Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 18:49:38 +01:00
Travis Ralston
bdb29e96fa
Merge pull request #6766 from matrix-org/travis/measure-encryption-perf
Add config option to turn on in-room event sending timing metrics
2021-09-09 10:38:15 -06:00