eb497d442b
Merge pull request #2049 from matrix-org/t3chguy/slate_cont2
...
T3chguy/slate cont2
2018-07-16 13:25:27 +01:00
4c6419a3c5
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-16 13:24:13 +01:00
0f32c3a018
PR feedback
2018-07-16 13:18:10 +01:00
d7ff7cd4ed
stupid thinkotypo
2018-07-16 12:00:15 +01:00
ff96537048
lint
2018-07-16 11:49:53 +01:00
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
e42f8c0c77
Merge remote-tracking branch 'origin/develop' into develop
2018-07-13 13:47:50 +00:00
b450d5be65
Translated using Weblate (Bulgarian)
...
Currently translated at 99.9% (1211 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-07-13 13:47:49 +00:00
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
4850387ae0
add null-guard for stickerpickerWidget in StickerPicker
2018-07-13 14:24:29 +01:00
f76ddbc718
Merge remote-tracking branch 'origin/develop' into develop
2018-07-13 10:14:43 +00:00
903bac3f45
Translated using Weblate (Russian)
...
Currently translated at 99.7% (1209 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-07-13 10:14:42 +00:00
a463b6d8bb
Translated using Weblate (Azerbaijani)
...
Currently translated at 33.0% (401 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2018-07-13 10:14:41 +00:00
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
ac8d9a4f20
Translated using Weblate (German)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-13 09:25:47 +00:00
e56feea9ec
Put always-on-screen widgets in top left
...
always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.
Fixes https://github.com/vector-im/riot-web/issues/7007
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053
2018-07-12 18:43:49 +01:00
60a25b5263
Translated using Weblate (Azerbaijani)
...
Currently translated at 33.0% (401 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2018-07-12 17:27:50 +00:00
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
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
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
f0dbd161b3
Obviously didn't mean to commit that change
2018-07-11 18:11:28 +01:00
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
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
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
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
c3aef6e3a0
workaround for tommoor/slate-md-serializer#14
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 10:29:14 +01:00
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
3c39c53797
Translated using Weblate (French)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-11 08:39:49 +00:00
88c74bae1f
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-11 08:30:43 +00:00
716d7ad85d
Merge remote-tracking branch 'origin/develop' into develop
2018-07-11 08:12:53 +00:00
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
d8d7ff223f
Merge remote-tracking branch 'origin/develop' into develop
2018-07-11 08:10:33 +00:00
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
abbb69dc36
fix fn call, fixes usage of SlashCommands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 17:35:13 +01:00
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
f2e3e30af8
Merge remote-tracking branch 'origin/develop' into develop
2018-07-10 15:12:51 +00:00
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
ab625d489b
Merge remote-tracking branch 'origin/develop' into develop
2018-07-10 14:18:27 +00:00
02c6f3d168
fix typo
2018-07-10 15:18:07 +01:00
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
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
51591a4d62
fix lint
2018-07-09 20:49:31 +01:00
8bcb987f50
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 20:14:37 +01:00
2018523bdb
Merge remote-tracking branch 'origin/develop' into develop
2018-07-09 19:11:29 +00:00
ffec1b5a95
fix lint
2018-07-09 20:11:17 +01:00
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
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
83f2614919
add guide to slate's data formats and how we convert
...
(cherry picked from commit e7e4ee8)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:54:10 +01:00
8665f10f27
pin slate to 0.33.4 to avoid https://github.com/ianstormtaylor/slate/pull/1958
...
(cherry picked from commit 445faca)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:53:47 +01:00
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
David Baker