c0e9edcf40
get decrypted content if needed
2019-06-27 12:33:29 +02:00
2fcabd5441
Merge branch 'origin/develop' into Weblate.
2019-06-27 10:21:53 +00:00
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
70788c57d6
Merge branch 'origin/develop' into Weblate.
2019-06-27 10:19:58 +00:00
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
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
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
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
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
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
e287362a8b
Reaction buttons should use pointer cursor
2019-06-27 11:19:36 +01:00
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
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
1546cb2923
You win this time, linter.
2019-06-26 22:40:08 -06:00
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
3873dc724a
stupid linter >:(
2019-06-26 21:47:55 +01:00
7fc5d229d6
fix stuff as per review
2019-06-26 21:13:17 +01:00
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
3d11eb430b
oops, remove old code
2019-06-26 18:38:46 +01:00
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
e8fba4f770
Change interactive tooltip to only flip when required
...
This changes the interactive tooltip to only flip around when the tooltip
content would be near the window edge.
Fixes https://github.com/vector-im/riot-web/issues/10176
2019-06-26 18:24:34 +01:00
f6e0cd9a03
don't show error dialog when user has no webcam
...
instead, retry with just audio.
Also when mounted, check if the user has given enough permissions
to return non-empty labels for the devices, something both ff & chrome
do if you haven't going through the permissions popup yet. If not,
show the permissions button.
2019-06-26 18:54:15 +02:00
6917310b58
Merge branch 'origin/develop' into Weblate.
2019-06-26 14:38:58 +00:00
9f775408fa
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-26 14:38:58 +00:00
15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history
...
Edit history dialog
2019-06-26 14:38:53 +00:00
c9c84016cb
move EditHistoryMessage to messages directory
2019-06-26 16:17:25 +02:00
54de0b298b
add "Click to see edits." to tooltip
2019-06-26 16:13:32 +02:00
a1548285b5
fix copyright header and whitespace
2019-06-26 16:13:15 +02:00
c987f4e8d8
remove passthrough ctor
2019-06-26 16:12:57 +02:00
d606c966ea
use PureComponent
2019-06-26 16:12:44 +02:00
929020a139
remove leftover logging
2019-06-26 15:51:55 +02:00
39c96b15d8
set state in ctor
2019-06-26 15:51:46 +02:00
f4b86ca265
don't bind
2019-06-26 15:51:28 +02:00
fa0319f14b
apply renamed (token -> from) option
2019-06-26 15:49:24 +02:00
516f32a159
Merge branch 'origin/develop' into Weblate.
2019-06-26 13:34:18 +00:00
31b2592995
Merge pull request #3143 from MazeChaZer/fix-community-scrollbar
...
Fix the scrollbar in the community bar
2019-06-26 14:34:15 +01:00
92c2a119c9
Remove top margin of community panel container
...
This is a simpler fix for the scrollbar problem than changing the definition
for height, which was my previous attempt at solving this problem.
Additionally, the top and bottom margins are now consistent.
Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
2019-06-26 15:27:52 +02:00
6c2966d219
Merge branch 'origin/develop' into Weblate.
2019-06-26 13:17:05 +00:00
8359094847
Merge pull request #3145 from matrix-org/bwindels/edit-focus-border
...
Add focus border to edit composer
2019-06-26 13:16:59 +00:00
b3000f5c0c
Merge branch 'origin/develop' into Weblate.
2019-06-26 13:14:05 +00:00
838ef7fa40
Merge pull request #3141 from matrix-org/travis/fix-guest-experience
...
Supply oobData to RoomPreviewBar
2019-06-26 07:14:00 -06:00
f80a4dd0e5
Merge branch 'origin/develop' into Weblate.
2019-06-26 13:13:23 +00:00
854cb8a57e
Merge pull request #3140 from matrix-org/travis/make-breadcrumbs-less-of-a-jerk
...
Don't boost trackpad users in breadcrumbs
2019-06-26 07:13:19 -06:00
554d9cf711
Merge branch 'origin/develop' into Weblate.
2019-06-26 13:12:45 +00:00
480052ed65
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-26 13:12:45 +00:00
8d85967824
Merge pull request #3139 from matrix-org/travis/upgrades-final
...
Fix room upgrade warning being chopped off and a spelling mistake
2019-06-26 07:12:39 -06:00
2e3a6b3c0b
set 50% transparent accent color as editor focus border
2019-06-26 14:40:33 +02:00
d20b765e27
rename $accent-color-50pct to $accent-color-darker
...
we'll use $accent-color-50pct for 50% transparent accent color
2019-06-26 14:34:26 +02:00
498db2597d
show hand on hovering (edited) marker
2019-06-26 12:15:13 +02:00
ddae4de7bd
cleanup: RoomDirectory doesn't use gemini anymore
2019-06-26 11:59:56 +02:00
Bruno Windels