Commit Graph

16550 Commits (54aaabac747afffb0c7b18772f5211b1bd976927)

Author SHA1 Message Date
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
Weblate 40b7963c4d Merge branch 'origin/develop' into Weblate. 2019-07-01 09:48:58 +00: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
Weblate 0d9998a009 Merge branch 'origin/develop' into Weblate. 2019-07-01 09:42:40 +00: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
Bruno Windels 1af8da4a4a change lozenge color of unsent redacted events to red
use css vars so we don't have to repeat the whole lozenge style
2019-07-01 11:06:55 +02:00
Michael Telatynski 49b89217a3 MemberInfo wrap Device Name/ID
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-30 19:21:19 +01: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
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