10230 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	8cf17a66e5	Very basic Jitsi integration ... Replaces the conference calling by adding a Jitsi widget. No support for continuing the call on room change currently, so hidden behind a feature flag. Existing behaviour is preserved by default.	2018-06-15 15:12:32 +01:00
David Baker	a25cdb6ce5	Merge pull request #1970 from matrix-org/dbkr/remove_tag_panel_feature_flag ... Remove tag panel feature flag	2018-06-15 12:04:10 +01:00
David Baker	9567ffcb9f	Remove tag panel feature flag ... We forgot to remove this when taking tagpanel out of labs, so now this flag just does nothing.	2018-06-15 11:56:44 +01:00
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	349f95d5ab	Merge pull request #1957 from matrix-org/t3chguy/roomsublist_search_aliases ... apply roomlist searchFilter to aliases if it begins with a `#`	2018-06-15 10:55:32 +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
David Baker	a3bc68c562	Merge pull request #1967 from matrix-org/luke/fix-crash-on-unspecified-thumbnail-info ... Fix crash on unspecified thumbnail info, and handle gracefully	2018-06-14 16:10:35 +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
David Baker	3e6b3215cf	Update WidgetUtils.js ... Fix fixed comment	2018-06-14 13:49:23 +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	e1d3c2e4c7	run gen-i18n and prune-i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 13:36:39 +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
David Baker	36574ca0fb	Fix doc	2018-06-14 13:03:42 +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
David Baker	5523c1e50a	Merge pull request #1964 from matrix-org/t3chguy/tag_panel_a11y ... fix styling of clearButton when its not there	2018-06-14 11:47:44 +01:00
Michael Telatynski	3b501137a5	change cursor:pointer iff clicking TagPanel background does something ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 11:42:21 +01:00
Michael Telatynski	c811c30c0d	fix styling of clearButton when its not there ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 11:36:04 +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	384c974589	tidy up if statements and fix up comments ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 11:16:57 +01:00
Michael Telatynski	3165a99f52	Merge pull request #1932 from matrix-org/t3chguy/audio_output ... Select audio output for WebRTC	2018-06-14 11:11:53 +01:00
Michael Telatynski	2454540bc0	Merge branch 'develop' into t3chguy/audio_output	2018-06-14 11:03:59 +01:00
David Baker	742a2d0111	Merge pull request #1962 from matrix-org/t3chguy/codeblock_notice ... move css rule to be more generic; remove overriden rule	2018-06-14 10:57:58 +01:00
David Baker	84a9c6a824	Merge pull request #1960 from matrix-org/t3chguy/tag_panel_a11y ... improve tag panel accessibility and remove a no-op dispatch	2018-06-14 10:56:03 +01:00
David Baker	2e53baaaff	Merge pull request #1963 from matrix-org/revert-1961-dbkr/fix_devtools_exception ... Revert "Fix exception when opening dev tools"	2018-06-14 10:52:53 +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	a257dc27c5	move css rule to be more generic; remove overriden rule ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 19:08:24 +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	75abb415d4	improve tag panel accessibility and remove a no-op dispatch ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 16:17:26 +01:00
Michael Telatynski	ac77b2d9ec	run gen-i18n and prune-i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 16:00:57 +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
David Baker	1cb794753e	Simplify & refactor some widget stuff ... * ScalarMessaging onMessage was getting the current room ID by listening for view_and remembering the room id or alias, and so having to look up the alias if it was alias. We have RoomViewStore for this. * Move waitForUserWidget into WidgetUtils * s/require/import/	2018-06-13 10:39:52 +01:00