32b6fccbfc
fix double date separator
2019-11-22 17:26:14 +01:00
7df8ef2f91
Merge pull request #3655 from matrix-org/t3chguy/fix_m.room.create_upgrade_notice
...
Show m.room.create event before the ELS on room upgrade
2019-11-22 13:41:36 +00:00
ee40c7891b
Merge pull request #3656 from matrix-org/dbkr/messagepanel_react_class
...
Convert MessagePanel to React class
2019-11-22 13:19:57 +00:00
25ba4c5f71
Fix read markers
...
init code needs to be a constructor or its run too late
2019-11-22 13:11:36 +00:00
abdf3c4a58
Merge pull request #3657 from matrix-org/dbkr/matchmedia_conditional_events
...
Make addEventListener conditional
2019-11-22 13:09:01 +00:00
0dbb639aea
Accidentally committed
2019-11-22 13:06:35 +00:00
3f5a8faf37
PropTypes should be static
2019-11-22 13:01:56 +00:00
fd5a5e13ee
Make addEventListener conditional
...
Safari doesn't support addEventListener
2019-11-22 12:59:51 +00:00
6d4abeef45
Convert MessagePanel to React class
...
I was about to add the getDerivedStateFromProps function to change
how read markers worked, but doing that in an old style class
means the statics object, so let;s just convert the thing.
2019-11-22 12:07:25 +00:00
a02a285058
Show m.room.create event before the ELS on room upgrade
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-22 10:24:51 +00:00
e77cf2b87e
Merge pull request #3653 from matrix-org/bwindels/fixe2eicons
...
Fix e2e icons
2019-11-21 19:01:17 +00:00
1a7d298319
Merge pull request #3654 from matrix-org/dbkr/call_crash_workaround
...
Workaround for soft-crash with calls on startup
2019-11-21 17:43:14 +00: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
53edbc743a
Merge pull request #3652 from matrix-org/dbkr/catch_play_failures
...
Catch exceptions when we can't play audio
2019-11-21 17:29:25 +00:00
f75e45a715
reduce margin on e2e icon in room header
2019-11-21 18:17:55 +01:00
854f27df3f
remove obsolete style from message composer for e2e icon as it's now the default size for the e2e iconn
2019-11-21 18:16:10 +01: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
9089744f07
Merge pull request #3651 from matrix-org/travis/widget-encryption-copy
...
Update copy for widgets not using message encryption
2019-11-21 10:13:47 -07:00
cb0e6ca5d2
dont make e2e icons themable, as they have multiple colors
2019-11-21 18:13:01 +01:00
3cddcad5de
use correct icons with borders
2019-11-21 18:12:32 +01:00
5d8476185f
Catch exceptions when we can't play audio
...
...or try to: the chrome debugger still breakpoints, even when we
catch the exception.
Related to, but probably does not fix https://github.com/vector-im/riot-web/issues/7657
2019-11-21 17:11:17 +00:00
834e6819d5
Merge pull request #3649 from matrix-org/dbkr/ignore_media_keys
...
Ignore media actions
2019-11-21 16:28:03 +00:00
a55e5f7759
Update copy for widgets not using message encryption
...
Misc design update
2019-11-21 09:12:07 -07:00
f0fbb20ee5
Detect support for mediaSession
...
Firefox doesn't support mediaSession so don't try setting handlers
2019-11-21 16:11:42 +00:00
f7f22444e8
Rename section heading for integrations in settings
...
Misc design update
2019-11-21 09:03:07 -07:00
5c6ef10c6b
Ignore media actions
...
Hopefully the comment explains all
Fixes https://github.com/vector-im/riot-web/issues/11118
2019-11-21 15:55:30 +00: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
ed024a0b10
Merge pull request #3647 from matrix-org/bwindels/updateciderdocs
...
Update CIDER docs now that it is used for main composer as well
2019-11-21 13:18:11 +00:00
3242e2da72
Merge pull request #3593 from matrix-org/t3chguy/remove_bluebird
...
get rid of bluebird
2019-11-21 11:22:49 +00: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
04641a0f87
Merge pull request #3638 from matrix-org/dbkr/dedup_theming_code
...
Remove getBaseTheme
2019-11-21 09:44:37 +00:00
8c02893da7
Update CIDER docs now that it is used for main composer as well
2019-11-21 08:58:13 +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
0a0e952691
Update integration manager copy
2019-11-20 19:53:52 -07:00
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
66c51704cc
Fix indentation
2019-11-20 19:21:10 -07:00
fd12eb28e7
Move many widget options to a context menu
...
Part of https://github.com/vector-im/riot-web/issues/11262
2019-11-20 19:17:42 -07:00
f0066ff622
Merge pull request #3643 from bkil/bkil/fix-tooltip-of-nonmember-emojis
...
ReactionsRowButtonTooltip: fix null dereference if emoji owner left room
2019-11-20 18:06:37 -07:00
a40194194d
ReactionsRowButtonTooltip: fix null dereference if emoji owner left room
...
Signed-off-by: bkil <b.K.il.h.u+tigbuh@gmail.com>
2019-11-21 01:50:18 +01:00
62a2c7a51a
Re-add encryption warning to widget permission prompt
2019-11-20 16:26:06 -07:00
2f084113f6
Merge pull request #3642 from matrix-org/t3chguy/pre_jest
...
Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants
2019-11-20 22:43:16 +00:00
fccf9f138e
Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-20 22:32:11 +00:00
e33bfe93b4
Merge pull request #3641 from matrix-org/travis/e2e-icon
...
Fix positioning, size, and colour of the composer e2e icon
2019-11-20 11:16:54 -07:00
Bruno Windels