1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Commit Graph

776 Commits

Author SHA1 Message Date
Tulir Asokan
09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
J. Ryan Stinnett
83035b6b6a Merge pull request #5931 from SimonBrandner/fix-indent
Enable indent rule and fix indent
2021-04-30 11:51:22 +01:00
Šimon Brandner
232b87a3b4 Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Jaiwanth
70204d6111 Prevent peeking members from reacting
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 22:41:57 +05:30
Šimon Brandner
46bfbbadf9 Enable indent rule and fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
Michael Telatynski
cc3571c559 fix removed pixelRatio 2021-04-27 09:56:28 +01:00
Michael Telatynski
915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Travis Ralston
c5dd6b4dfb Update action bar to incorporate sending states
This moves most of them out of the context menu.
2021-04-21 16:24:17 -06:00
Tulir Asokan
b8ef67e447 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-04-19 13:37:27 +03:00
Travis Ralston
ac00c80efb Merge pull request #5521 from SimonBrandner/improve-image-view
Improve image view
2021-04-13 19:01:27 -06:00
Šimon Brandner
e1446f01e4 Make ImageView static
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:07:17 +02:00
Tulir Asokan
522d58eb57 Add fake fallback thumbnail URL for encrypted videos
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2021-04-02 20:27:26 +03:00
Šimon Brandner
80854ab6bb Don't show seconds in ImageView
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 09:25:21 +02:00
Šimon Brandner
9606297f7c Merge branch 'develop' into improve-image-view
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:15:51 +02:00
Tulir Asokan
c31967dc97 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-26 21:31:28 +02:00
Robin Townsend
f1a9c5ae93 Fix line numbers when missing trailing newline
_addLineNumbers expected code blocks to contain a trailing newline, but
this is not always the case.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-25 17:38:34 -04:00
Travis Ralston
8587ec888b Merge pull request #5769 from matrix-org/travis/voice-messages/exp
Labs feature: Early implementation of voice messages
2021-03-24 09:56:34 -06:00
Tulir Asokan
99717db762 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-19 21:58:30 +02:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
Travis Ralston
f0d5edbc37 Render voice messages as audio messages for now 2021-03-16 23:48:47 -06:00
Šimon Brandner
b27a8e3c3a Merge branch 'develop' into improve-image-view
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-14 08:30:28 +01:00
Travis Ralston
d3541b78eb Merge pull request #5714 from matrix-org/travis/media-customization
Support a media handling customisation endpoint
2021-03-12 11:01:59 -07:00
Tulir Asokan
8c8b46b984 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-12 14:18:12 +02:00
Panagiotis
be7fb33a67 Merge branch 'develop' into edit-view-source 2021-03-11 17:07:56 +02:00
Travis Ralston
7f52e78748 Make styles dynamic 2021-03-10 21:08:01 -07:00
Travis Ralston
ebf1efe01b docs 2021-03-10 12:32:18 -07:00
Travis Ralston
a7debdd946 Fix tinting for download icon
As shown in https://github.com/vector-im/element-web/issues/16546
2021-03-10 12:32:18 -07:00
Travis Ralston
533c9fed64 Appease the linter 2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca Convert cases of mxcUrlToHttp to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
5b3367d44e Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps 2021-03-09 09:33:19 -07:00
Travis Ralston
eb45731d2e Merge pull request #5735 from matrix-org/travis/use-strict-no
Remove a bunch of useless 'use strict' definitions
2021-03-09 07:24:41 -07:00
Panagiotis
ef267829de Merge branch 'develop' into edit-view-source 2021-03-09 14:49:05 +02:00
J. Ryan Stinnett
d33acaac95 Merge pull request #5713 from panoschal/improve-view-source
Display decrypted and encrypted event source on the same dialog
2021-03-09 11:36:53 +00:00
Travis Ralston
591ccabab9 Remove a bunch of useless 'use strict' definitions 2021-03-08 20:26:08 -07:00
Travis Ralston
fc5b1ed9d6 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:39 -07:00
Panagiotis
7963d7f49e address PR comments
cleanup, change to isEncrypted, comments
2021-03-08 21:21:37 +02:00
Travis Ralston
761ced13f2 Merge pull request #5719 from matrix-org/travis/file-representation
UI refresh for uploaded files
2021-03-08 08:52:43 -07:00
Panagiotis
51ac5421c9 chore: refactor code
pass only the mxEvent object to ViewSource
derive the necessary values inside the component
2021-03-06 11:30:31 +02:00
Panagiotis
2c64dac514 fix: show decrypted source on EditHistory -> ViewSource
pass correct props to the component
2021-03-05 19:57:37 +02:00
Travis Ralston
8d143331a8 Appease the linter 2021-03-04 20:10:47 -07:00
Travis Ralston
5d6e3d5711 UI refresh for uploaded files
Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)

There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
2021-03-04 20:07:48 -07:00
Travis Ralston
08d35073de Improve commentary 2021-03-02 11:04:12 -07:00
Travis Ralston
9cec382865 Change sending->sent state to match new designs
For https://github.com/vector-im/element-web/issues/16424
2021-03-01 16:25:19 -07:00
Šimon Brandner
4f3fe3d236 Add comments
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:09:52 +01:00
Šimon Brandner
b18622efe4 Show full date
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:20:34 +01:00
Šimon Brandner
bd5efc7ceb Pass permallinkCreator to ImageView
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:11:08 +01:00
J. Ryan Stinnett
c57b49a354 Merge pull request #5673 from SimonBrandner/dont-show-copy-button
Add <code> if it's missing
2021-02-24 13:33:39 +00:00
Šimon Brandner
986950697b Rmove unnecessary code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 14:10:09 +01:00
Šimon Brandner
024871f59d Merge branch 'dont-show-copy-button' of https://github.com/SimonBrandner/matrix-react-sdk into dont-show-copy-button 2021-02-24 13:41:16 +01:00
Šimon Brandner
363b753306 Avoid innerHTML
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 13:40:37 +01:00