sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
19,771 Commits 4 Branches 19 Tags
ce21ce8bbea93c9a2b48b0c0c6f341f4360d375b
Commit Graph
513 Commits
Author SHA1 Message Date
Will Hunt ce21ce8bbe Lint 2019-12-09 13:22:45 +00:00
Half-Shot 9f2ccdf913 Add support for displaying avatars and links in bridge info 2019-12-09 13:22:45 +00:00
Half-Shot 0d537ecbb3 Add bridge info tab 2019-12-09 13:22:45 +00:00
Travis RalstonandGitHub 9cae685e22 Merge pull request #3686 from matrix-org/travis/theme-fix 
Ensure the settings page accurately represents theme choices
 2019-11-29 10:17:55 -07:00
Travis RalstonandGitHub 5aad914c25 Merge pull request #3675 from aaronraimist/labs-explain 
Add a link to the labs feature documentation
 2019-11-28 22:07:47 -07:00
Aaron Raimist 4c50ac0e56 Improve wording 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-11-28 22:22:42 -06:00
Travis Ralston 37ec7e6f7e Ensure the settings page accurately represents theme choices 
Fixes https://github.com/vector-im/riot-web/issues/11518

This also fixes a bug where the the theme logic can incorrectly get stuck in the light theme - the ThemeController was overriding *all* values, not just supposed themes. Null values aren't overridden so that the various theme logic bits don't assume the user has chosen the light theme explicitly.
 2019-11-28 13:40:28 -07:00
Travis Ralston 96ffe94876 Merge remote-tracking branch 'origin/develop' into t3chguy/clear_notifications 2019-11-27 19:27:52 -07:00
Aaron Raimist 98c47265c9 Fix indentation 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-11-26 15:01:02 -06:00
Aaron Raimist 7905e6cc3b Add a link to the labs feature documentation 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-11-26 14:31:48 -06:00
Travis Ralston f7f22444e8 Rename section heading for integrations in settings 
Misc design update
 2019-11-21 09:03:07 -07:00
Travis RalstonandGitHub 6597e0bd42 Merge pull request #3646 from matrix-org/travis/integration-manager-opt 
Add an option to disable the use of integration managers for provisioning
 2019-11-21 08:10:56 -07:00
Michael Telatynski d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 2019-11-21 11:15:32 +00:00
Travis Ralston 94fed922cf Intercept cases of disabled/no integration managers 
We already intercepted most of the cases where no integration manager was present, though there was a bug in many components where openAll() would be called regardless of an integration manager being available.

The integration manager being disabled by the user is handled in the IntegrationManager classes rather than on click because we have quite a few calls to these functions. The StickerPicker is an exception because it does slightly different behaviour.

This also removes the old "no integration manager configured" state from the IntegrationManager component as it is now replaced by a dialog.
 2019-11-20 20:40:39 -07:00
Travis Ralston 81c9bdd9f3 It's called an "Integration Manager" (singular) 
Fixes https://github.com/vector-im/riot-web/issues/11256

This was finally annoying me enough to fix it.
 2019-11-20 20:14:25 -07:00
Travis Ralston 3391cc0d90 Add the toggle switch for provisioning 2019-11-20 20:05:32 -07:00
Travis Ralston 0a0e952691 Update integration manager copy 2019-11-20 19:53:52 -07:00
Travis Ralston b0eb54541c Rip out options to change your integration manager 
We are not supporting this due to the complexity involved in switching integration managers. We still support custom ones under the hood, just not to the common user. A later sprint on integrations will consider re-adding the option alongside fixing the various bugs out there.
 2019-11-20 19:50:13 -07:00
David Baker a744415221 Add hack to work around mystery settings bug 2019-11-20 15:34:32 +00:00
Michael TelatynskiandGitHub 6121420113 Merge branch 'develop' into t3chguy/remove_bluebird 2019-11-20 15:21:23 +00:00
David Baker 71f5c8b2b0 Lint 2019-11-20 13:47:54 +00:00
David Baker 5a700b518a Get theme automatically from system setting 
Uses CSS `prefers-color-scheme` to get the user's preferred colour
scheme. Also bundles up some theme logic into its own class.
 2019-11-20 13:41:06 +00:00
David Baker a31d222570 Add catch handler for theme setting 2019-11-19 23:00:54 +00:00
David Baker 80ee68a42f Use a settings watcher to set the theme 
Rather than listening for account data updates manually
 2019-11-19 22:36:55 +00:00
