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
20c4c448ca
Merge branch 'origin/develop' into Weblate.
2019-07-05 16:50:17 +00:00
11e6a81941
Translated using Weblate (Finnish)
...
Currently translated at 99.6% (1675 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-07-05 16:50:17 +00:00
480fe44d44
Merge pull request #3179 from matrix-org/jryans/upgrade-deps
...
Upgrade dependencies
2019-07-05 17:50:13 +01:00
acadd624ef
Merge branch 'origin/develop' into Weblate.
2019-07-05 15:35:11 +00:00
6cd2421929
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1681 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-07-05 15:35:11 +00:00
2bf3739af7
Translated using Weblate (Finnish)
...
Currently translated at 99.6% (1675 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-07-05 15:35:11 +00:00
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
60a9e39d69
Merge branch 'origin/develop' into Weblate.
2019-07-05 15:28:16 +00:00
02fc3c9b85
Translated using Weblate (Italian)
...
Currently translated at 99.8% (1678 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-07-05 15:28:16 +00:00
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
e94b3c2459
Merge branch 'origin/develop' into Weblate.
2019-07-05 15:25:02 +00:00
2ce736f5a7
Translated using Weblate (Italian)
...
Currently translated at 99.6% (1674 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-07-05 15:25:02 +00:00
b742525fbb
Translated using Weblate (Finnish)
...
Currently translated at 99.6% (1675 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-07-05 15:25:02 +00:00
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
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
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
70334b69ec
implement view source for edits
2019-07-05 16:11:15 +02:00
3c3426d97e
Update copyright header
2019-07-05 15:08:55 +01:00
f4a8314c4f
make dom tree similar to eventtile so red lozenge style applies
2019-07-05 16:05:40 +02:00
0aa1252d01
monitor associated send status for edit history events
...
to update local echo if needed
2019-07-05 16:04:34 +02:00
2182248d7c
mark events from /relations as locally redacted if any pending redaction
2019-07-05 16:03:34 +02:00
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
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
efc70a8488
Merge branch 'origin/develop' into Weblate.
2019-07-05 10:50:44 +00:00
1e22b781e4
Translated using Weblate (French)
...
Currently translated at 100.0% (1681 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-07-05 10:50:44 +00:00
f4ad9cc916
Translated using Weblate (Albanian)
...
Currently translated at 99.6% (1674 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-07-05 10:50:43 +00:00
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
ecc672cccc
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-05 08:40:00 +01:00
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
00973a1ee8
Appease the linter
2019-07-04 17:00:09 -06:00
03cbd7e8bb
Ensure links off the forgot password page land you at soft logout
2019-07-04 16:51:55 -06:00
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
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
1a3a12eed7
Merge branch 'origin/develop' into Weblate.
2019-07-04 16:22:24 +00:00
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
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
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
8ea46a8c4d
Remove unneeded page types
2019-07-04 09:59:20 -06:00
5e5bf21281
Remove irrelevant debugging
2019-07-04 09:59:07 -06:00
8468f7cdc3
support redactions in edit history dialog
2019-07-04 16:33:05 +02:00
b095042084
Upgrade dependencies
2019-07-04 15:08:20 +01:00
f19777fcf8
Merge branch 'origin/develop' into Weblate.
2019-07-04 12:07:17 +00:00
2b5d9961c0
Merge pull request #3178 from matrix-org/dbkr/delint_scalar_auth_client
...
De-lint ScalarAuthClient
2019-07-04 13:07:13 +01:00
7d40ccfdbe
De-lint ScalarAuthClient
2019-07-04 12:59:20 +01:00
375976575b
add redact button
2019-07-04 11:07:22 +02:00
abe5a7f4c9
Merge branch 'origin/develop' into Weblate.
2019-07-04 09:05:35 +00:00
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
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
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
J. Ryan Stinnett