Commit graph

13432 commits

Author SHA1 Message Date
J. Ryan Stinnett
527e1e94a4 Update config.json docs location
Part of https://github.com/vector-im/riot-web/pull/10195
2019-06-28 13:44:18 +01: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
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
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
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
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
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
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
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
fe3be39fe7 don't hide timestamps 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
e7fc84d5da render history items in own component
including:
- respect 12/24 hour setting
- pillify
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
あかれぎ
54bfdb0379 Translated using Weblate (Japanese)
Currently translated at 64.5% (1070 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2019-06-26 08:53:49 +00:00
Szimszon
5c39297e6e Translated using Weblate (Hungarian)
Currently translated at 100.0% (1658 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-06-26 08:53:48 +00:00
Tuomas Hietala
3835f3b519 Translated using Weblate (Finnish)
Currently translated at 99.5% (1650 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-06-26 08:53:48 +00:00
Tirifto
0175ff55ce Translated using Weblate (Esperanto)
Currently translated at 87.9% (1458 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-06-26 08:53:47 +00:00
Nathan Follens
ccbfddd191 Translated using Weblate (Dutch)
Currently translated at 100.0% (1658 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-06-26 08:53:44 +00:00
Osoitz
b99e80549b Translated using Weblate (Basque)
Currently translated at 100.0% (1658 of 1658 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2019-06-26 08:53:43 +00:00
J. Ryan Stinnett
b673742e40
Merge pull request #3138 from matrix-org/jryans/quick-reactions-v2
Add quick reaction buttons in tooltip
2019-06-26 09:53:38 +01:00
Travis Ralston
5f242f0285 Supply oobData instead of erroring 2019-06-25 20:57:07 -06:00
Travis Ralston
e5c3e5988b Revert "Don't use oobData if there is none"
This reverts commit a73436e1a1.
2019-06-25 20:56:49 -06:00
Travis Ralston
ca6ddf324f Show a loading state for slow peeks 2019-06-25 20:56:33 -06:00
Travis Ralston
a73436e1a1 Don't use oobData if there is none
Fixes the "buttons don't work" problem on https://github.com/vector-im/riot-web/issues/10114
2019-06-25 20:31:20 -06:00
Travis Ralston
7b00d29ea6 Don't boost trackpad users in breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/10005
2019-06-25 16:08:11 -06:00
Travis Ralston
0701d89bbe Fix upgrade warning being chopped off
The flex box was behaving a bit strange, so we just wrap the content and change `height: 235px` to `max-height: 235px` to get scrollbars.
2019-06-25 15:40:22 -06:00
Travis Ralston
b6242dbad2 Fix spelling 2019-06-25 13:54:48 -06:00
Travis Ralston
9771ce1e04
Merge pull request #3136 from matrix-org/t3chguy/room_directory_autojoin
When joining from room directory, use auto_join
2019-06-25 12:28:41 -06:00
J. Ryan Stinnett
93384f91f5 Show reaction title and shortcode on hover
This shows the title and shortcode for the hovered reaction at the bottom of the
tooltip. If nothing is hovered, a blank space is shown for now, but will
eventually become a link to a full emoji picker in future work.

Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 18:15:03 +01:00
J. Ryan Stinnett
c1821fabd3 Remove toggling reaction dimensions
This removes the v1 Reactions UX which only allowed you to choose only one emoji
out of each pair. It is replaced by a different UX inside a tooltip and without
these constraints.

Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 16:23:31 +01:00
J. Ryan Stinnett
fd2723585f Add quick reaction buttons in tooltip
This adds the set of quick reactions as buttons in a new tooltip accessed via
the react action in the message action bar.

Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 16:23:13 +01:00
J. Ryan Stinnett
91f707341a Tweak handler name to match others 2019-06-25 15:12:30 +01:00
J. Ryan Stinnett
8926992feb Add react button to action bar
This adds a (temporarily non-functional) react button to the action bar.

Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 15:12:30 +01:00
J. Ryan Stinnett
c9dc4cbea3
Merge pull request #3137 from matrix-org/jryans/tooltip-interaction
Improve API and interactivity of new tooltip
2019-06-25 12:26:25 +01:00
J. Ryan Stinnett
67130cb45f Condense isInRect 2019-06-25 11:57:55 +01:00
Michael Telatynski
7391796eab
Only autojoin using the search box enter/join btn 2019-06-25 10:18:47 +01:00
Bruno Windels
a9b5d2095c
Merge pull request #3132 from matrix-org/bwindels/edit-full-feature-flag
feature flag for displaying edits as well
2019-06-24 21:00:58 +00:00
J. Ryan Stinnett
72bfc3b5ea Improve API and interactivity of new tooltip
This reworks the API the `InteractiveTooltip` component so that it's more
natural to use just like other React components. You can now supply the target
component as a child and the tooltip content as a prop.

In addition, this tweaks the interactivity to keep the tooltip on screen until
you move the mouse away from the tooltip and its target.

Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-24 17:32:36 +01:00
Bruno Windels
57dce73cee adjust comment 2019-06-24 16:53:42 +02:00
Bruno Windels
8394e162ad cache setting where it's easy 2019-06-24 16:53:31 +02:00
J. Ryan Stinnett
f366f7d2b3
Merge pull request #3131 from matrix-org/jryans/interactive-tooltip
Add interactive tooltip style
2019-06-24 15:42:02 +01:00
Michael Telatynski
9e7a70b9d5 When joining from room directory, use auto_join
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-23 22:39:04 +01:00
Michael Telatynski
f3641eaa32 Add ability to render null-rejoins in Timeline and MELS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-23 21:41:28 +01:00
Bruno Windels
5fa3f70fb4 feature flag for displaying edits as well 2019-06-21 18:32:15 +02:00
Bruno Windels
1c7af38d83
Merge pull request #3126 from matrix-org/bwindels/caret-refactoring
Editor caret improvements
2019-06-21 15:02:41 +00:00
Bruno Windels
c443dd7a32 clarify why use a BOM marker for the caret nodes 2019-06-21 16:37:29 +02:00
J. Ryan Stinnett
32bf4588dd Center tooltip along top or bottom of target
This adjusts the positioning to work more the way we want:

* Tooltip is position on the top or bottom edge of the target depending on where
  space is available
* Tooltip and chevron are centered

In addition, more bits borrowed from `ContextualMenu` are not needed, so they
have been removed for simplicity.

Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:04:19 +01:00
J. Ryan Stinnett
6dcdad028e Clone ContextualMenu to InteractiveTooltip
As part of reactions and editing work, we're adding a new style of tooltip that
allows interacting with the content of the tooltip.  `ContextualMenu` is closest
out of the things we have today, but it doesn't position in quite the way we
want and it's already quite complex.

To get started, let's first clone that to a new `InteractiveTooltip`.

Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:04:19 +01:00
Bruno Windels
50315557ba
Merge pull request #3130 from matrix-org/bwindels/disable-left-right-autocomplete
Disable left/right arrow navigating completions for now
2019-06-21 12:32:11 +00:00
Bruno Windels
cf0799289d Disable left/right arrow navigating completions for now
as the autocomplete is now very eager to appear, this breaks
caret navigation when typing e.g. anything with a colon.

Ideally, we should make the AC less eager to appear,
but this is a quick fix for now.
2019-06-21 13:48:52 +02:00
Bruno Windels
503d702f47 take list nesting into account for indenting 2019-06-21 11:40:27 +02:00
Bruno Windels
da766b8cba caretNode is a better className 2019-06-21 11:21:38 +02:00
Bruno Windels
c5c987f62e use BOM marker instead of ZWS
that's what others do ...
2019-06-21 11:21:13 +02:00
Michael Telatynski
dea412c906 Add file size to UploadConfirmDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-21 09:03:28 +01:00
Travis Ralston
2a0660c545
Merge pull request #3123 from matrix-org/travis/sas-timeouts
Consider cancelled verifications when mounting IncomingSasDialog
2019-06-20 14:29:20 -06:00
Travis Ralston
0f8dd102bf Move early-cancel stuff to constructor 2019-06-20 14:17:06 -06:00
Travis Ralston
55eec80771
Merge pull request #3124 from matrix-org/travis/sas-ok
Make the verification cancelled dialog say OK instead of Cancel
2019-06-20 07:58:38 -06:00
Bruno Windels
366a4aa308 put zero-width spaces in caret nodes so chrome doesn't ignore them
this requires an update of the editor DOM > text & caret offset logic,
as the ZWS need to be ignored.
2019-06-20 14:44:18 +02:00
random
a03a2d5b0f Translated using Weblate (Italian)
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/it/
2019-06-20 09:56:34 +00:00
Tirifto
a39420f72c Translated using Weblate (Esperanto)
Currently translated at 83.3% (1384 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-06-20 09:56:33 +00:00
Jeff Huang
cbce373697 Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2019-06-20 09:56:33 +00:00
Slavi Pantaleev
1d4089dda7 Translated using Weblate (Bulgarian)
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/bg/
2019-06-20 09:56:32 +00:00
Travis Ralston
bf443149b5 Make the verification cancelled dialog say OK instead of Cancel
Fixes https://github.com/vector-im/riot-web/issues/9306

Includes unexpected cleanup of i18n
2019-06-19 15:07:45 -06:00
Travis Ralston
ff3c52a736 Consider cancelled verifications when mounting IncomingSasDialog
The cancellation can be because of a background problem, or because the user received another verification request from the same user. The cancel function does get called, however due to the speed of our dialog handling the state ends up being lost forever. Instead of trying to de-layer dialogs, this just fastforwards the whole dialog to "cancelled" on mount if required.

Fixes https://github.com/vector-im/riot-web/issues/10118
2019-06-19 14:59:59 -06:00
Weblate
a14505fe4c Merge branch 'origin/develop' into Weblate. 2019-06-19 18:18:41 +00:00
J. Ryan Stinnett
b16a3c53cd
Merge pull request #3122 from matrix-org/jryans/slim-contextualmenu
Remove unused ContextualMenu features
2019-06-19 19:18:37 +01:00
Weblate
c8ae58e06e Merge branch 'origin/develop' into Weblate. 2019-06-19 18:18:19 +00:00
J. Ryan Stinnett
78b0f61efe
Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button
Fix casing of TooltipButton
2019-06-19 19:18:15 +01:00
Bruno Windels
b16bc0178a insert manually, as insertHTML command moves caret inconsistently
across browsers
2019-06-19 17:42:18 +02:00
Bruno Windels
f0271b593d remove special casing for moving caret after newline and pills
not needed anymore with new caret logic and having caret nodes
2019-06-19 17:42:18 +02:00
Bruno Windels
a229641985 use caret nodes in caret positioning code, to move caret out of pills 2019-06-19 17:42:18 +02:00
Bruno Windels
607fc328ed also process first part when processing empty and mergeable parts
this was preventing clearing an emtpy plain part when inserting
a pill-candidate at the beginning of the model, which
prevented a caret node from being inserted before the pill.
2019-06-19 17:42:18 +02:00
Bruno Windels
75fc769742 insert "caret nodes" where pills don't have an adjacent text node
just empty spans, where the caret can be placed.
2019-06-19 17:42:18 +02:00
Tuomas Hietala
dc947ab21c Translated using Weblate (Finnish)
Currently translated at 99.4% (1651 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-06-19 14:53:44 +00:00
J. Ryan Stinnett
dc9282c539 Remove unused ContextualMenu features 2019-06-19 14:47:15 +01:00
Weblate
c7023951dd Merge branch 'origin/develop' into Weblate. 2019-06-19 12:33:23 +00:00
Tuomas Hietala
5c5c4cfbc1 Translated using Weblate (Finnish)
Currently translated at 97.7% (1622 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-06-19 12:33:23 +00:00
David Baker
2247c5953d Fix conflicting PRs 2019-06-19 13:33:06 +01:00
Weblate
1441b68953 Merge branch 'origin/develop' into Weblate. 2019-06-19 12:30:10 +00:00
David Baker
86081c3c8f
Merge pull request #3120 from matrix-org/dbkr/badges_remove_dupe_code
De-duplicate notif badge code
2019-06-19 13:30:04 +01:00
Weblate
9fb8d1d410 Merge branch 'origin/develop' into Weblate. 2019-06-19 12:29:23 +00:00
Kévin C
057f2da327 Translated using Weblate (French)
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/fr/
2019-06-19 12:29:23 +00:00
Tuomas Hietala
a10675a400 Translated using Weblate (Finnish)
Currently translated at 97.5% (1620 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-06-19 12:29:23 +00:00
Besnik Bleta
399f59130e Translated using Weblate (Albanian)
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/sq/
2019-06-19 12:29:22 +00:00
David Baker
6eddce8c32 lint 2019-06-19 12:13:17 +01:00
David Baker
23b29ce3f5 Use the variables we just defined above 2019-06-19 12:12:19 +01:00
David Baker
edd43a2706 Fix favicon/title badge count
This was using a separate function (in MatrixChat) that didn't
take into account whether we were supposed to be hiding the badge
for rooms so would include notifs that were hidden everywhere else.

Also make it a function & put it in RoomNotifs with all its friends.

Fixes https://github.com/vector-im/riot-web/issues/3060
2019-06-19 12:06:32 +01:00
David Baker
0e6f401b62 copyright 2019-06-19 11:48:47 +01:00
David Baker
c57d93702a De-duplicate notif badge code
We had two different places we were deciding whether to show a badge.
Let's just have one.
2019-06-19 11:46:24 +01:00
J. Ryan Stinnett
bb4b5d7798 TooltipButton rename step 2 of 2 2019-06-19 11:32:03 +01:00
J. Ryan Stinnett
ab4c5f0152 TooltipButton rename step 1 of 2 2019-06-19 11:30:37 +01:00