17142 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Telatynski	423a74c99c	Clean up implementation ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-08 20:21:53 +01:00
Michael Telatynski	28b42d512a	Use the room name rather than sender name for fallback room avatar event ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-08 20:07:38 +01:00
J. Ryan Stinnett	3214ed8829	Merge pull request #3289 from matrix-org/jryans/rm-bind-at-reg ... Remove 3PID binding during registration	2019-08-08 17:48:50 +01:00
J. Ryan Stinnett	c2f81a00c4	Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-3pid ... Add controls for toggling discovery in user settings	2019-08-08 17:48:17 +01:00
J. Ryan Stinnett	38e64ce966	Remove 3PID binding during registration ... This disables 3PID binding at registration time, so users won't be discoverable by 3PID by default. Instead, new discovery controls in settings allow you to opt-in. Fixes https://github.com/vector-im/riot-web/issues/10424	2019-08-08 16:25:48 +01:00
J. Ryan Stinnett	e0fb0de83d	Relock gemini-scrollbar deps	2019-08-08 16:01:41 +01:00
Travis Ralston	07d6fa7fdb	Merge pull request #3286 from matrix-org/travis/immutable-dms/basic ... Reuse DMs whenever possible instead of asking to reuse them	2019-08-08 07:26:17 -06:00
J. Ryan Stinnett	11cf7493d9	Disable binding 3PIDs when adding to account ... Binding 3PIDs on the IS is now handled by a separate step in the Discovery section of settings. Fixes https://github.com/vector-im/riot-web/issues/10510	2019-08-08 11:52:21 +01:00
J. Ryan Stinnett	178d6605c4	Add controls for toggling discovery in user settings ... This adds controls for each 3PID to allow the user to choose whether it's bound on the IS. Fixes https://github.com/vector-im/riot-web/issues/10159	2019-08-08 11:35:35 +01:00
David Baker	54ca7b708e	Merge pull request #3285 from matrix-org/dbkr/work_without_is ... Work with no ID server set	2019-08-08 09:48:44 +01:00
Travis Ralston	f85898cdca	Remove ChatCreateOrReuseDialog ... Part of https://github.com/vector-im/riot-web/issues/10416 All usages of the dialog have been replaced with new DM logic.	2019-08-07 12:18:41 -06:00
Travis Ralston	24705d02b7	Replace DM logic in view_start_chat_or_reuse ... Part of https://github.com/vector-im/riot-web/issues/10416 This code is used by the welcome bot logic and the groups/communities section of the app. goHomeOnCancel can be removed because no matter what happens we'll end up in a room with the user (and we aren't showing a dialog anymore).	2019-08-07 12:13:59 -06:00
Travis Ralston	3144b9f1a2	Disable 'Start New Chat' button in MemberInfo if we already have chats ... Part of https://github.com/vector-im/riot-web/issues/10416	2019-08-07 12:06:27 -06:00
Travis Ralston	2ecabd2195	Reuse direct chats when starting new ones ... Part of https://github.com/vector-im/riot-web/issues/10416 This section of code applies to the + button next to PEOPLE in the room list.	2019-08-07 12:01:51 -06:00
David Baker	c09f86f347	re-run i18n	2019-08-07 13:37:24 +01:00
David Baker	9fa5e01f2f	Disable password reset if no ID server	2019-08-07 13:30:52 +01:00
David Baker	d31f1ea7f2	Disable addign threepids if no IS configured	2019-08-07 11:51:42 +01:00
David Baker	bcf53c6e33	Make invite work without an IS ... Also fix it so you can't try to invite a room ID to a room	2019-08-07 11:41:00 +01:00
David Baker	366f7e277a	Make registration work without an IS.	2019-08-07 11:15:56 +01:00
Bruno Windels	66ef08120e	Merge pull request #3282 from matrix-org/bwindels/extract-common-editor-code ... Split MessageEditor up in edit-specifics & reusable parts for main composer	2019-08-07 07:58:52 +00:00
Travis Ralston	610baff09a	Merge pull request #2668 from azuenko/develop ... Fix waste of space of collapsed left panel	2019-08-06 13:54:04 -06:00
Michael Telatynski	f6dbeef204	Merge pull request #3257 from matrix-org/t3chguy/slashcommands_help ... Add help slash command	2019-08-06 18:50:49 +01:00
Michael Telatynski	5e76019b63	fix i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 18:35:33 +01:00
Michael Telatynski	c022f58f3b	Merge pull request #3278 from matrix-org/t3chguy/electron_keep_alt_menu ... Allow setting in electron whether or not to auto hide menu bar	2019-08-06 18:20:22 +01:00
Michael Telatynski	daf1a794e6	Merge pull request #3276 from matrix-org/t3chguy/react16_1 ... Progress towards React 16 compatibility	2019-08-06 18:09:30 +01:00
Michael Telatynski	1e8b304b3c	Remove /tint completely and dedup copyright ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 18:08:17 +01:00
Michael Telatynski	5d048972ab	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 18:06:47 +01:00
Michael Telatynski	ae834f8d05	Split out SlashCommandHelpDialog, group by category and style it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 18:03:38 +01:00
Michael Telatynski	64afaa1df5	Merge pull request #3284 from matrix-org/t3chguy/invite_hide_settings_context_button ... Hide settings button on Room Tile Context Menu for myMembership=invite	2019-08-06 17:18:56 +01:00
Michael Telatynski	2fd371e1dd	prune i18n and get rid of /help header ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 17:07:56 +01:00
Michael Telatynski	734ca0df6e	get rid of /tint for now ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 17:04:02 +01:00
Michael Telatynski	71338d5140	Hide settings button on Room Tile Context Menu for myMembership=invite ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 16:25:29 +01:00
Michael Telatynski	8c446bbd29	Merge pull request #3279 from matrix-org/t3chguy/remove_withMatrixClient ... Remove withMatrixClient as we are committed to using Contexts	2019-08-06 14:12:14 +01:00
Michael Telatynski	d99fb4796f	avoid using import * as Matrix ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 14:04:33 +01:00
J. Ryan Stinnett	accb1eea9f	Move existing 3PID settings UX to account directory	2019-08-06 13:03:49 +01:00
J. Ryan Stinnett	aa0a2a579e	Add copyright headers	2019-08-06 12:43:30 +01:00
J. Ryan Stinnett	ba3e9e3f84	Merge pull request #3283 from matrix-org/jryans/user-settings-toggle-3pid ... Update existing 3PID management UX	2019-08-05 18:56:15 +01:00
Anton Zuenko	a3eb45e0b9	Fix waste of space of collapsed left panel ... Signed-off-by: Anton Zuenko <anton@zuenko.ru>	2019-08-05 18:03:20 +02:00
J. Ryan Stinnett	11f2b4320d	Update existing 3PID management UX ... This tweaks the appearance of the existing 3PID management UX to use a different style for the remove button. This styling will more closely match the soon to be added 3PID discovery settings. Part of https://github.com/vector-im/riot-web/issues/10159	2019-08-05 16:34:04 +01:00
RiotRobot	ab05d8c7a4	Merge branch 'master' into develop	2019-08-05 14:37:17 +01:00
RiotRobot	0e973bf211	Merge branch 'release-v1.5.1'	2019-08-05 14:36:48 +01:00
RiotRobot	9016be22a4	v1.5.1	2019-08-05 14:33:58 +01:00
RiotRobot	92aec936a0	Prepare changelog for v1.5.1	2019-08-05 14:33:58 +01:00
Bruno Windels	a24e41c34f	make i18n build pass (unrelated)	2019-08-05 15:33:42 +02:00
Bruno Windels	299cf8542c	Split MessageEditor in edit-specifics & reusable part for main composer	2019-08-05 15:31:18 +02:00
David Baker	b2d4054958	Merge pull request #3281 from matrix-org/dbkr/user-deactivated-2 ... Let user know their account has been deactivated upon trying to login	2019-08-05 14:16:57 +01:00
Bruno Windels	b531bb58ca	Let user know their account has been deactivated upon trying to login	2019-08-05 13:55:55 +01:00
David Baker	e8fcfbe2bf	Merge pull request #3280 from matrix-org/bwindels/user-deactivated ... Let user know their account has been deactivated upon trying to login	2019-08-05 13:23:40 +01:00
Bruno Windels	7a5167b1a3	Let user know their account has been deactivated upon trying to login	2019-08-05 13:48:25 +02:00
Michael Telatynski	224dac3ffb	Remove withMatrixClient as we are committed to using Contexts ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-05 12:26:31 +01:00