Commit Graph

19902 Commits (ed5bfb7acf678cb68431c8147e3a43195ce89122)

Author SHA1 Message Date
Szimszon 1e9021d831 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1926 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-11-29 22:14:01 +00:00
Travis Ralston f4b1c4f360 Remove useless file 2019-11-29 15:13:46 -07:00
J. Ryan Stinnett 798d5c8ada Always update cross-signing status even if error 2019-11-29 17:53:39 +00:00
J. Ryan Stinnett c32c1d201c Rename device signing auth param 2019-11-29 17:49:51 +00:00
J. Ryan Stinnett 6140803b7f Fix key upload auth to test confirmation 2019-11-29 17:43:24 +00:00
Weblate 6df78e4be2 Merge branch 'origin/develop' into Weblate. 2019-11-29 17:18:04 +00:00
Slavi Pantaleev 778e14f716 Translated using Weblate (Bulgarian)
Currently translated at 95.7% (1843 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-11-29 17:18:04 +00:00
Travis Ralston 9cae685e22
Merge pull request #3686 from matrix-org/travis/theme-fix
Ensure the settings page accurately represents theme choices
2019-11-29 10:17:55 -07:00
J. Ryan Stinnett 92c0fdf085 Clarify current state of cross-signing private keys 2019-11-29 15:57:46 +00:00
Weblate b767d3c15c Merge branch 'origin/develop' into Weblate. 2019-11-29 14:41:56 +00:00
Travis Ralston 1c766d8594
Merge pull request #3688 from matrix-org/travis/rr-fix
Ensure read receipts end up with a valid reference to checkUnmounting
2019-11-29 07:41:49 -07:00
Weblate be9f1ce64a Merge branch 'origin/develop' into Weblate. 2019-11-29 14:41:26 +00:00
Kévin C 69d82bef67 Translated using Weblate (French)
Currently translated at 100.0% (1926 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-11-29 14:41:26 +00:00
Travis Ralston 7b1ee944c8
Merge pull request #3687 from matrix-org/travis/rr-velocity
Convert Velociraptor component to a class
2019-11-29 07:41:17 -07:00
J. Ryan Stinnett a21285143f Add tbody to silence React warning 2019-11-29 11:55:36 +00:00
J. Ryan Stinnett c6e56d98b3 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-11-29 11:31:23 +00:00
J. Ryan Stinnett c103fe4273 Add cross-signing diagnostic panel
This is not part of any designs, so it may be short-lived, but it's quite handy
for diagnosing issues with cross-signing at least while the feature is in
development.
2019-11-29 11:29:08 +00:00
Weblate ba24e64f47 Merge branch 'origin/develop' into Weblate. 2019-11-29 05:07:55 +00:00
Samu Voutilainen 70aeafa77b Translated using Weblate (Finnish)
Currently translated at 100.0% (1925 of 1925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-11-29 05:07:54 +00:00
Jeff Huang cd7bbd2dc6 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1925 of 1925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-11-29 05:07:53 +00:00
Travis Ralston 5aad914c25
Merge pull request #3675 from aaronraimist/labs-explain
Add a link to the labs feature documentation
2019-11-28 22:07:47 -07:00
Aaron Raimist 4c50ac0e56
Improve wording
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-28 22:22:42 -06:00
Travis Ralston 36f9fab474 Ensure read receipts end up with a valid reference to checkUnmounting
Fixes https://github.com/vector-im/riot-web/issues/11496
Fixes https://github.com/vector-im/riot-web/issues/11385
Fixes https://github.com/vector-im/riot-web/issues/10007
Fixes https://github.com/vector-im/riot-web/issues/9769

React does (kinda) bind `this._isUnmounting` for us in the context of the EventTile, but the EventTile then passes the function straight through to the ReadReceiptMarker component, which then binds it in the context of EventTile. This results in `this._mounted` being falsey all the time, preventing the ReadReceiptMarker from hitting the code where it updates rrInfo in its unmount. 

The velocity stuff is smart enough to realize that it has a read receipt and shuffles everything over by one, but when it goes to check the starting height (which will be null/undefined because the RRMarker didn't update it) it assumes it has never seen the receipt before and appends it again - this is what causes some holes/stacking.

By forcefully binding the `this._isUnmounting` function we ensure that the `this._mounted` variable is correctly referenced in the context of the MessagePanel, allowing the RRMarker to update its position, and therefore allowing the velocity behaviour to be consistent.
2019-11-28 19:45:37 -07:00
Travis Ralston 24843cf25e Convert Velociraptor to a class 2019-11-28 19:36:30 -07:00
Michael Telatynski bfb5706b4a don't consume all keys
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:51:21 +00:00
Michael Telatynski 29b59dde5b undo unrelated change
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:44:08 +00:00
Travis Ralston 37ec7e6f7e Ensure the settings page accurately represents theme choices
Fixes https://github.com/vector-im/riot-web/issues/11518

This also fixes a bug where the the theme logic can incorrectly get stuck in the light theme - the ThemeController was overriding *all* values, not just supposed themes. Null values aren't overridden so that the various theme logic bits don't assume the user has chosen the light theme explicitly.
2019-11-28 13:40:28 -07:00
Michael Telatynski 811454462d fix Stickerpicker and MessageContextMenu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:38:58 +00:00
Michael Telatynski 3847996b5b transition Tooltips over to deprecated code
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:26:09 +00:00
Michael Telatynski 2daf3a96bf delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 18:42:38 +00:00
Michael Telatynski 6c5b777a77 Consolidate all except tooltips
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 18:16:59 +00:00
Michael Telatynski 5a540f5949 Migrate MemberStatusMessageAvatar over to new Context Menus
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 16:40:45 +00:00
Michael Telatynski ecf51a0569 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 16:28:53 +00:00
Michael Telatynski 6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus
 Conflicts:
	src/components/views/context_menus/RoomTileContextMenu.js
2019-11-28 16:25:59 +00:00
Travis Ralston b833a030e7 Invite invited members too 2019-11-28 09:24:02 -07:00
Weblate 503aeac21f Merge branch 'origin/develop' into Weblate. 2019-11-28 16:16:59 +00:00
Travis Ralston 25809c54a7
Merge pull request #3682 from matrix-org/travis/fix-calltype-i18n
Improve translatable strings for calls
2019-11-28 09:16:52 -07:00
Weblate 064df930c8 Merge branch 'origin/develop' into Weblate. 2019-11-28 16:10:49 +00:00
Travis Ralston 01ba4aca45
Merge pull request #3680 from matrix-org/travis/fix-list-diff
Don't assume that diffs will have an appropriate child node
2019-11-28 09:10:43 -07:00
Travis Ralston fde116458c
Words are hard 2019-11-28 09:08:24 -07:00
Weblate d652e182aa Merge branch 'origin/develop' into Weblate. 2019-11-28 16:06:55 +00:00
Weblate 92e95d0c07 Merge branch 'origin/develop' into Weblate. 2019-11-28 16:06:51 +00:00
random dc152a5409 Translated using Weblate (Italian)
Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-11-28 16:06:51 +00:00
Samu Voutilainen 94f19cbc2e Translated using Weblate (Finnish)
Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-11-28 16:06:50 +00:00
Travis Ralston 90a1cb68eb
Merge pull request #3681 from matrix-org/travis/fix-jitsi
Fix persisted widgets getting stuck at loading screens
2019-11-28 09:06:44 -07:00
Travis Ralston c1d5d20b86
Merge pull request #2959 from matrix-org/t3chguy/clear_notifications
Add button to clear all notification counts, sometimes stuck in historical
2019-11-28 09:06:35 -07:00
Aaron Raimist 1bb55d4fa1
Hide Remove button in message editing history if you don't have permission to redact
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-27 22:30:39 -06:00
Travis Ralston b9559ecf82 Appease the linter 2019-11-27 20:34:31 -07:00
Travis Ralston f020929345 Add an option to invite users to upgraded private rooms
The option doesn't show up on public room upgrades.
2019-11-27 20:29:11 -07:00
Travis Ralston 96ffe94876 Merge remote-tracking branch 'origin/develop' into t3chguy/clear_notifications 2019-11-27 19:27:52 -07:00