Commit graph

16454 commits

Author SHA1 Message Date
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
J. Ryan Stinnett
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
Bruno Windels
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
Weblate
6917310b58 Merge branch 'origin/develop' into Weblate. 2019-06-26 14:38:58 +00:00
Osoitz
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
Bruno Windels
15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history
Edit history dialog
2019-06-26 14:38:53 +00:00
Bruno Windels
c9c84016cb move EditHistoryMessage to messages directory 2019-06-26 16:17:25 +02:00
Bruno Windels
54de0b298b add "Click to see edits." to tooltip 2019-06-26 16:13:32 +02:00
Bruno Windels
a1548285b5 fix copyright header and whitespace 2019-06-26 16:13:15 +02:00
Bruno Windels
c987f4e8d8 remove passthrough ctor 2019-06-26 16:12:57 +02:00
Bruno Windels
d606c966ea use PureComponent 2019-06-26 16:12:44 +02:00
Bruno Windels
929020a139 remove leftover logging 2019-06-26 15:51:55 +02:00
Bruno Windels
39c96b15d8 set state in ctor 2019-06-26 15:51:46 +02:00
Bruno Windels
f4b86ca265 don't bind 2019-06-26 15:51:28 +02:00
Bruno Windels
fa0319f14b apply renamed (token -> from) option 2019-06-26 15:49:24 +02:00
Weblate
516f32a159 Merge branch 'origin/develop' into Weblate. 2019-06-26 13:34:18 +00:00
J. Ryan Stinnett
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
Jonas Schürmann
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
Weblate
6c2966d219 Merge branch 'origin/develop' into Weblate. 2019-06-26 13:17:05 +00:00
Bruno Windels
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
Weblate
b3000f5c0c Merge branch 'origin/develop' into Weblate. 2019-06-26 13:14:05 +00:00
Travis Ralston
838ef7fa40
Merge pull request #3141 from matrix-org/travis/fix-guest-experience
Supply oobData to RoomPreviewBar
2019-06-26 07:14:00 -06:00
Weblate
f80a4dd0e5 Merge branch 'origin/develop' into Weblate. 2019-06-26 13:13:23 +00:00
Travis Ralston
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
Weblate
554d9cf711 Merge branch 'origin/develop' into Weblate. 2019-06-26 13:12:45 +00:00
Besnik Bleta
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
Travis Ralston
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
Bruno Windels
2e3a6b3c0b set 50% transparent accent color as editor focus border 2019-06-26 14:40:33 +02:00
Bruno Windels
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
Bruno Windels
498db2597d show hand on hovering (edited) marker 2019-06-26 12:15:13 +02:00
Bruno Windels
ddae4de7bd cleanup: RoomDirectory doesn't use gemini anymore 2019-06-26 11:59:56 +02:00
Bruno Windels
fe3be39fe7 don't hide timestamps 2019-06-26 11:59:56 +02:00
Bruno Windels
fffdfde8ba center dialog title 2019-06-26 11:59:56 +02:00
Bruno Windels
ee03a0f31d recycle EventTile css to make history items look mostly similar 2019-06-26 11:59:56 +02:00
Bruno Windels
8c9a6ddf96 support edits pagination in a ScrollPanel 2019-06-26 11:59:56 +02:00
Bruno Windels
0fe28cba43 support emotes in edit history 2019-06-26 11:59:56 +02:00
Bruno Windels
beb003b2d6 some preliminary styling 2019-06-26 11:59:56 +02:00
Bruno Windels
e7fc84d5da render history items in own component
including:
- respect 12/24 hour setting
- pillify
2019-06-26 11:59:56 +02:00
Bruno Windels
c9aa7efe54 don't require EventTile for default timestamp style 2019-06-26 11:59:56 +02:00
Bruno Windels
19b4699bc2 WIP for showing pills in edit history 2019-06-26 11:59:56 +02:00
Bruno Windels
e54881aa24 WIP 2019-06-26 11:59:56 +02:00
Bruno Windels
8b5f07e63d open edit dialog on clicking (edited) 2019-06-26 11:59:56 +02:00
Bruno Windels
ef71e6fd4f very basic & hackish edit history dialog 2019-06-26 11:59:56 +02:00
Weblate
782288e1e2 Merge branch 'origin/develop' into Weblate. 2019-06-26 08:53:56 +00:00
Le Dang Trung
e5dcec09f9 Translated using Weblate (Vietnamese)
Currently translated at 10.4% (173 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vi/
2019-06-26 08:53:55 +00:00
progserega
436cc71659 Translated using Weblate (Russian)
Currently translated at 99.2% (1645 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-06-26 08:53:49 +00:00