David Baker
4c6419a3c5
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-16 13:24:13 +01:00
David Baker
0f32c3a018
PR feedback
2018-07-16 13:18:10 +01:00
Matthew Hodgson
ac1f130f1e
Merge pull request #2057 from matrix-org/t3chguy/null-guard-stickerpicker
...
add null-guard for stickerpickerWidget in StickerPicker
2018-07-13 14:47:45 +01:00
Michael Telatynski
4850387ae0
add null-guard for stickerpickerWidget in StickerPicker
2018-07-13 14:24:29 +01:00
Bruno Windels
7bbb967ddd
Merge pull request #2053 from matrix-org/dbkr/jitsi_always_on_screen
...
Implement always-on-screen capability for widgets
2018-07-13 11:14:37 +01:00
David Baker
5a5e967262
Fix avatars vanishing on hover
...
Turns out the z-index was to make the avatar appear above the
EventTile_line even though it comes before in the DOM (it's
absolutely positioned to overlap with it). Instead, just put
it afterwards in the DOM.
2018-07-12 17:48:49 +01:00
David Baker
f0dbd161b3
Obviously didn't mean to commit that change
2018-07-11 18:11:28 +01:00
David Baker
8f10ee01c6
Implement always-on-screen capability for widgets
...
As per https://github.com/matrix-org/matrix-doc/issues/1354
This is whitelisted to only jitsi widgets for now as per comment,
mostly because any widget that we may make always-on-screen we need
to preemptively put in a PersistedElement container, which is
unnecessary for any other widget.
Apologies that this does a bunch of refactoring which could have
been split out separately: I only discovered what needed to be
refactored in the process of doing this.
Fixes https://github.com/vector-im/riot-web/issues/6984
2018-07-11 18:07:32 +01:00
Bruno Windels
3e14cd2190
Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling
...
fix nullguard on EventTile, getComponent never returns falsey, it throws
2018-07-11 09:12:49 +01:00
Bruno Windels
4231c08951
Merge pull request #2051 from matrix-org/dbkr/fix_stickerpicker_persistedelement_usage
...
Fix stickerpicker PersistedElement usage
2018-07-11 09:10:27 +01:00
David Baker
25e453badd
Fix stickerpicker PersistedElement usage
...
Earlier PR changed the prop to persistKey in PersistedElement but
containerId here, so this was ending up as 'undefined'.
2018-07-10 17:32:17 +01:00
Matthew Hodgson
b482a4cdd3
Merge pull request #2042 from matrix-org/matthew/encrypt-for-invited-users
...
encrypt for invited users if history visibility allows.
2018-07-10 16:12:45 +01:00
Matthew Hodgson
02c6f3d168
fix typo
2018-07-10 15:18:07 +01:00
Matthew Hodgson
ffec1b5a95
fix lint
2018-07-09 20:11:17 +01:00
David Baker
e90837f10b
Merge branch 'master' into develop
2018-07-09 13:14:49 +01:00
David Baker
487e3cb988
v0.12.9
2018-07-09 13:11:02 +01:00
David Baker
788955aa34
Prepare changelog for v0.12.9
2018-07-09 13:11:01 +01:00
David Baker
6245d78584
Released js-sdk
2018-07-09 13:08:28 +01:00
Bruno Windels
e61317284b
Merge pull request #2031 from matrix-org/t3chguy/notif_nag_bar
...
move nag bar clear statement to any desktop notif toggle not just 0->1
2018-07-09 11:17:15 +01:00
David Baker
1646c3180c
Merge pull request #2041 from matrix-org/t3chguy/improve_devtools_perf
...
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes
2018-07-09 10:17:05 +01:00
Michael Telatynski
83a7f126f9
Merge pull request #2047 from matrix-org/hs/fix-server-acl-renderer
...
Fix stuff
2018-07-06 20:28:07 +01:00
Will Hunt
6e1f62d16a
Fix stuff
2018-07-06 20:22:37 +01:00
Matthew Hodgson
aa9208d6b4
Merge pull request #2046 from Half-Shot/hs/show-server-bans
...
Show m.room.server_acl
2018-07-06 19:17:30 +01:00
Matthew Hodgson
4044185cdd
add space after commas
2018-07-06 19:17:01 +01:00
Will Hunt
83221da7d7
Delint
2018-07-06 16:54:28 +01:00
Will Hunt
9a4075c637
Semicolons
2018-07-06 16:38:04 +01:00
Will Hunt
52b1d946be
Remove unused console.log
2018-07-06 16:37:52 +01:00
Will Hunt
1db803ccfc
"/n" -> " "
2018-07-06 16:37:40 +01:00
Will Hunt
1ca164f1a9
Change all ban message and move further up
2018-07-06 16:36:44 +01:00
Will Hunt
12ce7839f3
Const things
2018-07-06 16:36:26 +01:00
David Baker
64542da7cb
v0.12.9-rc.2
2018-07-06 15:52:10 +01:00
David Baker
584adc35ef
Prepare changelog for v0.12.9-rc.2
2018-07-06 15:52:10 +01:00
David Baker
467423e0b4
js-sdk rc.1
2018-07-06 15:48:49 +01:00
David Baker
983ea950be
Merge pull request #2045 from matrix-org/luke/track-decryption-failures-specific
...
Implement aggregation by error type for tracked decryption failures
2018-07-06 15:48:22 +01:00
David Baker
7f3b5939c6
Merge pull request #2044 from matrix-org/t3chguy/optional_new_behaviour_roomsublist
...
make new hiding of roomsublist behaviour opt-in
2018-07-06 15:47:01 +01:00
Will Hunt
8b9fd7ddcb
Clean up rules.
2018-07-06 15:31:21 +01:00
Luke Barnard
e6330f3136
Merge pull request #2043 from matrix-org/luke/track-decryption-failures-specific
...
Implement aggregation by error type for tracked decryption failures
2018-07-06 11:45:46 +01:00
Will Hunt
526459a9e0
Capitalise
2018-07-06 11:06:31 +01:00
Will Hunt
a6cff4a969
Show server bans in the timeline
2018-07-06 11:06:31 +01:00
Luke Barnard
5af8ddcf10
Fix import
2018-07-06 11:00:39 +01:00
David Baker
b6f854abe4
Simplify event name as it's the only one
2018-07-05 20:00:42 +01:00
David Baker
3f20eb9610
Use more helpful dialog tracking title
2018-07-05 19:58:54 +01:00
David Baker
c26b300f30
more comments
2018-07-05 19:58:10 +01:00
David Baker
658ac73064
comments
2018-07-05 19:57:24 +01:00
David Baker
3f60300983
Remove redundant check
2018-07-05 19:51:12 +01:00
David Baker
8c10dc1860
Remove unhelpful commented code
2018-07-05 19:50:11 +01:00
David Baker
7e2b559ccd
Make if clearer
2018-07-05 19:46:37 +01:00
David Baker
fb7ce9dd7f
More doc
2018-07-05 19:40:45 +01:00
David Baker
1f2d279a0a
Consistency, redundant check & doc
2018-07-05 19:38:42 +01:00
David Baker
eb552e5cef
Just pass the roomId into WidgetEchoStore
2018-07-05 18:43:20 +01:00