Commit graph

14034 commits

Author SHA1 Message Date
Travis Ralston
ef33adce01 Merge branch 'travis/integs/widgets' into travis/integs/account_set 2019-08-12 13:02:23 -06:00
Travis Ralston
60778d843d Merge branch 'travis/integs/base' into travis/integs/account_set 2019-08-12 13:02:19 -06:00
Weblate
04a52f707e Merge branch 'origin/develop' into Weblate. 2019-08-12 14:58:00 +00: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
David Baker
b694a56689 i18n 2019-08-12 14:48:02 +01:00
David Baker
0c4b29faa9 Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is 2019-08-12 14:47:40 +01:00
David Baker
4d33438acb c+p fail 2019-08-12 14:46:04 +01:00
David Baker
0b51a5f452 c+p fail 2019-08-12 14:45:15 +01:00
David Baker
115e4c0370 Remove IS access token too 2019-08-12 14:40:11 +01:00
David Baker
ebc84b4445 Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is 2019-08-12 14:39:46 +01:00
David Baker
f358b6162d Remove the access token for the old IS
Pretty important that we don't send that to the new IS...
2019-08-12 14:38:49 +01:00
David Baker
384f07adb2 Disconnect from IS button 2019-08-12 14:36:48 +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
Weblate
8e33b52bd2 Merge branch 'origin/develop' into Weblate. 2019-08-12 13:19:21 +00: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
Weblate
9636bc5a33 Merge branch 'origin/develop' into Weblate. 2019-08-12 12:48:47 +00:00
Tuomas Hietala
36a396247a Translated using Weblate (Finnish)
Currently translated at 99.1% (1693 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-08-12 12:48:47 +00: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
David Baker
bc088e4472 add comment 2019-08-12 13:31:31 +01:00
David Baker
10b19622db Don't clear field on failure 2019-08-12 13:29:52 +01:00
David Baker
bc66545fd0 shorten url by default 2019-08-12 13:11:05 +01:00
David Baker
06905bc5bb Actually appease linter 2019-08-12 12:05:25 +01:00
David Baker
bf9caa7fd8 add the rest of the files 2019-08-12 11:51:44 +01:00
David Baker
1067457d63 rerun i18n 2019-08-12 11:51:08 +01:00
David Baker
417d9b6af8 nicer way to appease linter 2019-08-12 11:50:11 +01:00
Jeff Huang
66e6ed2d17 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1709 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-08-12 04:07:53 +00:00
Besnik Bleta
e346c17006 Translated using Weblate (Albanian)
Currently translated at 99.5% (1701 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-08-12 04:07:52 +00: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
d2c7a5a979 Also check that the client even exists 2019-08-10 14:59:13 -06:00
Travis Ralston
58ccc7eb0c Don't fetch widgets unless logged in 2019-08-09 18:01:08 -06:00
Travis Ralston
74ce5c3541 Read integration managers from account data
For https://github.com/vector-im/riot-web/issues/4913 / https://github.com/vector-im/riot-web/issues/10161

Relies on the structure defined by [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957)

This is just the bit of code to parse the user's widgets (while watching for changes) and allow for it to be the default manager.
2019-08-09 17:35:59 -06:00
Travis Ralston
3a4c6f3eac Appease the linter again 2019-08-09 17:20:37 -06:00
Travis Ralston
018b4f5d41 Use the default integration manager for config options 2019-08-09 17:08:26 -06:00
Travis Ralston
5a15e78fe4 Appease the linter 2019-08-09 16:14:36 -06: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
David Baker
4075cdde7f lint 2019-08-09 18:59:57 +01:00
Weblate
18dbccb062 Merge branch 'origin/develop' into Weblate. 2019-08-09 17:16:44 +00: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
David Baker
c76514fceb Add UI in settings to change ID Server
Just changes the current ID server being used

To come in subsequent PRs:
 * Store this in account data
 * Check for terms or support the proper UI for accepting terms when setting
 * Support disconnecting

Part 1 of https://github.com/vector-im/riot-web/issues/10094
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1013
2019-08-09 18:07:58 +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
Weblate
f5480a2e99 Merge branch 'origin/develop' into Weblate. 2019-08-09 16:16:25 +00: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
Weblate
f520957051 Merge branch 'origin/develop' into Weblate. 2019-08-09 15:55:12 +00: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
Weblate
d629f9a177 Merge branch 'origin/develop' into Weblate. 2019-08-09 15:54:56 +00:00
Michael Telatynski
cc0b698c92
Merge pull request #3296 from matrix-org/t3chguy/remove_legacyLoginParams
Get rid of support for legacy login params
2019-08-09 16:54:51 +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
Weblate
930e7b15b9 Merge branch 'origin/develop' into Weblate. 2019-08-09 14:39:04 +00:00
Kévin C
0050ed7e73 Translated using Weblate (French)
Currently translated at 100.0% (1709 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-08-09 14:39:04 +00:00
Michael Telatynski
787e9feeff Get rid of support for legacy login params
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 15:34:32 +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
Michael Telatynski
ee3542453e Fix RoomAvatarEvent historic fallback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 11:31:04 +01:00
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
Weblate
0b8ee2d196 Merge branch 'origin/develop' into Weblate. 2019-08-08 16:48:55 +00: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
Weblate
8a36973695 Merge branch 'origin/develop' into Weblate. 2019-08-08 16:48:23 +00: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
Jeff Huang
c2effe47c4 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1697 of 1697 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-08-08 15:01:53 +00:00
Weblate
5fbb95c2a4 Merge branch 'origin/develop' into Weblate. 2019-08-08 13:26:21 +00: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
Weblate
6dea2519ae Merge branch 'origin/develop' into Weblate. 2019-08-08 08:48:49 +00: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
Nathan Follens
35d2aac269 Translated using Weblate (West Flemish)
Currently translated at 100.0% (1696 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
2019-08-07 14:07:36 +00:00
Walter
e163df17e2 Translated using Weblate (Russian)
Currently translated at 100.0% (1696 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-08-07 14:07:35 +00:00
Kévin C
06649d6d54 Translated using Weblate (French)
Currently translated at 100.0% (1696 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-08-07 14:07:35 +00:00
Tirifto
4aaf67d514 Translated using Weblate (Esperanto)
Currently translated at 99.9% (1695 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-08-07 14:07:35 +00:00
Nathan Follens
d7fff4db8c Translated using Weblate (Dutch)
Currently translated at 100.0% (1696 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-08-07 14:07:34 +00:00
Slavi Pantaleev
f7cc8d638e Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1696 of 1696 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-08-07 14:07:34 +00: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
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