David Baker
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate
...
Replace Draft with Slate
2018-07-16 14:16:25 +01:00
David Baker
415eef5aec
Merge pull request #2055 from matrix-org/bwindels/stop-peeking-fix
...
Fix not stopping to peek when navigating away from peeked room
2018-07-16 13:33:13 +01:00
Michael Telatynski
59a14f2c0b
re-hydrate Values which have been serialized into LocalStorage
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-15 20:34:27 +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
Michael Telatynski
7405c5eff2
specify alternate history storage key to prevent conflicts with draft
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-12 16:35:42 +01:00
Bruno Windels
b412b9e84d
Fix stopPeeking not being called at the right time
...
stopPeeking is currently not called when navigating to a joined room
after having peeked a room. This causes the /events endpoint for the
peeked room to be called until peeking another room, even when not
viewing the peeked room anymore.
The current code would only stop peeking if you joining were true (note the nesting),
e.g. when waiting for your join to be confirmed by /sync.
This change might make stopPeeking called also when not needed by there is a guard in
that method to do nothing if not currently peeking.
2018-07-12 15:19:25 +02: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
Michael Telatynski
b4bc09c335
null-guard savedState since now we're accessing its props
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 17:13:33 +01:00
Michael Telatynski
3e05bf19c5
hide autocomplete when moving caret to match existing behaviour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 16:30:45 +01:00
Michael Telatynski
95909de446
fix MessageComposer not marking translatable strings. run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 11:39:55 +01:00
Michael Telatynski
c3aef6e3a0
workaround for tommoor/slate-md-serializer#14
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 10:29:14 +01:00
Michael Telatynski
fd4f9679df
convert md<->rt if the stored editorState was in a different state
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 09:43:39 +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
Michael Telatynski
abbb69dc36
fix fn call, fixes usage of SlashCommands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 17:35:13 +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
Michael Telatynski
100ecfe7ce
remove trailing spaces to make linter happy (no-trailing-spaces)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 10:29:52 +01:00
Michael Telatynski
58301e5dd4
navigateHistory only when at edges of document, to prevent Firefox bug
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 10:28:17 +01:00
Matthew Hodgson
51591a4d62
fix lint
2018-07-09 20:49:31 +01:00
Michael Telatynski
8bcb987f50
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 20:14:37 +01:00
Matthew Hodgson
ffec1b5a95
fix lint
2018-07-09 20:11:17 +01:00
Matthew Hodgson
0d0934add7
unbreak modifier+space (e.g. emoji insert on macOS)
...
(cherry picked from commit c490f87)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:58:04 +01:00
Matthew Hodgson
021409aafe
apply review feedback from @lukebarnard1
...
(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:54:57 +01:00
Michael Telatynski
5bd4104c96
modify ComposerHistoryManager
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit d139dd6)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:43:57 +01:00
Michael Telatynski
5b74c615ae
add missing import
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 47b6099)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:42:57 +01:00
Michael Telatynski
43204ea177
fix Control-Backspace after select-all
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 0f32ec0)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:42:10 +01:00
Michael Telatynski
faf17f06c6
remove debugger statement
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit b6f7940)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:36 +01:00
Michael Telatynski
483116fb03
add rule to slate-md-serializer: make underlined and removed work for CM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit b521efd)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:29 +01:00
Michael Telatynski
372fa29ad3
take edge into consideration when moving focus region on arrow keys
...
fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 0982617)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:20 +01:00
Michael Telatynski
c6837af398
import-type Change from slate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 85ed499)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:00 +01:00
Matthew Hodgson
efdc5430d7
merge develop
2018-07-09 17:50:07 +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
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
Will Hunt
8b9fd7ddcb
Clean up rules.
2018-07-06 15:31:21 +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