Commit graph

9248 commits

Author SHA1 Message Date
Weblate
5c9125ffde Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 20:32:09 +00: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
Weblate
6ae7c577cd Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 20:29:26 +00:00
Hugues De Keyzer
f655e2eb86 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-16 20:29:25 +00: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
Weblate
ddf576ac59 Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 16:26:42 +00: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
Weblate
60bf368887 Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 16:20:54 +00:00
Andrey
3daff00704 Translated using Weblate (Russian)
Currently translated at 99.4% (1205 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-07-16 16:20:53 +00:00
Kévin C
a449b8420d 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-16 16:20:53 +00: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
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
David Baker
e95a8e82bc Jitsi: Use integrations URL from config 2018-07-16 16:35:45 +01:00
David Baker
983dc3ad2e lint 2018-07-16 16:19:18 +01:00
David Baker
19f0617052 Jitsi: Error message on no permission
Fixes https://github.com/vector-im/riot-web/issues/7007
2018-07-16 15:41:03 +01:00
Kévin C
8fa2fa19aa 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-16 13:43:18 +00:00
Weblate
f1cac4e268 Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 13:16:33 +00:00
David Baker
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate
Replace Draft with Slate
2018-07-16 14:16:25 +01:00
Weblate
f76d9a7a97 Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 12:33:19 +00:00
Markel
33b6d0ab5f Translated using Weblate (Spanish)
Currently translated at 61.2% (742 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-07-16 12:33:18 +00:00
Kyf Lee
a17483971a Translated using Weblate (Korean)
Currently translated at 80.5% (976 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2018-07-16 12:33:18 +00:00
Hugues De Keyzer
88d688e56f 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-16 12:33:18 +00:00
Hugues De Keyzer
c857bf400c Translated using Weblate (Esperanto)
Currently translated at 91.1% (1105 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-07-16 12:33:17 +00: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
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
David Baker
ff96537048 lint 2018-07-16 11:49:53 +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
Weblate
e42f8c0c77 Merge remote-tracking branch 'origin/develop' into develop 2018-07-13 13:47:50 +00:00
Slavi Pantaleev
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
Michael Telatynski
4850387ae0
add null-guard for stickerpickerWidget in StickerPicker 2018-07-13 14:24:29 +01:00
Weblate
f76ddbc718 Merge remote-tracking branch 'origin/develop' into develop 2018-07-13 10:14:43 +00:00
Andrey
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
Aziz Ibrahimov
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
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
Bamstam
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
David Baker
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
Aziz Ibrahimov
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
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
Kévin C
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
Szimszon
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
Weblate
716d7ad85d Merge remote-tracking branch 'origin/develop' into develop 2018-07-11 08:12:53 +00: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
Weblate
d8d7ff223f Merge remote-tracking branch 'origin/develop' into develop 2018-07-11 08:10:33 +00: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
Weblate
f2e3e30af8 Merge remote-tracking branch 'origin/develop' into develop 2018-07-10 15:12:51 +00: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
Weblate
ab625d489b Merge remote-tracking branch 'origin/develop' into develop 2018-07-10 14:18:27 +00: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
Weblate
2018523bdb Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 19:11:29 +00: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
Weblate
42b77bfc48 Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 10:17:20 +00: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
Weblate
2847a5355c Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 09:17:14 +00: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
Osoitz
0f1ae2b48d Translated using Weblate (Basque)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-07-08 08:54:54 +00:00
Weblate
51dc8d9528 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 19:28:14 +00:00
Will Hunt
6e1f62d16a
Fix stuff 2018-07-06 20:22:37 +01:00
Weblate
86dc444e37 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 18:17:35 +00: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
Weblate
fdd3b966e3 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 10:45:53 +00:00
kR
c4d66b6c56 Translated using Weblate (Polish)
Currently translated at 93.6% (1134 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-07-06 10:45:53 +00:00
Bamstam
db860441bc Translated using Weblate (German)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-06 10:45:52 +00: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
David Baker
5f2e2efce6 Revert 8b64ddc for MatrixActionCreators
As it wasn't used in the end
2018-07-05 18:22:05 +01:00
Luke Barnard
d53c836fd7 Implement aggregation by error type for tracked decryption failures 2018-07-05 13:54:44 +01:00
Kévin C
7f9ef37bca Translated using Weblate (French)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-05 07:50:07 +00:00
Jeff Huang
34d234fa30 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-07-05 03:22:18 +00:00
Matthew Hodgson
1811d3f148 encrypt for invited users if history visibility allows.
fixes https://github.com/vector-im/riot-web/issues/2713. requires equivalent branch in js-sdk
2018-07-05 01:48:28 +02:00
Szimszon
39103a350a Translated using Weblate (Hungarian)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-04 16:36:02 +00:00
Michael Telatynski
dc6b3cb081
showing all is pretty slow, show an additional 50 instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-04 13:07:57 +01:00
Michael Telatynski
e5392e2c00
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-04 12:57:22 +01:00
Krombel
4d17dd2800 Translated using Weblate (German)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-04 11:06:49 +00:00
Krombel
edfe94383a Translated using Weblate (German)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-04 10:52:00 +00:00
Michael Telatynski
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist 2018-07-04 11:21:16 +01:00
Weblate
64048665ad Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 10:11:58 +00:00
Michael Telatynski
6c91952d26
Merge pull request #2039 from akihikodaki/sticker_upstream
Import react as React in src/components/views/messages/MStickerBody.js
2018-07-04 11:11:53 +01:00
Weblate
f4db42351a Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 09:29:58 +00:00
Michael Telatynski
5551855133
Merge pull request #2038 from akihikodaki/group_upstream
Import react as React in src/GroupAddressPicker.js
2018-07-04 10:29:53 +01:00
Akihiko Odaki
f941c93322 Import react as React in src/components/views/messages/MStickerBody.js
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-07-04 18:28:56 +09:00
Weblate
71b11199e3 Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 08:20:56 +00:00
Andrey
36d3c3952b Translated using Weblate (Russian)
Currently translated at 99.8% (1208 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-07-04 08:20:56 +00:00
RainSlide
537e8da553 Translated using Weblate (Chinese (Simplified))
Currently translated at 94.5% (1144 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-07-04 08:20:55 +00:00
Akihiko Odaki
2ddcb83e8d Import react as React in src/GroupAddressPicker.js
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-07-04 10:57:03 +09:00
David Baker
ad35fbf208 Pull out z-index to the sticker picker
As it's not a thing that's necessary for other PersistedElements,
only the sticker picker because it has to sit above the ContextMenu
it sits in.
2018-07-03 18:25:33 +01:00
Paweł Kozioł
b69eb8fc88 Translated using Weblate (Polish)
Currently translated at 92.8% (1124 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-07-03 17:15:28 +00:00
Slavi Pantaleev
c0aa1f1196 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-07-03 14:35:34 +00:00
David Baker
74f2d0a360 Use inline class field for PropTypes 2018-07-03 14:54:43 +01:00
David Baker
3f88721bc1 Give PersistedElement a key
So there can be more than one on a page
2018-07-03 14:43:27 +01:00
Kévin C
0ad8d5ed79 Translated using Weblate (French)
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-03 11:27:07 +00:00
David Baker
c665ab8a22 Add error dialog if widget remove fails
Also up the timeout because matrix.org is that slow
2018-07-03 11:55:41 +01:00
David Baker
9d41b87678 i18n 2018-07-03 11:27:15 +01:00
David Baker
13530e5705 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-03 11:23:58 +01:00
David Baker
3199e68578 Lint 2018-07-03 11:22:19 +01:00
Szimszon
f7b84a412a Translated using Weblate (Hungarian)
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-03 10:19:09 +00:00
David Baker
8b64ddcbe8 Do some level of local echo for widgets
* Show a spinner while we wait for widgets to be deleted
 * Hide widgets while they're pending deletion
 * Don't put another jitsi widget into the room if there's already
   one pending
2018-07-03 11:16:44 +01:00
Weblate
00db7f84ff Merge remote-tracking branch 'origin/develop' into develop 2018-07-03 09:36:15 +00:00
Michael Telatynski
7225f7372c
Revert " make click to insert nick work on join/parts, /me's etc" 2018-07-03 10:30:08 +01:00
Luke Barnard
767e67dc70
Merge pull request #2033 from matrix-org/luke/track-uisis-piwik-specify-event-name
Track an event name when tracking a decryption failure
2018-07-02 10:26:34 +01:00
David Baker
34f6134595
Merge pull request #1974 from matrix-org/t3chguy/warn_self_mute
warn on self-mute
2018-07-02 10:13:49 +01:00
Luke Barnard
0dd3a77432 Track an event name when tracking a decryption failure
Otherwise piwik will not agregate the failures correctly for all views.
2018-07-02 09:45:32 +01:00