Travis Ralston
fca4ebcd72
Overwrite the old session if the new creds are for a different user
...
Fixes https://github.com/vector-im/riot-web/issues/10272
2019-07-05 14:45:34 -06:00
Travis Ralston
8b417f8a60
Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-overwrite
2019-07-05 14:37:04 -06:00
Travis Ralston
1f1a5b2aac
Fix React crash when using a non-default homeserver on soft logout
...
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
2019-07-05 14:35:21 -06:00
Travis Ralston
55b4ef2169
Change soft logout rehydrate text if there's pending key backups
...
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
2019-07-05 13:52:14 -06:00
Travis Ralston
d39b4e9c7c
Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys
2019-07-05 13:41:04 -06:00
J. Ryan Stinnett
017fc84862
Merge pull request #3184 from matrix-org/jryans/reactions-send-marks-unread
...
Track live events in timeline and use for read receipts and read markers
2019-07-05 17:55:59 +01:00
J. Ryan Stinnett
74431fe8b1
Merge pull request #3186 from matrix-org/jryans/reactions-allow-text
...
Allow diplayed reaction values to contain anything
2019-07-05 16:35:06 +01:00
J. Ryan Stinnett
87188e9229
Merge pull request #3185 from matrix-org/jryans/tooltip-target-null
...
Fix interactive tooltip null target error
2019-07-05 16:28:12 +01:00
Travis Ralston
9266c797da
Merge pull request #3181 from matrix-org/travis/soft-logout-force
...
Require that users go to the soft logout page if they're soft logged out
2019-07-05 09:24:56 -06:00
J. Ryan Stinnett
eb0e1eade4
Clamp reaction content width to at most 100px
...
Part of https://github.com/vector-im/riot-web/issues/10256
2019-07-05 16:18:16 +01:00
J. Ryan Stinnett
2a8f9a81f7
Allow diplayed reaction values to contain anything
...
Part of https://github.com/vector-im/riot-web/issues/10256
2019-07-05 16:18:06 +01:00
Bruno Windels
70334b69ec
implement view source for edits
2019-07-05 16:11:15 +02:00
J. Ryan Stinnett
3c3426d97e
Update copyright header
2019-07-05 15:08:55 +01:00
Bruno Windels
f4a8314c4f
make dom tree similar to eventtile so red lozenge style applies
2019-07-05 16:05:40 +02:00
Bruno Windels
0aa1252d01
monitor associated send status for edit history events
...
to update local echo if needed
2019-07-05 16:04:34 +02:00
Bruno Windels
2182248d7c
mark events from /relations as locally redacted if any pending redaction
2019-07-05 16:03:34 +02:00
J. Ryan Stinnett
5496a4dce6
Fix interactive tooltip null target error
...
Fixes https://github.com/vector-im/riot-web/issues/10232
2019-07-05 15:02:09 +01:00
J. Ryan Stinnett
0ae98a5a4d
Track live events in timeline and use for read receipts and read markers
...
This changes the `TimelinePanel` to track live events (that have committed to
the server and been remote echoed) as well as the full list of events (which
includes pending events).
The code paths that advance read receipt and read markers are then changed to
only use the live events so that these cannot advance into pending events.
Fixes https://github.com/vector-im/riot-web/issues/9952
2019-07-05 14:37:19 +01:00
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
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
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
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