Commit Graph

8976 Commits (42b77bfc48ceafda079631706a4c300553971bc1)

Author SHA1 Message Date
Luke Barnard 767e67dc70
Merge pull request #2033 from matrix-org/luke/track-uisis-piwik-specify-event-name
Track an event name when tracking a decryption failure
2018-07-02 10:26:34 +01:00
David Baker 34f6134595
Merge pull request #1974 from matrix-org/t3chguy/warn_self_mute
warn on self-mute
2018-07-02 10:13:49 +01:00
Luke Barnard 0dd3a77432 Track an event name when tracking a decryption failure
Otherwise piwik will not agregate the failures correctly for all views.
2018-07-02 09:45:32 +01:00
Michael Telatynski 0a638cd545
move nag bar clear statement to any desktop notif toggle not just 0->1
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-01 23:48:00 +01:00
Michael Telatynski 1b003ca39f
gen-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:07:35 +01:00
Michael Telatynski 37a8e7f2e2
add setting to throw new RoomSubList hide behaviour behind an opt-in
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:07:28 +01:00
Michael Telatynski ca83f1e8c8
allow RoomSubList to use old behaviour of not hiding even if empty
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:06:33 +01:00
Slavi Pantaleev 12ed25534a Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-06-30 15:38:04 +00:00
Michael Telatynski ea6e1b6f72
Merge branch 'develop' into t3chguy/warn_self_mute 2018-06-29 19:17:43 +01:00
Michael Telatynski 85a0736c78
update wording as per D4ve's feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 19:16:56 +01:00
Michael Telatynski 36ace9dcb9
using map-i18n remap all changed `%(...)s` => `<...>` to keep i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 15:21:44 +01:00
Michael Telatynski 6021c3a634
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev 2018-06-29 14:56:18 +01:00
Michael Telatynski 1d91469104
switch to <ClickableUsername> and use `<a>` over `<span>`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 14:52:25 +01:00
Jeff Huang e93171831c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-06-29 13:14:54 +00:00
Weblate c3766181b5 Merge remote-tracking branch 'origin/develop' into develop 2018-06-29 09:49:19 +00:00
David Baker 80a9bc3f2a
Merge pull request #2029 from matrix-org/luke/fix-connection-lost-message-layout
Fix layout bug introduced by #2025
2018-06-29 10:49:15 +01:00
Weblate 15506ab5e8 Merge remote-tracking branch 'origin/develop' into develop 2018-06-29 09:46:52 +00:00
David Baker b07a2cb09a
Merge pull request #2028 from matrix-org/luke/fix-room-settings-editable-text-resets
Fix room topics/names resetting when UserSetting re-renders
2018-06-29 10:46:48 +01:00
Weblate 9b9f744a44 Merge remote-tracking branch 'origin/develop' into develop 2018-06-29 09:44:24 +00:00
Andrey 1539180cdc Translated using Weblate (Russian)
Currently translated at 99.8% (1206 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-06-29 09:44:24 +00:00
Szimszon fcc9479c1d Translated using Weblate (Hungarian)
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-06-29 08:56:33 +00:00
Luke Barnard ad5f1bf180 Fix layout bug introduced by #2025
Fixes https://github.com/vector-im/riot-web/issues/6958

(https://github.com/matrix-org/matrix-react-sdk/pull/2025)
2018-06-29 09:46:01 +01:00
Luke Barnard 016e9176f6 Fix room topics/names reseting when UserSetting re-renders
This reverts a fix to EditableText introduced in
    https://github.com/matrix-org/matrix-react-sdk/pull/1445
which introduced a bug that causes room name and topic to
reset when UserSettings is rerendered because
    `initialValue != this.value`

This also fixes the same bug originally fixed by #1445:
 >fix entering the same thing twice (which had the bug of not
 >emptying the "new" field)

which, in other words meant that clicking "+" when adding a room
alias would not reset the contents of the bottom-most alias in the
list.

The fix is to increment the `key` of the element, causing a new
instance to be mounted instead of passing new props to the existing
one.
2018-06-28 18:11:52 +01:00
Luke Barnard 3846aef8a1 Alter docs, add comments 2018-06-28 16:06:12 +01:00
Luke Barnard ab990d8cec Increase grace period to allow time for key sharing 2018-06-28 15:07:58 +01:00
Luke Barnard 01dd387970 Track UISIs in bulk
Piwik supports sending an event value, which we can use to indicate
cardinality of UISIs to be tracked instead of tracking them individually.

This means we can track them at a lower frequency of (fairly arbitrary)
60s.
2018-06-28 15:07:27 +01:00
Osoitz fc841d2dc5 Translated using Weblate (Basque)
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-06-28 07:12:38 +00:00
Kévin C 2e892fa399 Translated using Weblate (French)
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-06-27 21:34:59 +00:00
Krombel b5266f0f51 Translated using Weblate (German)
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-06-27 16:07:20 +00:00
Weblate d3e90de328 Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 14:40:25 +00:00
Andrey 239b973df3 Translated using Weblate (Russian)
Currently translated at 99.8% (1205 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-06-27 14:40:24 +00:00
Luke Barnard 66002a4c00 Fix status bar element positioning 2018-06-27 15:19:27 +01:00
Luke Barnard 8be173cae3 Show nicer error when receiving a consent error after sending a message 2018-06-27 15:17:57 +01:00
Weblate 0fe851585f Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 10:37:26 +00:00
Luke Barnard 6345fcb8f2 Fix incorrectly positioned copy button on `<pre>` blocks 2018-06-27 11:31:55 +01:00
Weblate 6fe889fae2 Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:40:22 +00:00
Luke Barnard 4c575bb1ca
Merge pull request #2018 from matrix-org/luke/fix-piwik-path-reporting
Redact pathnames with origin `file://`
2018-06-27 10:40:17 +01:00
Luke Barnard 483edb8211 `pathname` is not constant 2018-06-27 10:31:51 +01:00
Weblate 2c9dd9469e Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:29:26 +00:00
David Baker 6fb57c0c66
Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click
on room sub list badge click goto first relevant room
2018-06-27 10:29:22 +01:00
Weblate fd40e21175 Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:27:38 +00:00
Peter Vágner 7ab229cd4d Translated using Weblate (Slovak)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-27 09:27:38 +00:00
David Baker 2bc1679b97
Merge pull request #2020 from matrix-org/t3chguy/improve_linkifier2
improve linkifier AGAIN
2018-06-27 10:27:30 +01:00
Michael Telatynski a6ab51cd73
change GroupInviteTile from RoomSubList css so new :hover won't apply
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:50:32 +01:00
Michael Telatynski 613e83edb4
on roomsublist invite badge click goto first room/group
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:49:58 +01:00
Michael Telatynski b3341e6664
on click roomsublist notif badge, goto first room with notif
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:49:25 +01:00
Szimszon 0c2240a1f2 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-06-27 08:49:00 +00:00
Osoitz 13d26d0d58 Translated using Weblate (Basque)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-06-27 08:31:41 +00:00
Slavi Pantaleev 2782b2ff9d Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-06-27 05:52:57 +00:00
Michael Telatynski 96163d1402
prevent multiple ports (🔢1234:1234)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:41:46 +01:00
Michael Telatynski 9f3a121abc
optimize linkify-matrix by skipping an intermediary state
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:36:01 +01:00
Michael Telatynski 09b09846cf
allow `:port` specifiers in roomalias,groupid and userid as per spec
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:33:35 +01:00
Peter Vágner 5c7f2cc32f Translated using Weblate (Slovak)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 19:58:27 +00:00
Weblate 12d020909e Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 17:26:34 +00:00
David Baker 67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist
fix historical section
2018-06-26 18:26:29 +01:00
Weblate a1b32d865d Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 17:23:42 +00:00
David Baker fddb576c3a
Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize
Fix RoomSubList headers by re-commiting 1faecfd
2018-06-26 18:23:38 +01:00
Weblate 45c31c0b24 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:46:57 +00:00
Peter Vágner fc593d7359 Translated using Weblate (Slovak)
Currently translated at 99.8% (1204 of 1206 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 16:46:57 +00:00
Michael Telatynski f40802e9d8
Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop
don't fire share dialog when clicking timestamp of event,
2018-06-26 17:46:52 +01:00
Weblate 0724a033a6 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:15:25 +00:00
Peter Vágner d91730d930 Translated using Weblate (Slovak)
Currently translated at 99.7% (1203 of 1206 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 16:15:24 +00:00
David Baker 10e39d5a5d
Merge pull request #2019 from matrix-org/t3chguy/room_settings_leave_room
when the user switches room, close room settings
2018-06-26 17:15:19 +01:00
Michael Telatynski a548c83647
when the user switches room, close room settings
this is especially annoying if they choose Leave Room
which indirectly switches room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 17:07:39 +01:00
Luke Barnard 19e948155c Redact pathnames with origin `file://` 2018-06-26 17:06:45 +01:00
Weblate 12e5eb5f78 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:00:07 +00:00
Peter Vágner cef624d6be Translated using Weblate (Slovak)
Currently translated at 99.8% (1202 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 16:00:06 +00:00
Andrey e1afe2a469 Translated using Weblate (Russian)
Currently translated at 99.6% (1200 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-06-26 16:00:06 +00:00
Marek Lach b1b140d7aa Translated using Weblate (Czech)
Currently translated at 89.8% (1082 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2018-06-26 16:00:05 +00:00
Michael Telatynski 67f803bc5f
don't fire share dialog when clicking timestamp of event,
it was tripping people up and broke search permalinks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 16:59:49 +01:00
Marek Lach 4fb4589ebd Translated using Weblate (Slovak)
Currently translated at 99.7% (1201 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 15:52:27 +00:00
David Baker 0ee8d18f5a More code de-duping 2018-06-26 16:41:44 +01:00
David Baker c780cd05a8 Change argument order of setRoomWidget
So when deleting a widget we can just omit the ones we don't need
2018-06-26 16:33:28 +01:00
David Baker a88297d7a6 More code reuse 2018-06-26 16:27:17 +01:00
David Baker 9539a749e5 More refactoring 2018-06-26 16:03:58 +01:00
David Baker cb89406d3e Indent 2018-06-26 15:42:29 +01:00
David Baker 4a39297e65 PR feedback 2018-06-26 15:41:43 +01:00
Krombel c971b685ad Translated using Weblate (German)
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-06-26 14:35:54 +00:00
David Baker 0a6450507e Bits of PR feedback 2018-06-26 15:21:22 +01:00
David Baker b6f3b2f594 More code re-use 2018-06-26 12:28:59 +01:00
David Baker ca8a4a0c3f Remove unused function 2018-06-26 12:08:33 +01:00
David Baker 6cf11a15e6 Move WidgetUtils to utils dir 2018-06-26 11:59:16 +01:00
David Baker 0f2c47937c Merge the two different widget utils files 2018-06-26 11:52:21 +01:00
David Baker 069080e7ed lint 2018-06-26 09:41:20 +01:00
Michael Telatynski abd37d141e
clear up if statement to make it more readable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:54:38 +01:00
Michael Telatynski f5519c21b9
Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
2018-06-26 07:51:16 +01:00
Michael Telatynski cdf7101222
run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:46:48 +01:00
Michael Telatynski 9b50daa748
give Historical an emptyContent to make it look more consistent
and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:46:33 +01:00
Osoitz e2edf78abb Translated using Weblate (Basque)
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-06-26 04:44:14 +00:00
Jeff Huang f88d26d71c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-06-26 00:20:06 +00:00
Szimszon c23bb39203 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-06-25 17:43:22 +00:00
Kévin C 95728e73bb Translated using Weblate (French)
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-06-25 16:12:33 +00:00
Luke Barnard e292ee942f Fix RoomSubList headers by re-commiting 1faecfd
The original got reverted in ebfafb36 somehow.
2018-06-25 16:37:45 +01:00
David Baker 5c8eeff08a Refactor widgets code
Split logic out of setWidget & re-use it when we add jitsi widgets.

Also fix the detection of existing jitsi widgets and make that use
getRoomWidgets() too.

Add error message when a jitsi call is already in process.
2018-06-25 15:30:04 +01:00
Weblate bc7858193b Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 13:29:14 +00:00
Michael Telatynski de316134a9
Merge branch 'develop' into t3chguy/login_local_error 2018-06-25 13:35:14 +01:00
Weblate 9a2c838ae2 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 12:24:34 +00:00
David Baker 6577671cf0
Merge pull request #2011 from matrix-org/t3chguy/improve_linkifier
Improve Linkifier
2018-06-25 13:24:28 +01:00
Weblate 67e150aea1 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 12:23:09 +00:00
David Baker 317c38ccdf
Merge pull request #2010 from matrix-org/t3chguy/message_context_menu
use enum constants for EventStatus and correct isSent check
2018-06-25 13:23:02 +01:00