Commit graph

730 commits

Author SHA1 Message Date
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
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
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
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
Šimon Brandner
61cd026d7a
Improve comment
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-24 13:07:25 +01:00
J. Ryan Stinnett
3db6a45010 Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes"
This reverts commit 5c1b38a48c, reversing
changes made to ec4a39a694.
2021-02-23 12:03:08 +00:00
Šimon Brandner
ce1be7a4cd
Use length instead of the first element
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 07:49:26 +01:00
Šimon Brandner
c9baff1e10
Move the _addCodeElement() call down a bit
We can skip this if the first if statement is true

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 07:46:03 +01:00
Šimon Brandner
c965119410
Add _addCodeElement method
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 07:40:53 +01:00
Šimon Brandner
6149567c62
Add <code> if it's missing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-22 13:43:57 +01:00
Šimon Brandner
87a2454556
Revert "Don't show copy button if there is no <code>"
This reverts commit c76cc33ebf.
2021-02-22 13:41:20 +01:00
Šimon Brandner
c76cc33ebf
Don't show copy button if there is no <code>
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-22 13:23:39 +01:00
J. Ryan Stinnett
5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes
Improve URL preview formatting and image upload thumbnail size
2021-02-17 11:37:37 +00:00
Michael Telatynski
6cb3381df5 Remove redundant lockOrigin parameter from usercontent
now that each Element has its own, and not usercontent.riot.im
it only has to permit its own origin
2021-02-16 18:03:12 +00:00
Šimon Brandner
6b0b46b917
Fix duplication caused by highlighting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 14:20:19 +01:00
Šimon Brandner
895be6e7a6
Added second comment back
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 14:02:45 +01:00
Šimon Brandner
5cf126dea3
Added comment back
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 13:41:24 +01:00
Šimon Brandner
b97d8979c7
Remove nested for loop
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 13:18:23 +01:00
Šimon Brandner
4a7bc74e99
Fix duplication of codeblock elements
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 19:46:30 +01:00
William Kray
cd1a99186b change image rendering size max height 2021-02-08 09:26:10 -08:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner
ec73f2ec49
Change comment styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:30:54 +01:00
Šimon Brandner
77248725ed
Added onHeightChanged call
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:29:24 +01:00
Šimon Brandner
ad5c8fe7e4
Revert "Rerender MessagePanel"
This reverts commit c7e61ac71d.
2021-02-05 08:27:07 +01:00
Šimon Brandner
9bd8fef6b3
Change comment styling
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-05 08:22:02 +01:00
Šimon Brandner
9db86a38f6
Update src/components/views/messages/TextualBody.js
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-04 17:58:21 +01:00
Travis Ralston
c1b33d3e2c Fix Jitsi widgets causing localized tile crashes
Seems to be that as part of the layout work the timing sequence for when `.getRoom().widgets` will work changed. We can get around this with `initIfNeeded` which will no-op in the worst case.

This also includes a copy change to make ended conferences stop lying about where to find the widget. This is work towards https://github.com/vector-im/element-web/issues/15739
2021-01-27 14:40:04 -07:00
Šimon Brandner
c7e61ac71d
Rerender MessagePanel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 17:32:57 +01:00
Šimon Brandner
97c5058f00
Removed log
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:10:21 +01:00
Šimon Brandner
da09362f99
Added option to hide line numbers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:08:55 +01:00
Šimon Brandner
c737543114
Remove commented lines
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:04:51 +01:00
Šimon Brandner
bd2423a52c
Added line numbering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 10:53:18 +01:00
Šimon Brandner
14bf169631
Handle small codeblocks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 15:01:23 +01:00
Šimon Brandner
f8179f0c7a
Fix inverted icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 14:08:57 +01:00
Šimon Brandner
25f30ca79f
Fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:05:23 +01:00
Šimon Brandner
072cbe98b5
Simplifie
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:03:05 +01:00
Šimon Brandner
8535a11dd2
Rename some variable and cleanup a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 08:44:32 +01:00
Šimon Brandner
58b2c18cf5
This somehow works
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 21:02:39 +01:00