Travis Ralston
8017f0a4a1
Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real
2019-01-03 16:00:23 -07:00
Christopher Medlin
384320e29f
Consistently order flairs based on room configuration.
2018-12-24 14:46:36 -08:00
Bruno Windels
67e0030ccd
Merge branch 'develop' into experimental
2018-11-26 13:10:29 +01:00
Maxwell Kepler
5d35ce9449
Changed letter case.
2018-10-24 19:06:48 +01:00
Bruno Windels
30e6fdc122
fix lint
2018-10-24 14:36:08 +02:00
Bruno Windels
f2efbc15f4
apply color categories to sender profile name
2018-10-23 10:49:44 +02:00
Bruno Windels
2a264f36b7
style date separator
2018-10-23 10:25:04 +02:00
Maxwell Kepler
5e9db3647a
Fixed minor typo in comment
2018-10-22 21:03:39 +01:00
Maxwell Kepler
54f9231582
Added badge to GIFs ( https://github.com/vector-im/riot-web/issues/7344 )
2018-10-22 20:57:58 +01:00
Aaron Raimist
58488c076e
Fix more lint errors
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-11 21:54:55 -05:00
Will Hunt
17915b5082
Merge branch 'develop' into hs/purge-irc-hack
2018-10-03 19:39:14 +01:00
Will Hunt
fe788486b7
Drop (IRC) suffix hacks
2018-10-03 19:34:06 +01:00
Bruno Windels
debcc20604
also show spinner on new CATCHUP state
2018-08-30 15:39:48 +02:00
David Baker
6cbe4144d4
unused import
2018-08-29 18:28:16 +01:00
David Baker
ab10b5493b
Support room creation events
...
For https://github.com/vector-im/riot-web/issues/7164
2018-08-20 16:20:59 +01:00
Michael Telatynski
7c3873b449
fix @room
pill href=undefined and @room parsing breaking subsequent pills
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 12:18:10 +01:00
Akihiko Odaki
f941c93322
Import react as React in src/components/views/messages/MStickerBody.js
...
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-07-04 18:28:56 +09:00
Luke Barnard
6345fcb8f2
Fix incorrectly positioned copy button on <pre>
blocks
2018-06-27 11:31:55 +01:00
Luke Barnard
383dccebb4
Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes
...
notif panel fixes
2018-06-25 09:53:24 +01:00
Michael Telatynski
f7a0ad3aa0
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-23 01:29:38 +01:00
Michael Telatynski
807d72f2d9
nullguard SenderProfile,broke when NotifPanel had evs from forgotten rooms
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-23 01:22:38 +01:00
Luke Barnard
5b8e453484
Merge pull request #1991 from matrix-org/t3chguy/delint_MImageBody
...
delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry
2018-06-22 10:38:56 +01:00
David Baker
e67dae704a
Take replies out of labs!
2018-06-20 09:57:11 +01:00
Michael Telatynski
fffb8379d8
delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-19 08:37:11 +01:00
David Baker
499bb5cfb4
Merge pull request #1972 from matrix-org/t3chguy/media_fixes
...
fix e2ee file/media stuff
2018-06-18 13:56:00 +01:00
Michael Telatynski
3ebec92ac5
replace hardcoded matrix.to
with reference to const in matrix-to
...
for easier changing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:27:47 +01:00
David Baker
88a807d89b
Merge pull request #1965 from matrix-org/t3chguy/show_redacted_sticker
...
check type before msgtype in the case of `m.sticker` with msgtype
2018-06-15 10:56:33 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
...
Share Dialog
2018-06-15 10:52:27 +01:00
Michael Telatynski
826df5765c
add rel noopener to cross origin loader (currently rel="undefined")
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 10:27:21 +01:00
Luke Barnard
2eb23ed234
Add loadedImageDimensions to initial state
2018-06-14 15:53:49 +01:00
Luke Barnard
2d14d51ecb
Handle images without width/height info correctly
...
Prior to #1912 , height fix up of image events without an `info` in their
content would fail, setting `style.height = null + "px"`.
Now that all thumbnail sizing is done through one path, we can fix the
same problem for all cases (images, stickers, e2e/non-e2e) by handling
images without `info` correctly.
At the bare minimum, we use a null-guard that will make sure an image
without an `info` does not appear in the timeline (as a spinner or
otherwise until loaded). When loaded, we size it like any other image
by using the natural dimensions of the loaded image in place of `info`.
Note that we do not apply the same logic to images that *do* specify an
`info` with `w` and `h` keys. If the aspect ratio of the image does not
match that of the event, we use the one in `info` even when the image
has loaded.
2018-06-14 15:44:55 +01:00
Luke Barnard
c8d233c0a6
If unspecified, don't crash if missing thumbnail info
...
applies to stickers/images.
We might want to consider to do that is better than assuming a aspect
ratio of 600 x 800 (4:3).
2018-06-14 14:19:30 +01:00
Michael Telatynski
9a225840ce
check type before msgtype in the case of m.sticker
with msgtype (undef)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 12:00:53 +01:00
Luke Barnard
7029e9ac74
Merge pull request #1912 from matrix-org/luke/kill-mimage-fixupheight
...
Implement slightly magical CSS soln. to thumbnail sizing
2018-06-14 11:17:15 +01:00
Michael Telatynski
20caea47f8
make more generic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:32:21 +01:00
Michael Telatynski
846c14062a
show redacted stickers like other redacted messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:28:35 +01:00
Michael Telatynski
64bcf6fd7e
allow ContextualMenu to run without background, for tooltips & fix copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
Luke Barnard
2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight
2018-06-11 14:24:40 +01:00
Travis Ralston
033c41a2a8
Align pinned message contents and reduce image size
...
Fixes https://github.com/vector-im/riot-web/issues/5421
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 18:40:48 -06:00
Luke Barnard
538979a4ee
Fix MVideoBody spinner
2018-05-22 17:13:45 +01:00
Luke Barnard
c249bee9b5
Grammar
2018-05-22 16:09:54 +01:00
Luke Barnard
fb5dd4a410
Remove spurious fixupHeight
2018-05-22 10:46:10 +01:00
Luke Barnard
e4f8c09c32
Only include placeholder in DOM when necessary
2018-05-22 10:43:16 +01:00
Luke Barnard
e9ae3de00f
Merge branch 'develop' into luke/kill-mimage-fixupheight
2018-05-21 17:15:54 +01:00
Luke Barnard
836dc8b0ef
Factor out all shared logic between MStickerBody and MImageBody
...
The benefits of this:
- One code path for determining spinner/placeholder and it's position
for loading images/stickers. This includes spinner used in e2e
decryption of images.
- Very small definition for MStickerBody, only overriding the minimal
differences is has from MImageBody.
The disadvantages:
- Slightly more complicated MImageBody, but hopefully not less
readable.
2018-05-21 16:59:13 +01:00
Luke Barnard
015093b371
Move inline style to stylesheet
2018-05-18 11:34:41 +01:00
Luke Barnard
7e7e2a7473
Add more comments to explain thumbnail sizing
2018-05-18 10:27:22 +01:00
Luke Barnard
d11442de04
Adjust comment
2018-05-18 10:15:59 +01:00
Luke Barnard
b41b9aa4fa
Remove fixupHeight call from MStickerBody
2018-05-18 09:58:52 +01:00
Luke Barnard
bbcf2fea53
Fix e2e image thumbnail spinner containing box correct size
2018-05-18 09:47:49 +01:00