OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,167 Commits
212 Branches
549 Tags
667 MiB
Commit Graph

17167 Commits (7afaba3bf1c6f8140d3256b7b4612acf379823e6)

Author SHA1 Message Date
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
Weblate 7b5c3a20ad Merge branch 'origin/develop' into Weblate. 2019-07-02 09:34:55 +00: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
Weblate 0d5556313c Merge branch 'origin/develop' into Weblate. 2019-07-02 09:28:37 +00:00
Michael Telatynski 904a096f72
Update AccessibleTooltipButton.js 2019-07-02 10:28:36 +01:00
David Baker 0d51c86071
Merge pull request #3166 from matrix-org/t3chguy/word_break_device_id 
MemberInfo wrap Device Name/ID
 2019-07-02 10:28:32 +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
Weblate 60a3899fe0 Merge branch 'origin/develop' into Weblate. 2019-07-01 15:47:52 +00: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
Weblate ba4c0197f1 Merge branch 'origin/develop' into Weblate. 2019-07-01 15:47:32 +00: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
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
Michael Telatynski d774d96290 Fix some React errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 10:41:39 +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