Michael Telatynski d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Michael Telatynski 5c24547ef5 re-add and actually use promise timeout util 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 09:37:26 +00:00
Michael TelatynskiandGitHub 79ebb9091c Merge branch 'develop' into t3chguy/remove_bluebird_1 2019-11-12 18:16:34 +00:00
Travis RalstonandGitHub 6d0b388fa2 Merge branch 'develop' into travis/mjolnir 2019-11-12 10:00:01 -07:00
Michael Telatynski f5d467b391 delint 2019-11-12 12:26:07 +00:00
Michael Telatynski 2b34cf4362 Replace Promise.delay with promise utils sleep 
(cherry picked from commit 0a21957b2c)
 2019-11-12 12:07:56 +00:00
Michael Telatynski 217dfc3eed Replace all trivial Promise.defer usages with regular Promises 
(cherry picked from commit 44401d73b4)
 2019-11-12 12:07:56 +00:00
Michael Telatynski 548e38cba9 Revert "Replace all trivial Promise.defer usages with regular Promises" 
This reverts commit 44401d73
 2019-11-12 11:56:53 +00:00
Michael Telatynski f9d6ed63f0 Revert "Replace Promise.delay with promise utils sleep" 
This reverts commit 0a21957b
 2019-11-12 11:56:32 +00:00
Michael Telatynski 168b1b68bb Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions" 
This reverts commit 09a8fec2
 2019-11-12 11:56:21 +00:00
Michael Telatynski 09a8fec261 s/.done(/.then(/ since modern es6 track unhandled promise exceptions 2019-11-12 11:51:23 +00:00
Michael Telatynski 0a21957b2c Replace Promise.delay with promise utils sleep 2019-11-12 11:46:58 +00:00
Michael Telatynski 44401d73b4 Replace all trivial Promise.defer usages with regular Promises 2019-11-12 11:40:38 +00:00
J. Ryan StinnettandGitHub dd5702fc40 Merge pull request #3582 from matrix-org/jryans/prompt-when-no-terms 
Add a prompt when interacting with an identity server without terms
 2019-11-01 19:01:54 +02:00
Travis Ralston 3e4a721111 Appease the linter 2019-10-31 16:27:45 -06:00
Travis Ralston b420fd6758 Add a view rules dialog 2019-10-31 16:00:31 -06:00
Travis Ralston 39b657ce7c Add basic structure for (un)subscribing from lists 2019-10-31 15:54:22 -06:00
Travis Ralston b93508728a Add personal list management to Mjolnir section 2019-10-31 14:24:51 -06:00
Travis Ralston 23383419e8 Add settings base for Mjolnir rules 2019-10-31 13:20:18 -06:00
J. Ryan Stinnett 0fc5108817 Add a prompt when interacting with an identity server without terms 
This adds a prompt whenever we are about to perform some action on a default identity
server (from homeserver .well-known or Riot app config) without terms. This
allows the user to abort or trust the server (storing it in account data).

Fixes https://github.com/vector-im/riot-web/issues/10557
 2019-10-31 13:13:13 +00:00
Michael Telatynski fa811f99de Merge hide-to-tray-icon with show-tray-icon 2019-10-30 14:32:27 +00:00
Michael Telatynski cd37ffcef2 Add ability to hide tray icon on non-Mac (which has no tray icon) 2019-10-29 11:37:41 +00:00
J. Ryan StinnettandGitHub 7ac14e48dc Merge pull request #3549 from matrix-org/jryans/disconnect-dead-is 
Show warning dialog when changing unreachable IS
 2019-10-18 16:53:25 +01:00
J. Ryan Stinnett 579ada3ca2 Add an overall reachability timeout of 10s 
This adds a reachability timeout of 10s when checking the IS for 3PID bindings.
This ensures we stop in a reasonable time, rather than waiting for a long list
of requests to eventually timeout via some general mechanism.

Part of https://github.com/vector-im/riot-web/issues/10909
 2019-10-18 12:40:50 +01:00
J. Ryan Stinnett e6a81c5733 Show warning dialog when changing unreachable IS 
If the IS is unreachable, this handles the error by showing a warning
encouraging the user to check after their personal data and resolve the
situation, but still allows them to continue if they want.

Fixes https://github.com/vector-im/riot-web/issues/10909
 2019-10-11 15:57:12 +01:00
J. Ryan Stinnett d7631ed9f8 Catch errors in Settings when IS is unreachable 
A few bits of Settings try to talk to the IS when Settings is opened. This
changes them to handle failure by logging warnings to the console.
 2019-10-11 15:52:15 +01:00