PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
16739 commits 1 branch 0 tags 338 MiB
Commit graph

13608 commits

Author SHA1 Message Date
J. Ryan Stinnett
27c79b9504
Merge pull request #3163 from matrix-org/t3chguy/fix_emoji_shortname_tooltip 
Emojibase data includes blank variations, accept these when searching
 2019-07-05 11:50:38 +01:00
Michael Telatynski
ecc672cccc add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-05 08:40:00 +01:00
Michael Telatynski
89d568ce97 Don't allow editing via up-arrow when Replying 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-05 08:36:16 +01:00
Travis Ralston
00973a1ee8 Appease the linter 2019-07-04 17:00:09 -06:00
Travis Ralston
03cbd7e8bb Ensure links off the forgot password page land you at soft logout 2019-07-04 16:51:55 -06:00
Travis Ralston
93872e6fa5 Ask for the user's password to rehydrate their soft logged out session 
Fixes https://github.com/vector-im/riot-web/issues/10236

The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().

Minimal design work has been done here. The majority is deferred to https://github.com/vector-im/riot-web/issues/10262
 2019-07-04 16:51:16 -06:00
Travis Ralston
89131be438 Require that users go to the soft logout page if they're soft logged out 
Fixes https://github.com/vector-im/riot-web/issues/10234
 2019-07-04 15:14:00 -06:00
