061bd789cf
Merge branch 'origin/develop' into Weblate.
2019-07-08 09:23:55 +00:00
dd27891ee9
Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl
...
Don't show Remove button in ImageView if can't redact, delint ImageView
2019-07-08 10:23:51 +01:00
c9f34a5d5a
Merge branch 'origin/develop' into Weblate.
2019-07-08 08:19:31 +00:00
7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions
...
Edit history actions
2019-07-08 08:19:27 +00:00
1af2ca6b36
constistent jsx bracket and indent styling
2019-07-08 10:12:26 +02:00
cf11a3758f
set analyticsInfo for dialogs
2019-07-08 10:12:04 +02:00
0b9ab4e566
Translated using Weblate (Chinese (Traditional))
...
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/zh_Hant/
2019-07-07 14:50:30 +00:00
c2905bd33b
make things a tad saner
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 11:16:01 +01:00
89ece266c6
Make id used in EditableItemList unique, namespace mx_EditableItemList_*
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 11:15:10 +01:00
6b9c6a31f0
Don't show Remove button in ImageView if can't redact, delint ImageView
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 10:42:14 +01:00
eb46774437
Merge branch 'origin/develop' into Weblate.
2019-07-06 07:53:26 +00:00
040e580cf0
Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying
...
Don't allow editing via up-arrow when Replying
2019-07-06 08:53:22 +01:00
f9fe35dba3
Merge branch 'origin/develop' into Weblate.
2019-07-06 07:53:03 +00:00
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
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
ca6563dce4
Merge branch 'travis/soft-logout-rehydrate' into t1
2019-07-05 15:03:24 -06:00
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
8b417f8a60
Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-overwrite
2019-07-05 14:37:04 -06:00
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
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
d39b4e9c7c
Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys
2019-07-05 13:41:04 -06:00
89b8ccf471
Merge branch 'origin/develop' into Weblate.
2019-07-05 16:56:04 +00:00
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
Weblate