David Baker
|
fc29e89f63
|
Merge pull request #2062 from matrix-org/dbkr/use_configured_integ_url
Jitsi: Use integrations URL from config
|
2018-07-20 15:01:28 +01:00 |
|
Bruno Windels
|
a8a40f1514
|
Merge pull request #2075 from matrix-org/dbkr/allow_jitsi_in_e2e_rooms
Allow jitsi in e2e rooms
|
2018-07-20 14:45:24 +01:00 |
|
David Baker
|
bd3dd9aafc
|
Allow jitsi in e2e rooms
We have a separate warning about how widgets are not very e2e, so
this should be sufficient warning.
|
2018-07-20 14:30:38 +01:00 |
|
Bruno Windels
|
6f278ceab0
|
Merge pull request #2071 from matrix-org/dbkr/persistedelement_border
Fix border around persisted widgets
|
2018-07-20 12:23:02 +01:00 |
|
Bruno Windels
|
95eafd7489
|
Merge pull request #2073 from matrix-org/dbkr/kill_more_random_z_indexes
Fix e2e icons floating above jitsi
|
2018-07-20 12:20:18 +01:00 |
|
David Baker
|
3c895e5a0d
|
Merge pull request #2074 from matrix-org/t3chguy/hide_ddg_me_after_space
hide some commands after space as they have special semantics
|
2018-07-19 13:51:05 +01:00 |
|
David Baker
|
f9af96d422
|
Merge pull request #2070 from matrix-org/t3chguy/slate_cont2
Even More Slate Fixes :D
|
2018-07-19 13:49:42 +01:00 |
|
Bruno Windels
|
10e4a4f288
|
Merge pull request #2035 from matrix-org/dbkr/widget_echo
Improve UX for Jitsi by adding local echo for widgets
|
2018-07-19 12:00:36 +01:00 |
|
Michael Telatynski
|
855f8871b8
|
replace heuristic for the time being as it failed with inlines like pills. Fixes vector-im/riot-web#7059
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 16:50:07 +01:00 |
|
Michael Telatynski
|
5867fe73dd
|
hide some commands after space as they have special semantics
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 15:38:21 +01:00 |
|
David Baker
|
f658753610
|
Fix e2e icons floating above jitsi
Remove another seemingly redundant z-index
Fixes https://github.com/vector-im/riot-web/issues/7056
|
2018-07-18 14:14:38 +01:00 |
|
David Baker
|
22bde9fd50
|
Read jitsi widget URL from config
|
2018-07-18 12:05:32 +01:00 |
|
David Baker
|
f868cd6699
|
Fix border around persisted widgets
The PersistedElement had zero height so the border ended up in the
wrong place. Add a wrapper to fix the height back.
Fixes https://github.com/vector-im/riot-web/issues/7030
Fixes https://github.com/vector-im/riot-web/issues/7029
|
2018-07-18 11:52:57 +01:00 |
|
Michael Telatynski
|
88dddb628d
|
in MD mode forgo any Magic Rich Pasting conversion as its confusing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 11:50:13 +01:00 |
|
Michael Telatynski
|
6bb88c0548
|
attempt to fix clash of Cmd-M on Mac. Should fix vector-im/riot-web#7047
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 11:28:48 +01:00 |
|
Michael Telatynski
|
3e956514b3
|
also prevent merge/skip on rich text pastes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 11:00:45 +01:00 |
|
Michael Telatynski
|
1a9de3fabe
|
fix undo on pasting plaintext content
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 10:58:27 +01:00 |
|
Michael Telatynski
|
f5856270cc
|
undo removal of stripping <p>s as it breaks HTML /mes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 10:48:54 +01:00 |
|
David Baker
|
68c46a694e
|
lint
|
2018-07-18 10:18:55 +01:00 |
|
Michael Telatynski
|
19e5dc5799
|
do less rewriting for composer quote to prevent breaking pills
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 10:10:42 +01:00 |
|
Michael Telatynski
|
8bb08b1b75
|
fix focus on new editorState as it didn't have focus so broke when alt tab
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-18 10:10:11 +01:00 |
|
David Baker
|
7aab6fa6f1
|
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
|
2018-07-18 09:35:57 +01:00 |
|
Bruno Windels
|
0a432dfb8f
|
Merge pull request #2063 from matrix-org/dbkr/jitsi_check_scalar_first
Jitsi: Check integrations server before call
|
2018-07-17 17:46:53 +01:00 |
|
Bruno Windels
|
583cde6397
|
Merge pull request #2061 from matrix-org/dbkr/jitsi_error_no_perm
Jitsi: Error message on no permission
|
2018-07-17 17:42:39 +01:00 |
|
Bruno Windels
|
349615c5c1
|
Merge pull request #2065 from matrix-org/dbkr/read_avatars_under_jitsi
Fix read receipts on top of Jitsi
|
2018-07-17 17:37:13 +01:00 |
|
Matthew Hodgson
|
02c3bc9476
|
Merge pull request #2069 from matrix-org/t3chguy/slate_cont2
Moar Slate Fixes
|
2018-07-17 17:15:01 +01:00 |
|
Michael Telatynski
|
720a728278
|
workaround for placeholder being shown when empty text but block. Fixes vector-im/riot-web#7042
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-17 16:13:33 +01:00 |
|
Michael Telatynski
|
1b467f6ca8
|
fix pasting of plaintext content (prevent loads of <p>s) Fixes vector-im/riot-web#7043
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-17 16:02:37 +01:00 |
|
Michael Telatynski
|
414908611d
|
prevent exception if there is no text node at anchor
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-17 13:48:15 +01:00 |
|
Michael Telatynski
|
688776bc10
|
allow enter to remove current block if its empty useful for lists
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-17 13:29:40 +01:00 |
|
Michael Telatynski
|
8d4cead105
|
special-case 'inline-code' button because mark is called 'code'
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-17 13:24:28 +01:00 |
|
Michael Telatynski
|
ff76b6a981
|
allow user to break out of blockquote/etc by hitting enter twice
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-17 12:30:22 +01:00 |
|
Michael Telatynski
|
5b79e3bcd5
|
fix user autocomplete not adding : if at the start
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-17 11:56:24 +01:00 |
|
Michael Telatynski
|
23b6abf8b7
|
no point saving history at this point, maybe future supported
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-17 09:27:11 +01:00 |
|
Michael Telatynski
|
cbe5944ff0
|
preserve selection and history between room changes and refreshes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-16 22:04:42 +01:00 |
|
Matthew Hodgson
|
48fbf1406f
|
Merge pull request #2068 from matrix-org/t3chguy/slate_cont2
fix 2nd typo in one PR :(
|
2018-07-16 21:36:57 +01:00 |
|
Michael Telatynski
|
1c24f1fd5a
|
fix 2nd typo in one PR :(
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-16 21:34:25 +01:00 |
|
Matthew Hodgson
|
8c17ee7281
|
Merge pull request #2067 from matrix-org/t3chguy/slate_cont2
check if has some completions, not if >=0
|
2018-07-16 21:32:04 +01:00 |
|
Michael Telatynski
|
547e0ed52c
|
check if has some completions, not if >=0
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-16 21:30:04 +01:00 |
|
Matthew Hodgson
|
a5b932bfdd
|
Merge pull request #2066 from matrix-org/t3chguy/slate_cont2
Slate fixes
|
2018-07-16 21:29:20 +01:00 |
|
Michael Telatynski
|
3000099991
|
add additional checks for hiding autocomplete to prevent text calculation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-16 21:27:52 +01:00 |
|
Michael Telatynski
|
bdbc2cbd38
|
disable spellCheck when the placeholder is shown because "unencrypted"
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-16 18:32:50 +01:00 |
|
Michael Telatynski
|
c7859fed1a
|
add heuristic to compare documents to prevent autocomplete flicker
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-16 18:27:06 +01:00 |
|
David Baker
|
149a935594
|
Merge pull request #2056 from matrix-org/dbkr/tiny_jitsi_follows_you_between_rooms
Implement always-on-screen capability for widgets
|
2018-07-16 17:26:37 +01:00 |
|
David Baker
|
a79caed0c9
|
Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms
|
2018-07-16 17:21:51 +01:00 |
|
David Baker
|
379d65bd6c
|
Merge pull request #2064 from matrix-org/t3chguy/slate_cont2
simplify MessageComposerStore and improve its performance
|
2018-07-16 17:20:48 +01:00 |
|
David Baker
|
74ad795d4a
|
Fix read receipts on top of Jitsi
By removing z-index which, as far as I can see, does nothing.
Fixes https://github.com/vector-im/riot-web/issues/7021
|
2018-07-16 17:10:58 +01:00 |
|
Michael Telatynski
|
f78e3be1eb
|
Merge branch 't3chguy/slate_cont2' of github.com:matrix-org/matrix-react-sdk into t3chguy/slate_cont2
|
2018-07-16 16:56:57 +01:00 |
|
Michael Telatynski
|
2f1779751b
|
make the MessageComposerStore stateless for better performance
and inter-tab composition (by simplifying it. WIN-WIN)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-07-16 16:56:08 +01:00 |
|
David Baker
|
850a4d8ec5
|
Jitsi: Check integrations server before call
|
2018-07-16 16:54:25 +01:00 |
|