Weblate
1a3a12eed7 Merge branch 'origin/develop' into Weblate. 2019-07-04 16:22:24 +00:00
Kévin C
a13d063e33 Translated using Weblate (French) 
Currently translated at 100.0% (1671 of 1671 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-04 16:22:24 +00:00
Jeff Huang
5147d66dd6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1671 of 1671 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-07-04 16:22:24 +00:00
Travis Ralston
f3c6c73329
Merge pull request #3177 from matrix-org/travis/soft-logout-base 
Implement basic soft logout handling
 2019-07-04 10:22:18 -06:00
Travis Ralston
8ea46a8c4d Remove unneeded page types 2019-07-04 09:59:20 -06:00
Travis Ralston
5e5bf21281 Remove irrelevant debugging 2019-07-04 09:59:07 -06:00
Bruno Windels
8468f7cdc3 support redactions in edit history dialog 2019-07-04 16:33:05 +02:00
Weblate
f19777fcf8 Merge branch 'origin/develop' into Weblate. 2019-07-04 12:07:17 +00:00
David Baker
7d40ccfdbe De-lint ScalarAuthClient 2019-07-04 12:59:20 +01:00
Bruno Windels
375976575b add redact button 2019-07-04 11:07:22 +02:00
Weblate
abe5a7f4c9 Merge branch 'origin/develop' into Weblate. 2019-07-04 09:05:35 +00:00
natowi
b05f6d1281 Translated using Weblate (German) 
Currently translated at 89.9% (1501 of 1670 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-04 09:05:35 +00:00
doktorhorst
b36dc74452 Translated using Weblate (German) 
Currently translated at 89.9% (1501 of 1670 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-04 09:05:34 +00:00
Bruno Windels
3f28f2e4a6
Merge pull request #3174 from matrix-org/bwindels/edit-history-error 
show /relations error in edit history dialog
 2019-07-04 09:05:29 +00:00
Travis Ralston
521bc90b5f Appease the linter 2019-07-03 16:51:09 -06:00
Travis Ralston
42e6287bdb Implement basic soft logout handling 
Fixes https://github.com/vector-im/riot-web/issues/10235

CSS and copy are left as an exercise for a later iteration.

Login page handling is left for https://github.com/vector-im/riot-web/issues/10236

This implementation reuses as much of the Lifecycle flow as it can without causing problems. Most importantly, it requires https://github.com/matrix-org/matrix-js-sdk/pull/975 to be able to detect a soft logout and react to it. When it comes time to starting/stopping the Lifecycle, additional parameters are provided so that the auxiliary services can (re)start themselves without the client starting to sync.
 2019-07-03 16:46:37 -06:00
Bruno Windels
4dc8de0e71 log server errors in edit history dialog 2019-07-03 17:53:32 +02:00
Bruno Windels
e7e6af2592 use existing strings 2019-07-03 17:51:16 +02:00
David Baker
668d24111c
Merge pull request #3173 from matrix-org/t3chguy/MELS_3pid 
MELS handle m.room.third_party_invite
 2019-07-03 16:02:10 +01:00
David Baker
b43a04634a
Merge pull request #3172 from matrix-org/t3chguy/invites_list 
Fix logic around MemberList invites section, specifically regarding 3pid
 2019-07-03 16:01:01 +01:00
Weblate
d22b0e5934 Merge branch 'origin/develop' into Weblate. 2019-07-03 14:33:48 +00:00
random
0d809d66af Translated using Weblate (Italian) 
Currently translated at 100.0% (1670 of 1670 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-07-03 14:33:48 +00:00
Kévin C
b658053f33 Translated using Weblate (French) 
Currently translated at 100.0% (1670 of 1670 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-03 14:33:47 +00:00
Jeff Huang
baefc6f232 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1670 of 1670 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-07-03 14:33:47 +00:00
Besnik Bleta
1d22f901a0 Translated using Weblate (Albanian) 
Currently translated at 99.6% (1663 of 1670 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-07-03 14:33:47 +00:00
Travis Ralston
7dbd17c137
Merge pull request #3150 from matrix-org/travis/less-typing 
Track the user's own typing state external to the composer
 2019-07-03 08:33:42 -06:00
Bruno Windels
344cc079c5 show /relations error in edit history dialog 2019-07-03 12:16:58 +02:00
Weblate
b70f3bf48e Merge branch 'origin/develop' into Weblate. 2019-07-03 09:03:04 +00:00
kristbaum
21bf7e51e1 Translated using Weblate (German) 
Currently translated at 88.3% (1472 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-03 09:03:04 +00:00
Samu Voutilainen
3c0698ea0e Translated using Weblate (Finnish) 
Currently translated at 99.3% (1655 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-03 09:03:04 +00:00
Slavi Pantaleev
dcc3bb58be Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-07-03 09:03:04 +00:00
Besnik Bleta
7f2c6b46ca Translated using Weblate (Albanian) 
Currently translated at 99.6% (1660 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-07-03 09:03:03 +00:00
Bruno Windels
353f5a205c
Merge pull request #3170 from matrix-org/bwindels/handle-associated-failures 
Handle associated event send failures
 2019-07-03 09:02:58 +00:00
Michael Telatynski
429b8e94df MELS handle m.room.third_party_invite 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-03 08:58:34 +01:00
Tulir Asokan
430dd40b8d Translated using Weblate (Finnish) 
Currently translated at 99.3% (1655 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-03 07:57:16 +00:00
Stefan Parviainen
906b46940a Translated using Weblate (Finnish) 
Currently translated at 99.3% (1655 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-03 07:57:16 +00:00
Michael Telatynski
bc4bff64f6 Fix logic around MemberList invites section, specifically regarding 3pid 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-03 08:38:08 +01:00
Weblate
b7192f55d9 Merge branch 'origin/develop' into Weblate. 2019-07-02 17:28:16 +00:00
BenjaminVettori
6640ff7bf6 Translated using Weblate (German) 
Currently translated at 88.2% (1471 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:28:16 +00:00
kristbaum
be7fd945ab Translated using Weblate (German) 
Currently translated at 88.2% (1471 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:28:15 +00:00
J. Ryan Stinnett
cf8eeedcc7
Merge pull request #3169 from matrix-org/jryans/reactions-tooltip-tweaks 
Improve interactive tooltip hover behaviour
 2019-07-02 18:28:09 +01:00
BenjaminVettori
49bf550975 Translated using Weblate (German) 
Currently translated at 87.5% (1458 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:17:53 +00:00
natowi
37890c1328 Translated using Weblate (German) 
Currently translated at 87.5% (1458 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:17:53 +00:00
kristbaum
af32c303de Translated using Weblate (German) 
Currently translated at 87.5% (1458 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:17:53 +00:00
BenjaminVettori
f905707263 Translated using Weblate (German) 
Currently translated at 87.2% (1453 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:14:22 +00:00
kristbaum
cb1f661e04 Translated using Weblate (German) 
Currently translated at 87.2% (1453 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:14:22 +00:00
natowi
ed2f3e230e Translated using Weblate (German) 
Currently translated at 87.1% (1452 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:14:08 +00:00
BenjaminVettori
077ae9e6d6 Translated using Weblate (German) 
Currently translated at 87.1% (1452 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:14:08 +00:00
kristbaum
e3f5746d52 Translated using Weblate (German) 
Currently translated at 87.1% (1452 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:14:08 +00:00
natowi
20af120a67 Translated using Weblate (German) 
Currently translated at 86.7% (1445 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:12:22 +00:00
BenjaminVettori
c641da1dfe Translated using Weblate (German) 
Currently translated at 86.7% (1445 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-07-02 17:12:22 +00:00
Bruno Windels
daa2250023 fix lint 2019-07-02 18:30:57 +02:00
Bruno Windels
3fd96008c3 Fixup: dont assume there is a prior edit 2019-07-02 17:34:07 +02:00
Bruno Windels
14caed62d0 make sure scrollpanel is mounted before checking scroll 
have seen errors in this direction, so hope this will fix it,
as this is invoked from any EventTile's onHeightChanged callback,
which is often called after some async operation (by when the
timeline can be unmounted already).
doesn't hurt in any case.
 2019-07-02 17:29:37 +02:00
Nathan Follens
47d031865a Translated using Weblate (West Flemish) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-07-02 14:50:12 +00:00
Szimszon
0f7aa2ee36 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-07-02 14:50:12 +00:00
Kévin C
6c460f7601 Translated using Weblate (French) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-02 14:50:11 +00:00
Nathan Follens
fc06d2464a Translated using Weblate (Dutch) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-07-02 14:50:11 +00:00
Jeff Huang
2ff500c222 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-07-02 14:50:11 +00:00
J. Ryan Stinnett
a4275e6d89
Merge pull request #3171 from matrix-org/jryans/login-field-border 
Fix login type selector border
 2019-07-02 15:38:39 +01:00
J. Ryan Stinnett
7fc1288614 Fix login type selector border 
This fixes a regression in the login type selector's border and placement.

Fixes https://github.com/vector-im/riot-web/issues/10223
 2019-07-02 15:09:51 +01:00
Travis Ralston
1d54911581
Merge pull request #3159 from matrix-org/travis/pick-server-tombstone 
Use the event sender instead of event ID for viaServers off a tombstone
 2019-07-02 07:52:40 -06:00
Travis Ralston
0c0a3c6133
Merge pull request #3160 from matrix-org/travis/keyshare-mute 
Append keyshare request dialogs instead of replacing the current dialog
 2019-07-02 07:52:12 -06:00
Bruno Windels
357ad3d50c cancel pending edit when sending new edit 2019-07-02 14:52:29 +02:00
Bruno Windels
d0d327620b hide reactions for redacted events 2019-07-02 13:56:27 +02:00
J. Ryan Stinnett
a4587c5013
Merge pull request #3165 from matrix-org/t3chguy/tooltip_accessible_button 
Add AccessibleTooltipButton and use it for RoomSubList buttons
 2019-07-02 10:34:51 +01:00
Michael Telatynski
904a096f72
Update AccessibleTooltipButton.js 2019-07-02 10:28:36 +01:00
Bruno Windels
515ed2e1bb Also cancel associated events when canceling sending from ctx menu 2019-07-02 10:11:38 +02:00
J. Ryan Stinnett
dd94bf799d Improve interactive tooltip hover behaviour 
This gives the interactive tooltip a more natural hover behaviour by removing
the full screen div behind it. This allows the target button to keep its hover
state, for example.

This also removes the click to close behaviour, which was too easy to trigger
accidentally.

Fixes https://github.com/vector-im/riot-web/issues/10179
Fixes https://github.com/vector-im/riot-web/issues/10222
Fixes https://github.com/vector-im/riot-web/issues/10225
 2019-07-01 18:00:59 +01:00
Bruno Windels
1a4bdbaf96 add (s) for singular to tr 2019-07-01 18:12:42 +02:00
Travis Ralston
38bfe8b1ce
Merge pull request #3161 from matrix-org/travis/fix-via-join 
Correctly populate the dispatch for joining a room via servers
 2019-07-01 09:47:46 -06:00
Travis Ralston
64f0a7cbe7
Merge pull request #3162 from matrix-org/travis/cleanup-breadcrumbs 
Clean up legacy breadcrumbs persistence fallback
 2019-07-01 09:47:28 -06:00
Bruno Windels
4be16a380a only show resend options if event hasn't been redacted 
(which can now be only local, which is why this wasn't neccesary before)
 2019-07-01 17:39:30 +02:00
Bruno Windels
0d79b03f53 support resending reactions 2019-07-01 17:39:00 +02:00
Bruno Windels
8160759a52 show the various resend options as different menu items 2019-07-01 17:37:32 +02:00
David Baker
a1b5c8ab89
Merge pull request #3168 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-07-01 10:48:53 +01:00
J. Ryan Stinnett
e746c49020
Merge pull request #3135 from matrix-org/t3chguy/fix_MELS_labs 
Add ability to render null-rejoins in Timeline and MELS
 2019-07-01 10:42:36 +01:00
Nathan Follens
026f356f89 Translated using Weblate (West Flemish) 
Currently translated at 100.0% (1662 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-07-01 09:14:07 +00:00
Szimszon
81995f36f1 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1662 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-07-01 09:14:07 +00:00
Nathan Follens
8d61cb1d1e Translated using Weblate (Dutch) 
Currently translated at 100.0% (1662 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-07-01 09:14:06 +00:00
Bruno Windels
d66d3ca4d2 support resending redaction in context menu 2019-07-01 11:06:55 +02:00
Bruno Windels
6d458154a9 support resending edit in context menu 2019-07-01 11:06:55 +02:00
Kévin C
8117400ad7 Translated using Weblate (French) 
Currently translated at 100.0% (1662 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-06-30 14:29:46 +00:00
Benjamin
534214974e Translated using Weblate (Esperanto) 
Currently translated at 88.7% (1474 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-06-30 14:29:46 +00:00
Benjamin
7c2e005d57 Translated using Weblate (English (United States)) 
Currently translated at 45.8% (762 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2019-06-30 14:29:45 +00:00
Jeff Huang
be194c738c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1662 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-06-30 14:29:43 +00:00
Besnik Bleta
c2a6041d67 Translated using Weblate (Albanian) 
Currently translated at 99.6% (1655 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-06-30 14:29:43 +00:00
Michael Telatynski
01a4a69787 Merge branches 'develop' and 't3chguy/tooltip_accessible_button' of github.com:matrix-org/matrix-react-sdk into t3chguy/tooltip_accessible_button 2019-06-30 11:37:19 +01:00
Michael Telatynski
46a6043e9b Use title prop instead to minimize changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 11:00:21 +01:00
Michael Telatynski
8ed336ea08 Add AccessibleTooltipButton and use it for RoomSubList buttons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 10:58:59 +01:00
Michael Telatynski
d774d96290 Fix some React errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 10:41:39 +01:00
Weblate
2a8831d80e Merge branch 'origin/develop' into Weblate. 2019-06-29 06:31:24 +00:00
Michael Telatynski
4427e139be
Merge pull request #3155 from matrix-org/t3chguy/avatar_cmd 
Add /myavatar command
 2019-06-29 07:31:20 +01:00
Michael Telatynski
d0c8e09532 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 07:30:16 +01:00
Michael Telatynski
e39c3298d6 Emojibase data includes blank variations, accept these when scanning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 07:28:09 +01:00
Michael Telatynski
77dbc79386 clean up promises properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 07:05:43 +01:00
Michael Telatynski
e591d3ef76 take dirty-flag into account for editing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 06:52:19 +01:00
Michael Telatynski
bf9353f3af Merge branches 'develop' and 't3chguy/edit_skip_if_no_edit' of github.com:matrix-org/matrix-react-sdk into t3chguy/edit_skip_if_no_edit 2019-06-29 06:45:06 +01:00
Michael Telatynski
443c7343a0 Merge branches 'develop' and 't3chguy/fix_MELS_labs' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_MELS_labs 2019-06-29 06:36:20 +01:00
Travis Ralston
4f6db320e3
Appease the linter 2019-06-28 16:44:19 -06:00
Travis Ralston
8905566cfb Clean up legacy breadcrumbs persistence fallback 
It's been more than a few weeks.
 2019-06-28 16:30:59 -06:00
Travis Ralston
e65cc3b189 Correctly populate the dispatch for joining a room via servers 
Fixes https://github.com/vector-im/riot-web/issues/9817
 2019-06-28 16:26:28 -06:00
Travis Ralston
12e7953f64 Append keyshare request dialogs instead of replacing the current dialog 
Fixes https://github.com/vector-im/riot-web/issues/8798

By default, Modal dialogs are put up front. For this particular dialog we don't need to deal with it right away, therefore it can wait.
 2019-06-28 14:34:19 -06:00
Travis Ralston
083c1a78ab Use the event sender instead of event ID for viaServers off a tombstone 
Fixes https://github.com/vector-im/riot-web/issues/10206
 2019-06-28 12:34:46 -06:00
Travis Ralston
c2ad9d4f53 Attach timer finished state once 2019-06-28 12:29:03 -06:00
Weblate
741a17cf5c Merge branch 'origin/develop' into Weblate. 2019-06-28 17:13:29 +00:00
Osoitz
c3893975f2 Translated using Weblate (Basque) 
Currently translated at 100.0% (1662 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-06-28 17:13:29 +00:00
J. Ryan Stinnett
35c0c3142f
Merge pull request #3158 from matrix-org/jryans/config-docs 
Update config.json docs location
 2019-06-28 18:13:24 +01:00
Weblate
25b5e4cae4 Merge branch 'origin/develop' into Weblate. 2019-06-28 14:21:26 +00:00
J. Ryan Stinnett
2d1325686d
Merge pull request #3148 from matrix-org/matthew/fix-horizontal-scrolling 
If on trackpad, don't mess with horizontal scrolling.
 2019-06-28 15:21:22 +01:00
J. Ryan Stinnett
00dfdfe7f1
Fix linter warning 2019-06-28 15:16:44 +01:00
Weblate
2b7778f869 Merge branch 'origin/develop' into Weblate. 2019-06-28 14:12:54 +00:00
Kévin C
231e3ebf2b Translated using Weblate (French) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-06-28 14:12:53 +00:00
Osoitz
bdd61701dd Translated using Weblate (Basque) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-06-28 14:12:53 +00:00
Besnik Bleta
31320c7994 Translated using Weblate (Albanian) 
Currently translated at 99.6% (1654 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-06-28 14:12:53 +00:00
J. Ryan Stinnett
33425240f6
Merge pull request #3152 from matrix-org/jryans/reactions-show-all 
Limit reactions row on initial display
 2019-06-28 15:12:48 +01:00
J. Ryan Stinnett
f9e158ff68 Rename link to button 2019-06-28 14:47:41 +01:00
J. Ryan Stinnett
04398b7853 Tweak limits so show all reveals more space than itself 2019-06-28 14:46:57 +01:00
J. Ryan Stinnett
527e1e94a4 Update config.json docs location 
Part of https://github.com/vector-im/riot-web/pull/10195
 2019-06-28 13:44:18 +01:00
Tuomas Hietala
abdd9488f8 Translated using Weblate (Finnish) 
Currently translated at 99.6% (1655 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-06-27 23:24:17 +00:00
Nathan Follens
e7a05f0b41 Translated using Weblate (West Flemish) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-06-27 19:14:45 +00:00
Szimszon
abe37e5fa6 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-06-27 19:14:44 +00:00
Nathan Follens
5db0192415 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-06-27 19:14:44 +00:00
J. A. Durieux
85159d8f7d Translated using Weblate (Dutch) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-06-27 19:14:43 +00:00
Michael Telatynski
e8db379fed rename helper method 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-27 19:41:29 +01:00
Michael Telatynski
cebb2b773f Add /myavatar command 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-27 19:38:12 +01:00
Travis Ralston
8bb860e870 Use fewer functions for typing in the composer 2019-06-27 10:37:33 -06:00
Travis Ralston
17ed62de7d Move MessageComposer typing timeout to TypingStore 2019-06-27 10:35:44 -06:00
Travis Ralston
eb1f911d15 Use a Timer 2019-06-27 10:29:27 -06:00
Travis Ralston
67ecf9db62 expireMs -> expireTs 2019-06-27 09:44:13 -06:00
Weblate
b47e3016eb Merge branch 'origin/develop' into Weblate. 2019-06-27 15:24:30 +00:00
Szimszon
70eaf71920 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1660 of 1660 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-06-27 15:24:30 +00:00
Travis Ralston
7f2ab39609
Merge pull request #3142 from matrix-org/travis/preview-loading 
Show a loading state for slow peeks
 2019-06-27 09:24:25 -06:00
Weblate
85ffca1ee3 Merge branch 'origin/develop' into Weblate. 2019-06-27 13:16:41 +00:00
Bruno Windels
dff6ca85f2
Merge pull request #3146 from matrix-org/bwindels/dontfailonmissingwebcam 
Don't show error dialog when user has no webcam
 2019-06-27 13:16:36 +00:00
Weblate
753d6b40ca Merge branch 'origin/develop' into Weblate. 2019-06-27 13:16:14 +00:00
pebles
c5c3e465c6 Translated using Weblate (Spanish) 
Currently translated at 77.9% (1296 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-06-27 13:16:14 +00:00
Bruno Windels
f18c389f2d
Merge pull request #3151 from matrix-org/bwindels/e2e-edit-history 
Make edit history work in encrypted rooms.
 2019-06-27 13:16:10 +00:00
J. Ryan Stinnett
59b4a3398d Limit reactions row on initial display 
This limits the reactions row below messages to initially show at most 8 keys.
For those messages with more than that, a "Show all" option appears to reveal
all the keys.

Fixes https://github.com/vector-im/riot-web/issues/9570
 2019-06-27 13:17:23 +01:00
Bruno Windels
25aa65ac0d remove leftover logging 2019-06-27 14:13:37 +02:00
Bruno Windels
c0e9edcf40 get decrypted content if needed 2019-06-27 12:33:29 +02:00
Weblate
2fcabd5441 Merge branch 'origin/develop' into Weblate. 2019-06-27 10:21:53 +00:00
random
f7ff5ab60e Translated using Weblate (Italian) 
Currently translated at 100.0% (1663 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-06-27 10:19:58 +00:00
Kévin C
bb7fe6f965 Translated using Weblate (French) 
Currently translated at 100.0% (1663 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-06-27 10:19:57 +00:00
Benjamin
6ab26abc9f Translated using Weblate (Esperanto) 
Currently translated at 88.3% (1468 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-06-27 10:19:57 +00:00
Jeff Huang
aef0c6a84b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1663 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-06-27 10:19:57 +00:00
Slavi Pantaleev
00cbcb41bc Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1663 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-06-27 10:19:56 +00:00
Besnik Bleta
565636350f Translated using Weblate (Albanian) 
Currently translated at 99.6% (1656 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-06-27 10:19:55 +00:00
Tirifto
f2fbbcd802 Translated using Weblate (Esperanto) 
Currently translated at 88.2% (1466 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-06-27 05:04:50 +00:00
Benjamin
12bc5d3555 Translated using Weblate (Esperanto) 
Currently translated at 88.2% (1466 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-06-27 05:04:50 +00:00
Travis Ralston
1546cb2923 You win this time, linter. 2019-06-26 22:40:08 -06:00
Travis Ralston
cd089a3f95 Track the user's own typing state external to the composer 
Fixes https://github.com/vector-im/riot-web/issues/9986

There's a few reasons for pushing this out to its own place:
* In future, we might want to move WhoIsTyping here.
* We have multiple composers now, and although they don't send typing notifications, they could (see https://github.com/vector-im/riot-web/issues/10188)
* In future we may have status for where/what the user is typing (https://github.com/matrix-org/matrix-doc/issues/437)
* The composer is complicated enough - it doesn't need to dedupe typing states too.

Note: This makes use of the principles introduced in https://github.com/vector-im/riot-web/issues/8923 and https://github.com/vector-im/riot-web/issues/9090
 2019-06-26 22:36:55 -06:00
Matthew Hodgson
3873dc724a stupid linter >:( 2019-06-26 21:47:55 +01:00
Matthew Hodgson
7fc5d229d6 fix stuff as per review 2019-06-26 21:13:17 +01:00
Michael Telatynski
46a8ec903e Handle null-rejoins only if SettingsStore says so 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-26 20:22:01 +01:00
Matthew Hodgson
3d11eb430b oops, remove old code 2019-06-26 18:38:46 +01:00
Matthew Hodgson
debcafd760 if on trackpad, don't mess with horizontal scrolling. 
trackpad heuristic is 'if 15 minutes of no horizontal scrollwheel events, assume user may have switched to mousewheel'
 2019-06-26 18:38:03 +01:00
J. Ryan Stinnett
e8fba4f770 Change interactive tooltip to only flip when required 
This changes the interactive tooltip to only flip around when the tooltip
content would be near the window edge.

Fixes https://github.com/vector-im/riot-web/issues/10176
 2019-06-26 18:24:34 +01:00
Bruno Windels
f6e0cd9a03 don't show error dialog when user has no webcam 
instead, retry with just audio.
Also when mounted, check if the user has given enough permissions
to return non-empty labels for the devices, something both ff & chrome
do if you haven't going through the permissions popup yet. If not,
show the permissions button.
 2019-06-26 18:54:15 +02:00
Weblate
6917310b58 Merge branch 'origin/develop' into Weblate. 2019-06-26 14:38:58 +00:00
Osoitz
9f775408fa Translated using Weblate (Basque) 
Currently translated at 100.0% (1662 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-06-26 14:38:58 +00:00
Bruno Windels
15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history 
Edit history dialog
 2019-06-26 14:38:53 +00:00
Bruno Windels
c9c84016cb move EditHistoryMessage to messages directory 2019-06-26 16:17:25 +02:00
Bruno Windels
54de0b298b add "Click to see edits." to tooltip 2019-06-26 16:13:32 +02:00
Bruno Windels
a1548285b5 fix copyright header and whitespace 2019-06-26 16:13:15 +02:00
Bruno Windels
c987f4e8d8 remove passthrough ctor 2019-06-26 16:12:57 +02:00
Bruno Windels
d606c966ea use PureComponent 2019-06-26 16:12:44 +02:00
Bruno Windels
929020a139 remove leftover logging 2019-06-26 15:51:55 +02:00
Bruno Windels
39c96b15d8 set state in ctor 2019-06-26 15:51:46 +02:00
Bruno Windels
f4b86ca265 don't bind 2019-06-26 15:51:28 +02:00
Bruno Windels
fa0319f14b apply renamed (token -> from) option 2019-06-26 15:49:24 +02:00
Weblate
b3000f5c0c Merge branch 'origin/develop' into Weblate. 2019-06-26 13:14:05 +00:00
Travis Ralston
838ef7fa40
Merge pull request #3141 from matrix-org/travis/fix-guest-experience 
Supply oobData to RoomPreviewBar
 2019-06-26 07:14:00 -06:00
Weblate
f80a4dd0e5 Merge branch 'origin/develop' into Weblate. 2019-06-26 13:13:23 +00:00
Travis Ralston
854cb8a57e
Merge pull request #3140 from matrix-org/travis/make-breadcrumbs-less-of-a-jerk 
Don't boost trackpad users in breadcrumbs
 2019-06-26 07:13:19 -06:00
Weblate
554d9cf711 Merge branch 'origin/develop' into Weblate. 2019-06-26 13:12:45 +00:00
Besnik Bleta
480052ed65 Translated using Weblate (Albanian) 
Currently translated at 99.6% (1655 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-06-26 13:12:45 +00:00
Travis Ralston
8d85967824
Merge pull request #3139 from matrix-org/travis/upgrades-final 
Fix room upgrade warning being chopped off and a spelling mistake
 2019-06-26 07:12:39 -06:00
Bruno Windels
fe3be39fe7 don't hide timestamps 2019-06-26 11:59:56 +02:00
Bruno Windels
ee03a0f31d recycle EventTile css to make history items look mostly similar 2019-06-26 11:59:56 +02:00
Bruno Windels
8c9a6ddf96 support edits pagination in a ScrollPanel 2019-06-26 11:59:56 +02:00
Bruno Windels
0fe28cba43 support emotes in edit history 2019-06-26 11:59:56 +02:00
Bruno Windels
e7fc84d5da render history items in own component 
including:
- respect 12/24 hour setting
- pillify
 2019-06-26 11:59:56 +02:00
Bruno Windels
19b4699bc2 WIP for showing pills in edit history 2019-06-26 11:59:56 +02:00
Bruno Windels
e54881aa24 WIP 2019-06-26 11:59:56 +02:00
Bruno Windels
8b5f07e63d open edit dialog on clicking (edited) 2019-06-26 11:59:56 +02:00
Bruno Windels
ef71e6fd4f very basic & hackish edit history dialog 2019-06-26 11:59:56 +02:00
Weblate
782288e1e2 Merge branch 'origin/develop' into Weblate. 2019-06-26 08:53:56 +00:00
Le Dang Trung
e5dcec09f9 Translated using Weblate (Vietnamese) 
Currently translated at 10.4% (173 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vi/
 2019-06-26 08:53:55 +00:00
progserega
436cc71659 Translated using Weblate (Russian) 
Currently translated at 99.2% (1645 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-06-26 08:53:49 +00:00
あかれぎ
54bfdb0379 Translated using Weblate (Japanese) 
Currently translated at 64.5% (1070 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2019-06-26 08:53:49 +00:00
Szimszon
5c39297e6e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1658 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-06-26 08:53:48 +00:00
Tuomas Hietala
3835f3b519 Translated using Weblate (Finnish) 
Currently translated at 99.5% (1650 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-06-26 08:53:48 +00:00