Travis Ralston
60778d843d
Merge branch 'travis/integs/base' into travis/integs/account_set
2019-08-12 13:02:19 -06:00
Michael Telatynski
bb23374b8a
Merge pull request #3304 from matrix-org/t3chguy/un-hardcode-themes-in-settings
...
Consolidate Themes into ThemeController. Remove hardcoded themes in view
2019-08-12 15:57:56 +01:00
Michael Telatynski
7bdac85a2a
Break themes out into a separate file
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 14:24:12 +01:00
Michael Telatynski
691b9145ee
Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig
...
Deduplicate code in ModularServerConfig by extending ServerConfig
2019-08-12 14:19:17 +01:00
Michael Telatynski
76f5977a2a
Merge pull request #3299 from matrix-org/t3chguy/fix_registrationForm_defaultValue_Field
...
RegistrationForm: the Fields are controlled, fix default values
2019-08-12 13:48:42 +01:00
Michael Telatynski
916af736ad
Consolidate Themes into ThemeController. Remove hardcoded themes in view
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:43:34 +01:00
Michael Telatynski
3e08bf6ecb
Deduplicate code in ModularServerConfig by extending ServerConfig
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:34:12 +01:00
Travis Ralston
ffa49df889
Refactor integration manager handling into a common place
...
It was already in a common place, but this is the boilerplate for supporting multiple integration managers, and multiple integration manager sources.
For https://github.com/vector-im/riot-web/issues/4913 / https://github.com/vector-im/riot-web/issues/10161
2019-08-09 16:08:06 -06:00
Michael Telatynski
75bcd61934
Merge pull request #3298 from matrix-org/t3chguy/Modal.createX_promise
...
change Modal async/await signature to use raw promises
2019-08-09 18:16:40 +01:00
Michael Telatynski
242f23c753
RegistrationForm: the Fields are controlled, fix default values
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 18:08:17 +01:00
Michael Telatynski
49c7730503
change Modal async/await signature to use raw promises
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 17:29:22 +01:00
Michael Telatynski
a9afdec24a
Merge pull request #3297 from matrix-org/t3chguy/Modal.createX_promise
...
Modal.createX return thenable which extends onFinished, for async/await
2019-08-09 17:16:21 +01:00
Michael Telatynski
13c7149592
Merge pull request #3294 from matrix-org/t3chguy/mount-guard
...
Add mount-guards to MImageBody
2019-08-09 16:55:08 +01:00
Michael Telatynski
7fe078c07a
Modal.createX return thenable which extends onFinished, for async/await
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 16:47:22 +01:00
David Baker
fcdbce1dda
Change throttle to debounce
...
And add an explanation of whyI think one's more apropriate than the
other for this.
2019-08-09 15:30:05 +01:00
Michael Telatynski
72a83a8e6e
Add mount-guards to MImageBody
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 14:51:07 +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
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
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
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
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
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
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
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
Bruno Windels
299cf8542c
Split MessageEditor in edit-specifics & reusable part for main composer
2019-08-05 15:31:18 +02: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
Michael Telatynski
1e9881dd7d
Allow setting in electron whether or not to auto hide menu bar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 11:58:53 +01:00
Michael Telatynski
e400053b69
s/hasCloseX/hasCloseButton/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 10:45:49 +01:00
Andrew Morgan
f80cbebb9d
Don't switch rooms when forgetting a room ( #3275 )
...
Don't randomly change to another room upon forgetting a room.
2019-08-05 10:34:46 +01:00