Commit Graph

17050 Commits (9d49a5bb731b8fde8b13c9edc9dd9b4e5de2f31f)

Author SHA1 Message Date
Weblate 3d79ceb7b3 Merge branch 'origin/develop' into Weblate. 2019-06-27 23:24:17 +00:00
Tuomas Hietala abdd9488f8 Translated using Weblate (Finnish)
Currently translated at 99.6% (1655 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-06-27 23:24:17 +00:00
Travis Ralston 53d7cc6799
Merge pull request #3156 from matrix-org/t3chguy/unpin_hljs
Unpin highlight.js
2019-06-27 17:24:12 -06:00
Weblate 53fd641c9b Merge branch 'origin/develop' into Weblate. 2019-06-27 20:10:02 +00:00
Travis Ralston 9be40a27fc
Merge pull request #3154 from matrix-org/travis/syntax-error
Flexboxify generic error page
2019-06-27 14:09:57 -06:00
Michael Telatynski 5473f7ba45 Unpin HLJS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 20:36:45 +01:00
Weblate 005485a3b7 Merge branch 'origin/develop' into Weblate. 2019-06-27 19:14:45 +00:00
Nathan Follens e7a05f0b41 Translated using Weblate (West Flemish)
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/vls/
2019-06-27 19:14:45 +00:00
Szimszon abe37e5fa6 Translated using Weblate (Hungarian)
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/hu/
2019-06-27 19:14:44 +00:00
Nathan Follens 5db0192415 Translated using Weblate (Dutch)
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/nl/
2019-06-27 19:14:44 +00:00
J. A. Durieux 85159d8f7d Translated using Weblate (Dutch)
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/nl/
2019-06-27 19:14:43 +00:00
Michael Telatynski ff8ddd6073
Merge pull request #3153 from matrix-org/t3chguy/devtools_styling
Fix weird scrollbar when devtools is in a narrow browser
2019-06-27 20:14:39 +01:00
Michael Telatynski e8db379fed rename helper method
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 19:41:29 +01:00
Michael Telatynski cebb2b773f Add /myavatar command
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 19:38:12 +01:00
Travis Ralston 7e8eda33fc Flexboxify generic error page 2019-06-27 12:10:58 -06:00
Michael Telatynski 804a0c8507 Fix weird scrollbar when devtools is in a narrow browser
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 18:56:22 +01:00
Travis Ralston 8bb860e870 Use fewer functions for typing in the composer 2019-06-27 10:37:33 -06:00
Travis Ralston 17ed62de7d Move MessageComposer typing timeout to TypingStore 2019-06-27 10:35:44 -06:00
Travis Ralston eb1f911d15 Use a Timer 2019-06-27 10:29:27 -06:00
Travis Ralston 67ecf9db62 expireMs -> expireTs 2019-06-27 09:44:13 -06:00
Weblate b47e3016eb Merge branch 'origin/develop' into Weblate. 2019-06-27 15:24:30 +00:00
Szimszon 70eaf71920 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1660 of 1660 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-06-27 15:24:30 +00:00
Travis Ralston 7f2ab39609
Merge pull request #3142 from matrix-org/travis/preview-loading
Show a loading state for slow peeks
2019-06-27 09:24:25 -06:00
Weblate 85ffca1ee3 Merge branch 'origin/develop' into Weblate. 2019-06-27 13:16:41 +00:00
Bruno Windels dff6ca85f2
Merge pull request #3146 from matrix-org/bwindels/dontfailonmissingwebcam
Don't show error dialog when user has no webcam
2019-06-27 13:16:36 +00:00
Weblate 753d6b40ca Merge branch 'origin/develop' into Weblate. 2019-06-27 13:16:14 +00:00
pebles c5c3e465c6 Translated using Weblate (Spanish)
Currently translated at 77.9% (1296 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2019-06-27 13:16:14 +00:00
Bruno Windels f18c389f2d
Merge pull request #3151 from matrix-org/bwindels/e2e-edit-history
Make edit history work in encrypted rooms.
2019-06-27 13:16:10 +00:00
J. Ryan Stinnett 59b4a3398d Limit reactions row on initial display
This limits the reactions row below messages to initially show at most 8 keys.
For those messages with more than that, a "Show all" option appears to reveal
all the keys.

Fixes https://github.com/vector-im/riot-web/issues/9570
2019-06-27 13:17:23 +01:00
Bruno Windels 25aa65ac0d remove leftover logging 2019-06-27 14:13:37 +02:00
Bruno Windels c0e9edcf40 get decrypted content if needed 2019-06-27 12:33:29 +02:00
Weblate 2fcabd5441 Merge branch 'origin/develop' into Weblate. 2019-06-27 10:21:53 +00:00
J. Ryan Stinnett a424c3de5c
Merge pull request #3147 from matrix-org/jryans/tooltip-flip-tweaks
Change interactive tooltip to only flip when required
2019-06-27 11:21:49 +01:00
Weblate 70788c57d6 Merge branch 'origin/develop' into Weblate. 2019-06-27 10:19:58 +00:00
random f7ff5ab60e Translated using Weblate (Italian)
Currently translated at 100.0% (1663 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-06-27 10:19:58 +00:00
Kévin C bb7fe6f965 Translated using Weblate (French)
Currently translated at 100.0% (1663 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-06-27 10:19:57 +00:00
Benjamin 6ab26abc9f Translated using Weblate (Esperanto)
Currently translated at 88.3% (1468 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-06-27 10:19:57 +00:00
Jeff Huang aef0c6a84b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1663 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-06-27 10:19:57 +00:00
Slavi Pantaleev 00cbcb41bc Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1663 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-06-27 10:19:56 +00:00
Besnik Bleta 565636350f Translated using Weblate (Albanian)
Currently translated at 99.6% (1656 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-06-27 10:19:55 +00:00
J. Ryan Stinnett e287362a8b Reaction buttons should use pointer cursor 2019-06-27 11:19:36 +01:00
Tirifto f2fbbcd802 Translated using Weblate (Esperanto)
Currently translated at 88.2% (1466 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-06-27 05:04:50 +00:00
Benjamin 12bc5d3555 Translated using Weblate (Esperanto)
Currently translated at 88.2% (1466 of 1663 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-06-27 05:04:50 +00:00
Travis Ralston 1546cb2923 You win this time, linter. 2019-06-26 22:40:08 -06:00
Travis Ralston cd089a3f95 Track the user's own typing state external to the composer
Fixes https://github.com/vector-im/riot-web/issues/9986

There's a few reasons for pushing this out to its own place:
* In future, we might want to move WhoIsTyping here.
* We have multiple composers now, and although they don't send typing notifications, they could (see https://github.com/vector-im/riot-web/issues/10188)
* In future we may have status for where/what the user is typing (https://github.com/matrix-org/matrix-doc/issues/437)
* The composer is complicated enough - it doesn't need to dedupe typing states too.

Note: This makes use of the principles introduced in https://github.com/vector-im/riot-web/issues/8923 and https://github.com/vector-im/riot-web/issues/9090
2019-06-26 22:36:55 -06:00
Matthew Hodgson 3873dc724a stupid linter >:( 2019-06-26 21:47:55 +01:00
Matthew Hodgson 7fc5d229d6 fix stuff as per review 2019-06-26 21:13:17 +01:00
Michael Telatynski 46a8ec903e Handle null-rejoins only if SettingsStore says so
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-26 20:22:01 +01:00
Matthew Hodgson 3d11eb430b oops, remove old code 2019-06-26 18:38:46 +01:00
Matthew Hodgson debcafd760 if on trackpad, don't mess with horizontal scrolling.
trackpad heuristic is 'if 15 minutes of no horizontal scrollwheel events, assume user may have switched to mousewheel'
2019-06-26 18:38:03 +01:00