Michael Telatynski
000f7e8007
Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit
...
If oldContent matches newContent, skip sending the edit
2019-07-06 08:52:58 +01:00
Travis Ralston
ae79ce97f3
Dress up the soft logout page to look like the design
...
Fixes https://github.com/vector-im/riot-web/issues/10262
Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
2019-07-05 15:05:31 -06:00
Travis Ralston
ca6563dce4
Merge branch 'travis/soft-logout-rehydrate' into t1
2019-07-05 15:03:24 -06:00
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
Weblate
89b8ccf471
Merge branch 'origin/develop' into Weblate.
2019-07-05 16:56:04 +00: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
Weblate
20c4c448ca
Merge branch 'origin/develop' into Weblate.
2019-07-05 16:50:17 +00:00
Tuomas Hietala
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
J. Ryan Stinnett
480fe44d44
Merge pull request #3179 from matrix-org/jryans/upgrade-deps
...
Upgrade dependencies
2019-07-05 17:50:13 +01:00
Weblate
acadd624ef
Merge branch 'origin/develop' into Weblate.
2019-07-05 15:35:11 +00:00
random
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
Tuomas Hietala
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
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
Weblate
60a9e39d69
Merge branch 'origin/develop' into Weblate.
2019-07-05 15:28:16 +00:00
random
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
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
Weblate
e94b3c2459
Merge branch 'origin/develop' into Weblate.
2019-07-05 15:25:02 +00:00
random
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
Tuomas Hietala
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
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
Weblate
efc70a8488
Merge branch 'origin/develop' into Weblate.
2019-07-05 10:50:44 +00:00
Kévin C
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
Besnik Bleta
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
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