10289 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Luke Barnard	3cadbd3974	Include decryption error in decryption failure metrics	2018-06-13 11:21:26 +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
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
Luke Barnard	5a275fcfef	Merge pull request #1953 from matrix-org/t3chguy/skip_set_displayname ... don't set the displayname on registration as Synapse now does it	2018-06-13 10:03:35 +01:00
Michael Telatynski	41be46a712	apply roomlist searchFilter to aliases if it begins with a # ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 09:51:35 +01:00
Luke Barnard	791784399a	Merge pull request #1955 from matrix-org/t3chguy/create_room_dialog_scaling ... allow CreateRoom to scale properly horizontally	2018-06-13 09:45:29 +01:00
Luke Barnard	230de44071	Adjust comment	2018-06-13 09:38:57 +01:00
Luke Barnard	64b86108d0	Only track decryption failures	2018-06-13 09:38: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	175f1aa15c	don't set the displayname on registration as Synapse now does it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 16:43:54 +01:00
Luke Barnard	b18a8c483e	Merge pull request #1952 from matrix-org/luke/context-menus-downwards-keep-vertically-on-screen ... Keep context menus that extend downwards vertically on screen	2018-06-12 16:27:57 +01:00
Luke Barnard	ffcba9498e	Keep context menus that extend downwards vertically on screen ... This fixes https://github.com/vector-im/riot-web/issues/3429 in the case of RoomList context menus *and* EventTile context menus. This was mostly stolen from #1903 and it would be good to factor things out at a later date such that #1903 is replaced with similar logic within ContextualMenu.	2018-06-12 16:14:24 +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
David Baker	e858cf3bcb	Merge branch 'master' into develop	2018-06-12 14:26:29 +01:00
David Baker	13d52065f5	Merge branch 'release-v0.12.7'	2018-06-12 14:23:48 +01:00
David Baker	ef1f580abb	v0.12.7	2018-06-12 14:21:30 +01:00
David Baker	0ad738d510	Prepare changelog for v0.12.7	2018-06-12 14:21:30 +01:00
David Baker	334dccbdc7	Released js-sdk	2018-06-12 14:14:14 +01:00
Luke Barnard	0934006817	Track decryption success/failure rate with piwik ... Emit a piwik event when a decryption occurs in the category "E2E" with the action "Decryption result" and the name either "failure" or "success". NB: This will cause Riot to a lot of networking when decrypting many events. One HTTP request per decrypted event should be expected.	2018-06-12 14:13:09 +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	f9b3f0f9d1	run gen-i18n and prune-i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 11:22:02 +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	e3c455e599	Style the ShareDialog ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 11:22:01 +01:00
Michael Telatynski	e7a4a0b2e0	allow context-menus/tooltips to work over modals ... 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	50e08c7560	Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone ... re-run checkIfAlone if a member change occurred in the active room	2018-06-08 17:36:42 +01:00
David Baker	06321deea9	Merge pull request #1935 from turt2live/travis/persist-pinned-open ... Persist pinned message open-ness between room switches	2018-06-08 16:48: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
David Baker	3983535536	Merge pull request #1916 from akihikodaki/sinon ... Update sinon to 5.0.7	2018-06-08 16:41:11 +01:00
Michael Telatynski	0b9b03c9ee	re-run checkIfAlone if a member change occurred in the active room ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-07 22:01:27 +01:00
Travis Ralston	83f0459a7f	Merge branch 'develop' into travis/persist-pinned-open	2018-06-06 09:17:08 -06:00
David Baker	4834816a06	v0.12.7-rc.1	2018-06-06 16:06:45 +01:00
David Baker	c8bf743506	Prepare changelog for v0.12.7-rc.1	2018-06-06 16:06:44 +01:00
David Baker	881e9a8070	js-sdk rc.1	2018-06-06 16:00:16 +01:00
David Baker	0d9ba17677	Merge pull request #1944 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk ... Update from Weblate.	2018-06-06 15:52:54 +01:00
Walter	03d67988e8	Translated using Weblate (Russian) ... Currently translated at 99.8% (1188 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/	2018-06-06 14:40:42 +00:00
Weblate	8b33c13517	Merge remote-tracking branch 'origin/develop' into develop	2018-06-06 09:08:58 +00: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