mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
19523 commits 203 branches 553 tags 406 MiB
Commit graph

19523 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
7f7e51627c
Merge pull request #3664 from matrix-org/dbkr/nullcheck_thumbnail_file 
Null check on thumbnail_file
 2019-11-22 16:59:15 +00:00
Bruno Windels
15b5ad7451
Merge pull request #3662 from matrix-org/bwindels/itsadoubledate 
Fix double date separator for room upgrade tiles
 2019-11-22 16:52:47 +00:00
David Baker
aae3150383 Null check on thumbnail_file 2019-11-22 16:50:32 +00:00
Bruno Windels
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
Bruno Windels
32b6fccbfc fix double date separator 2019-11-22 17:26:14 +01:00
Bruno Windels
8ce1ed4726 moar lint 2019-11-22 16:36:22 +01:00
Bruno Windels
309633181d use FormButton in verification request tile too and dedupe styles 2019-11-22 16:32:50 +01:00
Bruno Windels
0dfb0f5468 fix lint 2019-11-22 16:25:30 +01:00
Bruno Windels
8cb362002b show a toast instead of dialog when feature flag is enabled 2019-11-22 16:08:27 +01:00
Bruno Windels
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
Bruno Windels
f1c62e7dab make colors slightly more opaque than in design 
as it is very light otherwise
 2019-11-22 16:04:51 +01:00
Bruno Windels
66cc68bae4 add new-styled button 
might merge it later on with accessible button
 2019-11-22 16:04:51 +01:00
Bruno Windels
e86d2b616e add ToastContainer 2019-11-22 16:04:51 +01:00
David Baker
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
David Baker
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
David Baker
25ba4c5f71 Fix read markers 
init code needs to be a constructor or its run too late
 2019-11-22 13:11:36 +00:00
David Baker
abdf3c4a58
Merge pull request #3657 from matrix-org/dbkr/matchmedia_conditional_events 
Make addEventListener conditional
 2019-11-22 13:09:01 +00:00
David Baker
0dbb639aea Accidentally committed 2019-11-22 13:06:35 +00:00
David Baker
3f5a8faf37 PropTypes should be static 2019-11-22 13:01:56 +00:00
David Baker
fd5a5e13ee Make addEventListener conditional 
Safari doesn't support addEventListener
 2019-11-22 12:59:51 +00:00
David Baker
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
Michael Telatynski
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
Matthew Hodgson
e77cf2b87e
Merge pull request #3653 from matrix-org/bwindels/fixe2eicons 
Fix e2e icons
 2019-11-21 19:01:17 +00:00
David Baker
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
David Baker
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
David Baker
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
Bruno Windels
f75e45a715 reduce margin on e2e icon in room header 2019-11-21 18:17:55 +01:00
Bruno Windels
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
Travis Ralston
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
Travis Ralston
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
Bruno Windels
cb0e6ca5d2 dont make e2e icons themable, as they have multiple colors 2019-11-21 18:13:01 +01:00
Bruno Windels
3cddcad5de use correct icons with borders 2019-11-21 18:12:32 +01:00
David Baker
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
David Baker
834e6819d5
Merge pull request #3649 from matrix-org/dbkr/ignore_media_keys 
Ignore media actions
 2019-11-21 16:28:03 +00:00
Travis Ralston
a55e5f7759 Update copy for widgets not using message encryption 
Misc design update
 2019-11-21 09:12:07 -07:00
David Baker
f0fbb20ee5 Detect support for mediaSession 
Firefox doesn't support mediaSession so don't try setting handlers
 2019-11-21 16:11:42 +00:00
Travis Ralston
f7f22444e8 Rename section heading for integrations in settings 
Misc design update
 2019-11-21 09:03:07 -07:00
David Baker
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
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
Bruno Windels
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
Michael Telatynski
3242e2da72
Merge pull request #3593 from matrix-org/t3chguy/remove_bluebird 
get rid of bluebird
 2019-11-21 11:22:49 +00: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
David Baker
04641a0f87
Merge pull request #3638 from matrix-org/dbkr/dedup_theming_code 
Remove getBaseTheme
 2019-11-21 09:44:37 +00:00
Bruno Windels
8c02893da7
Update CIDER docs now that it is used for main composer as well 2019-11-21 08:58:13 +00:00
Travis Ralston
670c14b2e3 Circumvent the linter 2019-11-20 20:54:21 -07:00
Travis Ralston
a69d818a0d Our linter is seriously picky. 2019-11-20 20:49:41 -07:00
Travis Ralston
560c0afae3 Appease the linter 2019-11-20 20:45:16 -07: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