d3de792f79
fix bits which missed the review cutting block
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-03 10:53:32 +00:00
901e402a5c
apply renames suggested in PR review
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-02 23:23:11 +00:00
757f811126
s/ContextualMenu/ContextMenu/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-02 23:21:59 +00:00
a062fe0096
Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus
2019-12-02 23:20:47 +00:00
7a3b8a522f
Make EmojiPicker filtering case-insensitive
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-02 10:18:02 +00:00
e2733a27c4
add null-guard
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-02 10:06:58 +00:00
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
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
4c50ac0e56
Improve wording
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-28 22:22:42 -06:00
29b59dde5b
undo unrelated change
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:44:08 +00:00
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
811454462d
fix Stickerpicker and MessageContextMenu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:38:58 +00:00
3847996b5b
transition Tooltips over to deprecated code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:26:09 +00:00
6c5b777a77
Consolidate all except tooltips
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 18:16:59 +00:00
5a540f5949
Migrate MemberStatusMessageAvatar over to new Context Menus
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 16:40:45 +00:00
6d69ec17d9
Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus
...
Conflicts:
src/components/views/context_menus/RoomTileContextMenu.js
2019-11-28 16:25:59 +00:00
90a1cb68eb
Merge pull request #3681 from matrix-org/travis/fix-jitsi
...
Fix persisted widgets getting stuck at loading screens
2019-11-28 09:06:44 -07:00
96ffe94876
Merge remote-tracking branch 'origin/develop' into t3chguy/clear_notifications
2019-11-27 19:27:52 -07:00
7b013ecc69
Fix persisted widgets getting stuck at loading screens
...
The widget itself is rendered underneath the loading screen, so we just have to disable the loading state.
This commit also removes the "is" attribute because React 16 includes unknown attributes: https://reactjs.org/blog/2017/09/08/dom-attributes-in-react-16.html
Fixes https://github.com/vector-im/riot-web/issues/11536
2019-11-27 12:54:31 -07:00
fbba55ab05
Merge pull request #3670 from matrix-org/travis/toggle-communities
...
Make the communities button behave more like a toggle
2019-11-27 07:52:05 -07:00
98c47265c9
Fix indentation
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-26 15:01:02 -06:00
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
9f1df0ce8f
Merge pull request #3669 from matrix-org/travis/breadcrumb-upgrades
...
Update breadcrumbs when we do eventually see upgraded rooms
2019-11-26 10:33:07 -07:00
9f455fae4b
Merge branch 'develop' into matthew/fix_logging
2019-11-26 10:19:48 +00:00
9fd45d1f14
console.log doesn't take %s substitutions
2019-11-26 01:14:03 +00:00
1ff39f2524
Make the communities button behave more like a toggle
...
Fixes https://github.com/vector-im/riot-web/issues/10771
Clicking the button should toggle between your last page (room in our case) and the communities stuff.
2019-11-25 16:51:48 -07:00
9df227dbd0
Update breadcrumbs when we do eventually see upgraded rooms
...
Fixes https://github.com/vector-im/riot-web/issues/11469
2019-11-25 16:21:09 -07:00
98693d2dbc
Merge pull request #3665 from matrix-org/travis/fix-flashing
...
Hide tooltips with CSS when they aren't visible
2019-11-25 09:13:43 -07:00
422ab81185
a11y adjustments for toasts
2019-11-25 12:31:57 +01:00
11fec80370
Hide tooltips with CSS when they aren't visible
...
Fixes https://github.com/vector-im/riot-web/issues/11456
2019-11-24 20:52:22 -07:00
aae3150383
Null check on thumbnail_file
2019-11-22 16:50:32 +00:00
4a684d01a4
Merge pull request #3661 from matrix-org/bwindels/verif-toasts
...
Show incoming verification requests in in-app notifications
2019-11-22 16:39:18 +00:00
309633181d
use FormButton in verification request tile too and dedupe styles
2019-11-22 16:32:50 +01:00
0dfb0f5468
fix lint
2019-11-22 16:25:30 +01:00
c705752317
add toast for verification requests
...
this uses a verification requests as emitted by the js-sdk with
the `crypto.verification.request` rather than a verifier as emitted
by `crypto.verification.start` as this works for both to_device and
timeline events with the changes made in the js-sdk pr.
2019-11-22 16:08:27 +01:00
66cc68bae4
add new-styled button
...
might merge it later on with accessible button
2019-11-22 16:04:51 +01:00
b239fde32d
Workaround for soft-crash with calls on startup
...
Fixes https://github.com/vector-im/riot-web/issues/11458
2019-11-21 17:31:57 +00:00
9d5f3ce32d
Merge pull request #3650 from matrix-org/travis/widget-integration-copy
...
Rename section heading for integrations in settings
2019-11-21 10:13:59 -07:00
a55e5f7759
Update copy for widgets not using message encryption
...
Misc design update
2019-11-21 09:12:07 -07:00
f7f22444e8
Rename section heading for integrations in settings
...
Misc design update
2019-11-21 09:03:07 -07:00
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
86783e4439
Merge pull request #3645 from matrix-org/travis/widget-menu
...
Move many widget options to a context menu
2019-11-21 08:10:28 -07:00
5d612bb370
Merge pull request #3644 from matrix-org/travis/widget-encryption
...
Re-add encryption warning to widget permission prompt
2019-11-21 08:04:56 -07:00
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
670c14b2e3
Circumvent the linter
2019-11-20 20:54:21 -07:00
a69d818a0d
Our linter is seriously picky.
2019-11-20 20:49:41 -07:00
560c0afae3
Appease the linter
2019-11-20 20:45:16 -07:00
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
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
3391cc0d90
Add the toggle switch for provisioning
2019-11-20 20:05:32 -07:00
Michael Telatynski