mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 02:01:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
10227 commits 219 branches 562 tags 474 MiB
Commit graph

3408 commits

Author SHA1 Message Date
David Baker
73b49d6d5e
Merge pull request #1968 from matrix-org/t3chguy/fix_QuestionDialog 
QuestionDialog pass hasCancelButton to DialogButtons
 2018-06-15 10:58:54 +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
7adbff69dc
QuestionDialog pass hasCancelButton to DialogButtons 
otherwise E2E Q Dialog has OK and Cancel which makes 0 sense
as its just an info dialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 18:58:38 +01:00
Michael Telatynski
7de7275c6d
remove subheadings in ShareDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 18:56:46 +01:00
Luke Barnard
e81edd958b
Merge pull request #1950 from matrix-org/t3chguy/group_invite_contextmenu 
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
 2018-06-14 17:32:24 +01:00
Luke Barnard
5077e9e89b
Merge pull request #1958 from matrix-org/dbkr/widget_waiting 
Fix widgets re-appearing after being deleted
 2018-06-14 17:31:23 +01:00
Michael Telatynski
3b141d7a84
change variable names for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 16:48:00 +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
1346f47a12
allow filtering Group Invite Tiles with the same search filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 14:18:39 +01:00
Michael Telatynski
4e216714b5
remove commented code and move modal.close into a finally block 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 13:53:02 +01:00
Michael Telatynski
33a3cfead6
controlled checkboxes use checked not value 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 13:47:33 +01:00
Michael Telatynski
ef178b282c
use getters on MatrixEvent for roomId and eventId 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 13:44:05 +01:00
Michael Telatynski
bef435e15a
allow ShareEvent to devolve into ShareRoom using checkbox + i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 13:41:12 +01:00
Michael Telatynski
7d7a6f3d9c
ShareDialog share Message, link to timestamp and permalink in ctx menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 13:35:35 +01:00
Michael Telatynski
aa7d62b740
fix naming of methods and fields 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 13:20:16 +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
David Baker
666d469222
Revert "Fix exception when opening dev tools" 2018-06-14 10:52:39 +01:00
David Baker
5804040a9b
Merge pull request #1959 from matrix-org/t3chguy/faded_encrypting_padlock 
fix message appears unencrypted while encrypting and not_sent
 2018-06-14 10:49:14 +01:00
David Baker
bb99950216
Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception 
Fix exception when opening dev tools
 2018-06-14 09:45:19 +01:00
Michael Telatynski
d4578783ef
apply pr review feedback 
fix copyright headers
fix user settings link accessibility
fix typo and add noopener

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 18:46:02 +01:00
David Baker
038b43aabd
Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker 
show redacted stickers like other redacted messages
 2018-06-13 17:28:22 +01:00
David Baker
b81e12e4cc Fix exception when opening dev tools 
Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.

This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.

Fixes https://github.com/vector-im/riot-web/issues/6436
 2018-06-13 16:55:16 +01:00
Michael Telatynski
5cc2361737
change not_sent e2e lock to match colour of text 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 15:52:50 +01:00
David Baker
94125fb566 Fix widgets re-appearing after being deleted 
Widgets would sometimes briefly re-appear after having been deleted.
This was because of the following race:
 * User presses delete, send POST req, we set `deleting`. Widget hides.
 * POST request completes, we unset `deleting` so widget unhides.
 * State event comes down sync so widget hides again.

This fixes this by introducing `waitForRoomWidget` and using it to
wait until the state event comes down the sync until clearing the
`deleting` flag.

Since we now have `waitForRoomWidget`, this also uses it when adding
a widget so the 'widget saved' appears at the same time the widget
does.
 2018-06-13 15:50:19 +01:00
Michael Telatynski
d4b2f06a63
fix message appears unencrypted while in flight 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 13:51:04 +01:00
Luke Barnard
bfb535d05c
Merge pull request #1951 from matrix-org/t3chguy/theme_memberinfo_close_btn 
add mx_filterFlipColor to mx_MemberInfo_cancel img
 2018-06-13 10:04:23 +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
22bec0d67d
allow CreateRoom to scale properly horizontally 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 09:13:32 +01:00
Michael Telatynski
ed779cabc4
add mx_filterFlipColor to mx_MemberInfo_cancel img 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:35:06 +01:00
Michael Telatynski
9dd2184b33
remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:29:05 +01:00
Michael Telatynski
c820836bcc
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:23:11 +01:00
Michael Telatynski
18546dbe06
QR Code align [m] logo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:33:38 +01:00
Michael Telatynski
d8a1feb501
fix Modal typo and refactor BaseDialog to fix " undefined" className 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:02 +01:00
Michael Telatynski
7f1ce52dd3
link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +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
Michael Telatynski
074051297a
add a ShareDialog for sharing users,groups and rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:21:55 +01:00
Luke Barnard
2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-06-11 14:24:40 +01:00
David Baker
8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics 
Pinned message cosmetic improvements
 2018-06-08 16:46:33 +01:00
Michael Telatynski
ffec32c7d9
Merge pull request #1943 from akihikodaki/react 
Import react as React in src/components/views/elements/DNDTagTile.js
 2018-06-06 10:08:52 +01:00
Akihiko Odaki
bf0d03bce3 Import react as React in src/components/views/elements/DNDTagTile.js 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-06-06 17:59:50 +09:00
Travis Ralston
254e8c358a Remove unused imports 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-28 11:38:09 -06:00
Travis Ralston
98613748b6 Move Scalar Widget URL check to WidgetUtils 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-27 11:12:55 -06:00
Travis Ralston
23162c8625 Support third party integration managers in AppPermission 
Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL).

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-27 10:56:50 -06:00
Michael Telatynski
96ec3ab78a
Merge pull request #1934 from turt2live/travis/realtime-pins 
Update pinned messages in real time
 2018-05-27 17:50:23 +01:00
Travis Ralston
929da30df8 onEvent -> onStateEvent 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-27 10:28:47 -06:00