Commit graph

8682 commits

Author SHA1 Message Date
Szimszon
97f57edba7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1176 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-22 19:13:01 +00:00
Richard Lewis
6df3371c6c Add a "reload widget" button. 2018-05-22 19:14:54 +01:00
Kévin C
c9c3cf55de Translated using Weblate (French)
Currently translated at 100.0% (1176 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-22 17:09:32 +00:00
Luke Barnard
658e88c30f Implement consent/terms and conditions dialog for /_matrix/consent flow 2018-05-22 18:03:56 +01:00
Luke Barnard
538979a4ee Fix MVideoBody spinner 2018-05-22 17:13:45 +01:00
Luke Barnard
c249bee9b5 Grammar 2018-05-22 16:09:54 +01:00
Weblate
f22094dc51 Merge remote-tracking branch 'origin/develop' into develop 2018-05-22 15:07:09 +00:00
Luke Barnard
c47c7b8d98
Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users
improve privileged section users in room settings
2018-05-22 16:07:01 +01:00
Luke Barnard
e602213806 Add concept of priority modal to modal manager 2018-05-22 15:47:05 +01:00
Luke Barnard
31dcd85c08 Add customisable cancel button to QuestionDialog 2018-05-22 15:45:58 +01:00
Luke Barnard
fb5dd4a410 Remove spurious fixupHeight 2018-05-22 10:46:10 +01:00
Luke Barnard
e4f8c09c32 Only include placeholder in DOM when necessary 2018-05-22 10:43:16 +01:00
Weblate
e8e847e799 Merge remote-tracking branch 'origin/develop' into develop 2018-05-22 08:42:12 +00:00
Andrey
38f446a364 Translated using Weblate (Russian)
Currently translated at 99.8% (1173 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-22 08:42:12 +00:00
random
a0bc681052 Translated using Weblate (Italian)
Currently translated at 99.4% (1169 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-05-22 08:42:12 +00:00
David Baker
ae10491f95 Space between sentences in 'leave room' warning 2018-05-22 09:28:41 +01:00
Luke Barnard
e9ae3de00f Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-05-21 17:15:54 +01:00
Luke Barnard
836dc8b0ef Factor out all shared logic between MStickerBody and MImageBody
The benefits of this:
 - One code path for determining spinner/placeholder and it's position
   for loading images/stickers. This includes spinner used in e2e
   decryption of images.
 - Very small definition for MStickerBody, only overriding the minimal
   differences is has from MImageBody.

The disadvantages:
 - Slightly more complicated MImageBody, but hopefully not less
   readable.
2018-05-21 16:59:13 +01:00
Krombel
bd10768c9e Translated using Weblate (German)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-05-18 13:47:19 +00:00
Klaus Marx
b19a9969fe Translated using Weblate (German)
Currently translated at 99.7% (1172 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-05-18 13:44:15 +00:00
Kévin C
f79a8f5a53 Translated using Weblate (French)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-18 12:37:41 +00:00
Luke Barnard
015093b371 Move inline style to stylesheet 2018-05-18 11:34:41 +01:00
Szimszon
23ea8ca917 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-18 09:51:44 +00:00
Weblate
8067b07ee1 Merge remote-tracking branch 'origin/develop' into develop 2018-05-18 09:47:59 +00:00
Szimszon
40e9091724 Translated using Weblate (Hungarian)
Currently translated at 99.7% (1172 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-18 09:47:58 +00:00
David Baker
6d2d7bb287
Merge pull request #1908 from matrix-org/luke/fix-start-chat-error
Specify valid address types to "Start a chat" dialog
2018-05-18 10:47:54 +01:00
Weblate
d653469ac5 Merge remote-tracking branch 'origin/develop' into develop 2018-05-18 09:44:58 +00:00
David Baker
5952de772b
Merge pull request #1906 from matrix-org/luke/opt-in-analytics
Implement opt-in analytics with cookie bar
2018-05-18 10:44:53 +01:00
Weblate
eb99fa13b9 Merge remote-tracking branch 'origin/develop' into develop 2018-05-18 09:42:24 +00:00
Andrey
6b559aaf40 Translated using Weblate (Russian)
Currently translated at 99.8% (1170 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-18 09:42:24 +00:00
Luke Barnard
3e79c3e8a5
Merge pull request #1910 from MazeChaZer/fix-emoji-line-break-bug
Fix vector-im/riot-web#6523 Emoji rendering destroys paragraphs
2018-05-18 10:42:20 +01:00
Luke Barnard
7e7e2a7473 Add more comments to explain thumbnail sizing 2018-05-18 10:27:22 +01:00
Luke Barnard
d11442de04 Adjust comment 2018-05-18 10:15:59 +01:00
Luke Barnard
b41b9aa4fa Remove fixupHeight call from MStickerBody 2018-05-18 09:58:52 +01:00
Luke Barnard
bbcf2fea53 Fix e2e image thumbnail spinner containing box correct size 2018-05-18 09:47:49 +01:00
Jonas Schürmann
4a9f4ba5eb Fix vector-im/riot-web#6523 Emoji rendering destroys paragraphs
This regression was probably introduced in
4f4441fb07 and is caused by the fact that
the variable `isHtml` conflates two different meanings:

- The event contains an HTML message
- The event message is displayed using HTML

This is an important difference. Plain text messages that contain
emojies are rendered with an HTML string and thus have to be sanitized
etc. But they must not use the MarkDown CSS styles for HTML messages.

The MarkDown CSS styles include `whitespace: normal` because HTML events
use `<br/>`-tags for line breaks. Plain text messages with emojies
obviously don't use `<br/>`-tags, so these styles must not be applied.

Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
2018-05-17 20:12:51 +02:00
Luke Barnard
b28ed6075b Implement slightly hacky CSS soln. to thumbnail sizing
As the slightly nicer alternative to fixupHeight being applied once
we actually have a timelineWidth.

The niceness comes from not needing timelineWidth, which means we can
implement at render time with CSS. (Despite still calculating aspect
ratios when we render.)
2018-05-17 18:15:34 +01:00
Weblate
04996887ec Merge remote-tracking branch 'origin/develop' into develop 2018-05-17 16:05:41 +00:00
strix aluco
d9236a5848 Translated using Weblate (Ukrainian)
Currently translated at 23.1% (271 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2018-05-17 16:05:41 +00:00
random
123c4d0f6c Translated using Weblate (Italian)
Currently translated at 99.1% (1162 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-05-17 16:05:40 +00:00
David Baker
a7006307bf Call afterComponentDidMount() after componentDidMount 2018-05-17 16:50:16 +01:00
David Baker
e53497421e Fix image size jumping regression
Fixes https://github.com/vector-im/riot-web/issues/6654
2018-05-17 16:47:17 +01:00
Luke Barnard
fb79c57ec6 Specify valid address types to "Start a chat" dialog
fixes https://github.com/vector-im/riot-web/issues/5459
2018-05-16 18:57:53 +01:00
Luke Barnard
0bda607bb2 Only show cookie bar if analytics configured 2018-05-16 15:53:43 +01:00
Luke Barnard
d15051a635 Add policyLink configuration to piwik
Also:
 - Make CookieBar ES6 class
 - Alter phrasing on CookieBar
 - Conditionaly display longer "...(See our ++cookie and privacy
   policies++)." if policy link is configured.
2018-05-16 15:49:23 +01:00
Luke Barnard
4e6594d64b Allow arbitrary hrefs for cookie/privacy links 2018-05-16 15:20:38 +01:00
Luke Barnard
d01e738839 Fix UserSettings for new analyticsOptIn 2018-05-16 15:20:38 +01:00
Luke Barnard
aa4bbbc3db Remove cookie bar setting from UserSettings 2018-05-16 15:20:38 +01:00
Luke Barnard
ac1cd384e7 Implement opt-in analytics with cookie bar 2018-05-16 15:20:38 +01:00
Kenneth Larsson
c5c3c51cf0 Translated using Weblate (Swedish)
Currently translated at 69.9% (820 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-16 10:53:59 +00:00
Slavi Pantaleev
5b26a56b9a Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1172 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-05-16 09:43:26 +00:00
Osoitz
05c469399d Translated using Weblate (Basque)
Currently translated at 100.0% (1172 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-05-16 08:58:10 +00:00
Weblate
29cf079561 Merge remote-tracking branch 'origin/develop' into develop 2018-05-15 16:40:32 +00:00
David Baker
fadf264a1b Rename uses of function too 2018-05-15 17:34:02 +01:00
David Baker
e4a221e42d More helpful function name 2018-05-15 17:28:55 +01:00
David Baker
bb5ae741bc Wait for deletion of widgets as well addition
We were previously waiting for them to appear which is silly if we
were deleting them.
2018-05-15 17:12:59 +01:00
Weblate
e410b7a5ab Merge remote-tracking branch 'origin/develop' into develop 2018-05-15 15:30:47 +00:00
David Baker
9d5ba25131 oh, sendError does support sending the error 2018-05-15 15:19:28 +01:00
Weblate
9a7c40313f Merge remote-tracking branch 'origin/develop' into develop 2018-05-15 14:18:18 +00:00
Kenneth Larsson
f5c67229a4 Translated using Weblate (Swedish)
Currently translated at 69.0% (811 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-15 14:18:18 +00:00
David Baker
464e093f40 log exception 2018-05-15 15:14:33 +01:00
David Baker
5b781043a5 just use the one if statement 2018-05-15 15:02:24 +01:00
David Baker
7bfe84f8be Catch errors adding widget 2018-05-15 14:53:49 +01:00
David Baker
e9336eab63 lint 2018-05-15 14:18:02 +01:00
David Baker
d0ec467c34 Oops, actually get account data event.
Also ignore any account data events that aren;t widgets.
2018-05-15 14:13:56 +01:00
David Baker
f4d69e26e9 PR feedback 2018-05-15 12:06:23 +01:00
David Baker
142ce4c256 better comment 2018-05-15 11:50:24 +01:00
David Baker
2956c049d6 Wait for echo from server when adding user widgets
As hopefully all explained in comments.

Fixes https://github.com/vector-im/riot-web/issues/6727
2018-05-15 11:41:16 +01:00
Luke Barnard
b016a79d97 Merge branch 'develop' into release-v0.12.4 2018-05-14 17:51:27 +01:00
Luke Barnard
e596924074 Merge branch 'develop' into release-v0.12.4 2018-05-14 17:43:40 +01:00
Weblate
deec515e97 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 16:40:18 +00:00
Richard Lewis
8c3a63a169
Merge pull request #1894 from turt2live/travis/fix-stickerpacks
Correctly identify sticker picker widgets
2018-05-14 17:40:13 +01:00
Luke Barnard
ff0254d346 Fix ContextualMenu imports for TagTile and code block copy button 2018-05-14 17:36:57 +01:00
Weblate
9c4b25817c Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 16:27:14 +00:00
Slavi Pantaleev
4ce6093daf Translated using Weblate (Bulgarian)
Currently translated at 99.1% (1165 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-05-14 16:27:13 +00:00
David Baker
7588d4380c Merge branch 'release-v0.12.4' into develop 2018-05-14 17:27:01 +01:00
Luke Barnard
e0236c3d3e Fix issue with sticker picker rendering off-screen
when the RightPanel is collapsed on a small monitor
and the sticker picker is opened.
2018-05-14 17:12:45 +01:00
Kévin C
0591963cc1 Translated using Weblate (French)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-14 15:46:17 +00:00
Luke Barnard
3761cd4054 When panels are shown/hidden, hide sticker picker 2018-05-14 16:35:12 +01:00
Michael Telatynski
a88cbef331
tidy and switch to lexicographic sorting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-14 16:22:28 +01:00
Michael Telatynski
06e1acdf04
run i18n-gen and i18n-prune
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-14 16:11:42 +01:00
Michael Telatynski
5ef0eece9a
refactor and sort
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-14 16:09:22 +01:00
Weblate
3d17bd63a2 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 13:31:29 +00:00
Luke Barnard
49a3770e92 Merge branch 'release-v0.12.4' into develop 2018-05-14 14:31:18 +01:00
Richard Lewis
dddd1c43cc Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 14:23:26 +01:00
Weblate
5a6d80b6d7 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 13:09:06 +00:00
Richard Lewis
986fb3237d Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 13:56:39 +01:00
David Baker
b6e317647a Fix stickers briefly being 2x the size
fixupHeight was the only thing actually fixing the size of the
sticker image to be the size we want it rather than the pixel size
of the image, and this was only getting run after the image loaded,
causing a flash of 2x image.
2018-05-14 13:41:41 +01:00
Jeff Huang
f384c465fd Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-05-14 11:51:18 +00:00
Weblate
bd91f6cde3 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 11:00:44 +00:00
Richard Lewis
49c1f1b41f
Merge pull request #1891 from turt2live/travis/widget-postmessage-patches
Send required properties when making requests to widgets over postMessage
2018-05-14 12:00:40 +01:00
Luke Barnard
cf8077e605 Set loading: false when iFrame finishes loading 2018-05-14 11:42:38 +01:00
Luke Barnard
6345e474f5 Remove unused conditional 2018-05-14 11:38:17 +01:00
Andrey
cc16961b43 Translated using Weblate (Russian)
Currently translated at 99.8% (1173 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-14 10:22:11 +00:00
Luke Barnard
98c06315cf Update widget state when account data changes 2018-05-14 11:14:49 +01:00
Szimszon
9cc8905443 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-14 09:27:23 +00:00
Sven Thomsen
d5d653e375 Translated using Weblate (German)
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-05-14 09:21:01 +00:00
Weblate
82f222d67e Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 09:18:47 +00:00
RainSlide
cd034d3c2a Translated using Weblate (Chinese (Simplified))
Currently translated at 97.7% (1148 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-05-14 09:18:46 +00:00
Travis Ralston
210fcf0d52 Correctly identify sticker picker widgets
Widgets added to account data have the `type` of "m.widget", meaning we have to look at the `content.type` which will tell us what it is. 

This also fixes a bug where all user widgets become sticker picker widgets under the right conditions.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-13 17:15:35 -06:00
Travis Ralston
98da8b3575 Send the widgetId as part of all toWidget requests
Addresses part of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-12 14:32:12 -06:00
Travis Ralston
1515ca11a8 Add a warning for widget developers when their postMessage is missing a requestId
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-12 14:32:08 -06:00
Travis Ralston
0522ab8fcd Expose the requestId fully in the toWidget postMessage API
This field is flagged as required in the proposal.

Addresses part of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston
2018-05-12 14:31:58 -06:00
Travis Ralston
9e11720191 Add setting to enable widget screenshots (if widgets declare support)
Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-12 14:30:59 -06:00
Weblate
47772470c9 Merge remote-tracking branch 'origin/develop' into develop 2018-05-12 19:23:00 +00:00
Kenneth Larsson
e856e49fff Translated using Weblate (Swedish)
Currently translated at 64.0% (752 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-12 19:23:00 +00:00
Matthew Hodgson
f8fd90c559
Merge pull request #1889 from matrix-org/t3chguy/replies-html-tag
T3chguy/replies html tag
2018-05-12 20:22:54 +01:00
Michael Telatynski
dbbcabfed8
switch from asymmetrical fallback form to a cleaner one mx-reply
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-12 15:58:25 +01:00
Luke Barnard
9c5c5e282b Send visibility only when changed, and messaging is available 2018-05-11 18:20:23 +01:00
Luke Barnard
a419056040 Delinting 2018-05-11 18:20:14 +01:00
Luke Barnard
06919e22d6 When stickerpicker made visible, send visibility over postMessage 2018-05-11 18:20:00 +01:00
Luke Barnard
bd0301c666 Add API to send visibiliy actions to widgets 2018-05-11 18:17:55 +01:00
Luke Barnard
42c59b5923 Make AppTile in Stickerpicker persistent using PersistedElement 2018-05-11 18:17:48 +01:00
Luke Barnard
2d2b529f80 Use new ContextualMenu component in Stickerpicker 2018-05-11 18:17:35 +01:00
Luke Barnard
9ec2570eab Export ContextualMenu component, with added hasBackground property
, which is only enabled when `createMenu` is used.
2018-05-11 18:17:27 +01:00
Luke Barnard
d503c86576 Factor out ContextualMenu component 2018-05-11 18:17:19 +01:00
Weblate
125082a76d Merge remote-tracking branch 'origin/develop' into develop 2018-05-11 17:13:03 +00:00
Luke Barnard
eabcbb349c
Merge pull request #1888 from matrix-org/luke/instant-sticker-picker
Instant Sticker Picker
2018-05-11 18:12:57 +01:00
Luke Barnard
06898394eb Send visibility only when changed, and messaging is available 2018-05-11 18:06:58 +01:00
Luke Barnard
1f2f3474ed Delinting 2018-05-11 17:28:12 +01:00
Luke Barnard
8b049b2182 When stickerpicker made visible, send visibility over postMessage 2018-05-11 16:51:03 +01:00
Luke Barnard
4b6378a80d Add API to send visibiliy actions to widgets 2018-05-11 16:22:54 +01:00
Luke Barnard
746eeee33c Make AppTile in Stickerpicker persistent using PersistedElement 2018-05-11 15:07:51 +01:00
Luke Barnard
2dc51c516c Use new ContextualMenu component in Stickerpicker 2018-05-11 14:47:57 +01:00
Xose M
f6a2e8d52c Translated using Weblate (Galician)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-05-11 10:43:25 +00:00
Weblate
3f427a2603 Merge remote-tracking branch 'origin/develop' into develop 2018-05-10 17:12:49 +00:00
Sotiris Papatheodorou
1f23809c99 Translated using Weblate (Greek)
Currently translated at 66.5% (781 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2018-05-10 17:12:48 +00:00
Richard Lewis
5cb892bf3c Allow use of either 'data' or 'widgetData' fields for the time being. 2018-05-10 18:06:00 +01:00
Luke Barnard
2c2eda1f00 Export ContextualMenu component, with added hasBackground property
, which is only enabled when `createMenu` is used.
2018-05-10 17:51:49 +01:00
Richard Lewis
cbf52e00d2 Update widget 'widgetData' key to 'data' to match spec. 2018-05-10 16:43:10 +01:00
Luke Barnard
9046769132 Factor out ContextualMenu component 2018-05-10 16:02:25 +01:00
Weblate
a615616ed4 Merge remote-tracking branch 'origin/develop' into develop 2018-05-10 08:18:31 +00:00
Richard Lewis
e5c0b21a28
Merge pull request #1886 from matrix-org/rxl881/widgetFixes
Fix 'state_key' field name.
2018-05-10 09:18:26 +01:00
Luke Barnard
770e2d400e Improve appearance of short-lived app loading spinner
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
2018-05-09 17:28:41 +01:00
Luke Barnard
0a326dc6a0 Take feature_sticker_messagse out of labs 2018-05-09 17:28:29 +01:00
Luke Barnard
97b9316ec7 Fix issue incorrect positioning with widget loading indicator
by making sure to apply the correct CSS class to the parent
2018-05-09 17:28:18 +01:00
Weblate
bd2cf3bca8 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 16:12:19 +00:00
Richard Lewis
44ea11d386 Fix 'state_key' field name. 2018-05-09 16:55:49 +01:00
Luke Barnard
0c1846630c Improve appearance of short-lived app loading spinner
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
2018-05-09 16:54:01 +01:00
Weblate
fe121d0952 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 15:52:26 +00:00
Luke Barnard
7d0406b430
Merge pull request #1883 from matrix-org/luke/cement-sticker-messages
Take feature_sticker_messagse out of labs
2018-05-09 16:52:20 +01:00
Weblate
60d85d3a44 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 15:52:16 +00:00
Luke Barnard
bcf003757c
Merge pull request #1884 from matrix-org/luke/fix-glitchy-widget-spinner
Fix issue incorrect positioning with widget loading indicator
2018-05-09 16:52:11 +01:00
Luke Barnard
59cbaf67bb Fix issue incorrect positioning with widget loading indicator
by making sure to apply the correct CSS class to the parent
2018-05-09 15:48:53 +01:00
Weblate
147459d338 Merge remote-tracking branch 'origin/develop' into develop 2018-05-09 14:20:44 +00:00
Kenneth Larsson
cf77c9ea05 Translated using Weblate (Swedish)
Currently translated at 58.0% (682 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-09 14:20:43 +00:00
Luke Barnard
e10e659457 Take feature_sticker_messagse out of labs 2018-05-09 14:59:35 +01:00
Kenneth Larsson
76f1978721 Translated using Weblate (Swedish)
Currently translated at 57.4% (674 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-09 12:32:23 +00:00
Richard Lewis
9ef0813da4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetPermissions 2018-05-09 12:03:47 +01:00
Kenneth Larsson
6fdd952510 Translated using Weblate (Swedish)
Currently translated at 55.4% (651 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-09 10:50:47 +00:00
Andrey
edc70c9f11 Translated using Weblate (Russian)
Currently translated at 99.7% (1171 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-09 10:50:47 +00:00
Sven Thomsen
8bddbea236 Translated using Weblate (German)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-05-09 10:50:47 +00:00
Richard Lewis
8e1ba6d139 Always allow users to edit their user widgets. 2018-05-08 22:44:49 +01:00
Richard Lewis
b5320444a9 Fix current user and creator user ID properties. 2018-05-08 22:05:53 +01:00
Krombel
8d2b5de4ff Translated using Weblate (German)
Currently translated at 99.9% (1173 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-05-08 20:47:27 +00:00
Weblate
03c6d424bd Merge remote-tracking branch 'origin/develop' into develop 2018-05-08 13:16:06 +00:00
Peter Vágner
61343e8a70 Translated using Weblate (Slovak)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-05-08 13:16:05 +00:00
Luke Barnard
337af1643f
Merge pull request #1878 from matrix-org/t3chguy/m.relates_to
Replies: un-break click-to-mention on SenderProfile for reply&preview
2018-05-08 14:15:59 +01:00
Peter Vágner
def6329b6a Translated using Weblate (Slovak)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-05-08 10:30:36 +00:00
Osoitz
e5021f368b Translated using Weblate (Basque)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-05-08 09:26:45 +00:00
Weblate
cd45f400a8 Merge remote-tracking branch 'origin/develop' into develop 2018-05-08 08:50:18 +00:00
strix aluco
f76191b0a2 Translated using Weblate (Ukrainian)
Currently translated at 22.5% (265 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2018-05-08 08:50:18 +00:00
Szimszon
961dc11a70 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-08 08:50:17 +00:00
RainSlide
03c7b7ef65 Translated using Weblate (Chinese (Simplified))
Currently translated at 97.7% (1148 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-05-08 08:50:17 +00:00
Matthew Hodgson
afb9e1f5f4 blind fix to the overlapping sticker bug 2018-05-08 09:50:06 +01:00
Michael Telatynski
f0b7fd58b9
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-06 19:28:18 +01:00
Michael Telatynski
f68036a4fb
Replies: un-break click-to-mention on SenderProfile for reply&preview
Fixes #6670

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-06 19:18:41 +01:00
Weblate
8fbc87b6cf Merge remote-tracking branch 'origin/develop' into develop 2018-05-05 23:22:23 +00:00
Matthew Hodgson
8a1bd8da69 tell eslint to ignore viewAvatarOnClick being unused 2018-05-06 00:22:14 +01:00
Weblate
67b29bb02f Merge remote-tracking branch 'origin/develop' into develop 2018-05-05 22:25:58 +00:00
Matthew Hodgson
500f58a963 fix deeply irritating react warning about viewAvatarOnClick on BaseAvatar 2018-05-05 23:25:50 +01:00
Weblate
d421c031fc Merge remote-tracking branch 'origin/develop' into develop 2018-05-05 21:28:18 +00:00
Matthew Hodgson
af5be5c36c appease the fascist linter 2018-05-05 22:28:09 +01:00
Weblate
a2c75e776a Merge remote-tracking branch 'origin/develop' into develop 2018-05-05 21:08:48 +00:00
Matthew Hodgson
14bcfdd5c6 fix NPE 2018-05-05 22:08:37 +01:00
Kenneth Larsson
224e905cae Translated using Weblate (Swedish)
Currently translated at 55.3% (650 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-04 12:58:03 +00:00
Jeff Huang
d4f4ebae14 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-05-04 12:58:02 +00:00
RainSlide
5691b78591 Translated using Weblate (Chinese (Simplified))
Currently translated at 97.7% (1148 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-05-04 12:58:02 +00:00
Jeff Huang
91a68822ed Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-05-03 23:55:07 +00:00
Weblate
3cc21d5701 Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 17:46:25 +00:00
Luke Barnard
b08abd3d8b
Merge pull request #1874 from matrix-org/luke/fix-analytics-crash
Fix crash when browser doesn't report page change measurement
2018-05-03 18:46:20 +01:00
Luke Barnard
3ba51ba695 Null check before accessing _paq 2018-05-03 18:25:00 +01:00
Weblate
5854b82074 Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 17:14:22 +00:00
Michael Telatynski
97d344483e
fix thinko when changing from ClientPeg to context in static method (DUH
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 14:32:13 +01:00
Luke Barnard
22f2d6f292 Fix crash when browser doesn't report page change measurement 2018-05-03 14:08:10 +01:00
Weblate
4059ee5c55 Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 12:22:45 +00:00
Michael Telatynski
4892694e77
use more explicit reply fallback closing tag construct to fix 6657
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:24:10 +01:00
Michael Telatynski
71a12b6bbb
fix getDefaultProps mixup
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:23:41 +01:00
Kévin C
7a74decb1c Translated using Weblate (French)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-02 20:08:49 +00:00
Andrey
621232db4a Translated using Weblate (Russian)
Currently translated at 99.7% (1171 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-02 15:30:41 +00:00
Szimszon
d0141840db Translated using Weblate (Hungarian)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-02 13:06:48 +00:00
Weblate
6504201190 Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 12:38:49 +00:00
Michael Telatynski
4c3f811050
switch RoomView:uploadFile to async to clean up then/catch handling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-02 13:14:47 +01:00
Michael Telatynski
f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-05-02 13:08:38 +01:00
Weblate
023f96e817 Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 09:45:18 +00:00
Марко М. Костић
d87987e853 Translated using Weblate (Serbian)
Currently translated at 100.0% (1169 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-05-02 09:45:18 +00:00
Lakshya A Agrawal
cb1b64a5cd Translated using Weblate (Hindi)
Currently translated at 1.4% (17 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
2018-05-02 09:45:17 +00:00
David Baker
3d478c3c3a
Merge pull request #1867 from matrix-org/luke/fix-group-request-concurrency
Prevent error responses wedging group request concurrency limit
2018-05-02 10:45:12 +01:00
Luke Barnard
2dfb3146b0 Simplify concurrent request error handling 2018-05-02 10:39:15 +01:00
Osoitz
2553ec8d14 Translated using Weblate (Basque)
Currently translated at 100.0% (1169 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-05-02 08:19:49 +00:00
Марко М. Костић
8326d057ec Translated using Weblate (Serbian)
Currently translated at 100.0% (1169 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-05-02 06:47:36 +00:00
Michael Telatynski
ec4ec4717d
clean up EventTile:onWidgetLoad optional/required mess
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:15:12 +01:00
Michael Telatynski
db55f87699
avoid .done and .then anti-pattern
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:14:35 +01:00
Luke Barnard
71c1198d12 Rewrite limitConcurrency to fix error catching
Make sure that we only catch errors that are a result of
calling fn()
2018-05-01 18:01:25 +01:00
Michael Telatynski
11ae0805b0
re-order ReplyThread methods for readability
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 17:42:58 +01:00
Weblate
da677e0fcb Merge remote-tracking branch 'origin/develop' into develop 2018-05-01 16:38:58 +00:00
Luke Barnard
bd703b17e5 Update documentation for GroupStore.registerListener 2018-05-01 16:57:28 +01:00
Luke Barnard
56ec7713bb Refresh group rooms and members when selecting a tag 2018-05-01 16:54:14 +01:00
Luke Barnard
4d8394954c Only create one group store listener in RoomList
Instead of creating several and destroying the reference to the one
created before.
2018-05-01 14:24:58 +01:00
Luke Barnard
da1a5616eb Prevent error responses wedging group request concurrency limit
Fixes https://github.com/vector-im/riot-web/issues/6592
2018-05-01 14:04:13 +01:00
Luke Barnard
e3a07be127 Remove GroupStore logging 2018-05-01 13:14:01 +01:00
Weblate
26a4b1f2bd Merge remote-tracking branch 'origin/develop' into develop 2018-05-01 11:33:12 +00:00
Luke Barnard
6ec9e5f670
Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor
Refactor GroupStores into one global GroupStore
2018-05-01 12:33:06 +01:00
Luke Barnard
25690336c3 Prevent user getting trapped in group settings when an error occurs 2018-05-01 11:52:02 +01:00
Luke Barnard
38d7a5d394 Remove GroupStore listener when unmounting GroupPublicityToggle 2018-05-01 11:50:14 +01:00
Luke Barnard
28e8ce967f Correctly unregister group store listener when unmounting RoomList 2018-05-01 11:38:57 +01:00
Luke Barnard
023daef4b7 Refactor GroupStores into one global GroupStore
Take a step closer to a flux-like architecture for group data, for
the purposes of providing features that require it.

Now the app has a single GroupStore that can be poked to fetch
updates for a particular group.
2018-05-01 11:24:17 +01:00
Szimszon
1ea004fea8 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1169 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-01 08:29:33 +00:00
Michael Telatynski
bbce6eea5b
update comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-30 23:28:55 +01:00
Andrey
556773e1d6 Translated using Weblate (Russian)
Currently translated at 100.0% (1169 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-30 18:17:20 +00:00
Weblate
83be444346 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 18:02:05 +00:00
Kévin C
9e21543384 Translated using Weblate (French)
Currently translated at 100.0% (1169 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-30 18:02:04 +00:00
Matthew Hodgson
5749fbcff9
Merge pull request #1864 from matrix-org/matthew/blob_urls
Switch back to using blob URLs for rendering e2e attachments
2018-04-30 19:01:58 +01:00
Kévin C
b926baf805 Translated using Weblate (French)
Currently translated at 100.0% (1169 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-30 17:28:35 +00:00
Weblate
be1c121e37 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 16:57:26 +00:00
Luke Barnard
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons
Hide inline encryption icons except when hovering over a message
2018-04-30 17:57:22 +01:00
Weblate
c2846a96d7 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 16:56:23 +00:00
Luke Barnard
80c67ba35d
Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog
Fix UX issues with bug report dialog
2018-04-30 17:56:19 +01:00
Eric Newport
e037cf0063 namespace CSS better and fix bug 2018-04-30 12:22:16 -04:00
Weblate
51db7ddd89 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 16:12:45 +00:00
Krombel
79491764fe Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 16:12:44 +00:00
David Baker
5bacf50001
Merge pull request #1865 from matrix-org/matthew/image_errors
fix ugly img errors and correctly render SVG thumbnails
2018-04-30 17:12:40 +01:00
David Baker
025bffb4e9 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog 2018-04-30 16:20:12 +01:00
Bamstam
4d15392593 Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 15:13:29 +00:00
zottel
3b927a6b93 Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 15:12:20 +00:00
Krombel
6ab30e8d88 Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 15:10:58 +00:00
Bamstam
461beb6548 Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 15:09:43 +00:00
Andreas Marek
73b19dccf9 Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 15:08:51 +00:00
Bamstam
8c4a5b15ee Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 15:07:59 +00:00
Krombel
005d3efaf9 Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 15:02:05 +00:00
Bamstam
f1e401bedf Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 15:01:21 +00:00
Krombel
485ea635cf Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 14:57:47 +00:00
Klaus Marx
9f8abc68f7 Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 14:57:09 +00:00
Krombel
60be988025 Translated using Weblate (German)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 14:54:05 +00:00
David Baker
e28a927da9 lint 2018-04-30 14:34:14 +01:00
David Baker
c3420c37fd Indentation 2018-04-30 14:25:42 +01:00
David Baker
54cccab0c7 Factor out clearStorageButton 2018-04-30 14:22:18 +01:00
David Baker
5d46efc3e8 Get docs right on hasCancel 2018-04-30 14:17:21 +01:00
David Baker
dcaacfd204 Merge remote-tracking branch 'origin/develop' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-30 14:06:32 +01:00
David Baker
a9b6db3f2e Lint 2018-04-30 13:41:04 +01:00
David Baker
37cb8abf13 Fix UX issues with bug report dialog
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
   escape to cancel works)
 * Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
   about submitting logs.
 * Continued campaign against 'Click here' links.

Fixes https://github.com/vector-im/riot-web/issues/6622
2018-04-30 13:39:46 +01:00
David Baker
fc136607f1 UI fixes in SessionRestoreErrorDialog
* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data).
2018-04-30 13:39:46 +01:00
Weblate
e936862868 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 12:37:30 +00:00
Andrey
19d9c62404 Translated using Weblate (Russian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-30 12:37:30 +00:00
Goudarz Jafari
603826b662 Translated using Weblate (Persian)
Currently translated at 12.7% (148 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fa/
2018-04-30 12:37:30 +00:00
Michael Telatynski
41af9f7a96
fix changed method name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 08:23:35 +01:00
Matthew Hodgson
db5fc53853 final comment 2018-04-29 04:53:32 +01:00
Matthew Hodgson
8538cc1666 fix regressions introduced by 00b7cc512b 2018-04-29 04:41:30 +01:00
Matthew Hodgson
be523b3edc lint 2018-04-29 04:31:30 +01:00
Matthew Hodgson
551d3ebda0 correctly fix up thumbnail height onload.
fixes https://github.com/vector-im/riot-web/issues/6492, although popping is inevitable in
the current implementation as it only fixes up the thumbnail size once the image has loaded.
2018-04-29 04:28:15 +01:00
Matthew Hodgson
731f1fa7d3 clarify another scrolljump bug 2018-04-29 04:00:02 +01:00
Matthew Hodgson
c254d043c5 fix ugly img errors and correctly render SVG thumbnails
Fixes https://github.com/vector-im/riot-web/issues/6271
Fixes https://github.com/vector-im/riot-web/issues/1341
2018-04-29 03:58:17 +01:00
Matthew Hodgson
9c5407c21f revokeObjectURLs 2018-04-29 03:17:55 +01:00
Matthew Hodgson
bffd5bb891 fix constness 2018-04-29 03:09:17 +01:00
Matthew Hodgson
9701fd32b7 switch back to blob urls for rendering e2e attachments
Based on @walle303's work at https://github.com/matrix-org/matrix-react-sdk/pull/1820
Deliberately reverts 8f778f54fd
Mitigates XSS by whitelisting the mime-types of the attachments so that malicious ones
should not be recognised and executed by the browser.
2018-04-29 03:07:31 +01:00
Michael Telatynski
4021fc049c
re-arrange method order to group statics before instance methods
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:54:54 +01:00
Michael Telatynski
c00c52e537
added another comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:53:35 +01:00
Michael Telatynski
407be88c92
add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:51:39 +01:00
Michael Telatynski
5bb15b1002
simplify logic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:48:44 +01:00
Michael Telatynski
bbf4d3e39f
add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:34:27 +01:00
Peter Vágner
7f74bfde98 Translated using Weblate (Slovak)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-04-28 21:35:42 +00:00
Walter
daf4a57a9c Translated using Weblate (Russian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-28 17:05:14 +00:00
Eric Newport
55566b35a2 convert attribute to class 2018-04-28 12:39:25 -04:00
Andrey
df30471df0 Translated using Weblate (Russian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-28 11:40:18 +00:00
Ivan Shapovalov
819059e7a5 Translated using Weblate (Russian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-28 06:31:00 +00:00
David Baker
873993a7ca Clarify, hopefully 2018-04-27 17:56:33 +01:00
David Baker
d3c368e19f typo 2018-04-27 17:53:11 +01:00
David Baker
0c309c88ad Bluebird has no need for your .done() 2018-04-27 17:52:25 +01:00
David Baker
fed74646b0 Rewrite to use async / await 2018-04-27 17:49:53 +01:00
David Baker
27b18c457e Lint 2018-04-27 15:56:28 +01:00
Ivan Shapovalov
51e5b73ed0 Translated using Weblate (Russian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-27 14:55:19 +00:00
David Baker
dc06c52985 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_error_handling' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-27 15:12:22 +01:00
David Baker
2cc50d35c6 Lint 2018-04-27 15:06:36 +01:00
David Baker
2987e2c681 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_error_handling' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-27 14:21:28 +01:00
David Baker
75ab618c05 Fix variable scopes 2018-04-27 14:20:09 +01:00
RainSlide
8efac6117e Translated using Weblate (Chinese (Simplified))
Currently translated at 97.2% (1133 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-27 12:39:28 +00:00
David Baker
6d9e07580b UI fixes in SessionRestoreErrorDialog
* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data).
2018-04-27 12:38:49 +01:00
Michael Telatynski
2e29a0857b
improve stripPlainReply comment and fix leading NewLine
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 12:12:01 +01:00
Michael Telatynski
68dd57f56e
rename two methods
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:47:18 +01:00
Michael Telatynski
3050553fc2
rename and change getInReplyTo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:44:14 +01:00
Michael Telatynski
ca766df598
call onWidgetLoad on componentDidUpdate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:32:04 +01:00
Michael Telatynski
fdf63fd440
replace concat on comment from review
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:31:04 +01:00
Michael Telatynski
3ba9f560d4
get MatrixClient from context
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:30:47 +01:00
Michael Telatynski
88f48914b4
improve comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:28:17 +01:00
Michael Telatynski
97fecaedc2
improve wording
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:26:42 +01:00
David Baker
0323f8ed0c Wrap exception handling around all of loadSession
The user might (probably does) have a session even if we haven't actually tried
to load it yet, so wrap the whole loadSession code in the error handler we were
using for restoring sessions so we gracefully handle exceptions that happen
before trying to restore sessions too.

Remove the catch in MatrixChat that sent you to the login screen.  This is
never the right way to handle an error condition: we should only display the
login screen if we successfully determined that the user has no session, or
they explicitly chose to blow their sessions away.
2018-04-27 11:25:13 +01:00
Michael Telatynski
4a0a5c6bef
Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to 2018-04-27 11:23:12 +01:00
David Baker
db1401f484 Pass false to onFinished from BaseDialog
Everywhere else, onFinished takes a boolean indicating whether the
dialog was confirmed on cancelled, and had function that were
expecting this variable and getting undefined.
2018-04-27 11:19:14 +01:00
Michael Telatynski
82d117974f
Remove unused import
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:16:29 +01:00
Michael Telatynski
3de679b084
Add comment to HtmlUtils.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:14:50 +01:00
Марко М. Костић
fad20af51f Translated using Weblate (Serbian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-04-26 17:07:00 +00:00
Szimszon
64a682ef47 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-04-26 16:19:27 +00:00
Kévin C
18e6d4aea7 Translated using Weblate (French)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-26 16:17:37 +00:00
David Baker
f70096b8fa Fix error handling on session restore
Fix a number of failures that meant the excellent error handling
we had for failing to restore a session didn't work.

1. .catch on the promise rather than try/catch: it's async
2. Explicit cancel method in SessionRestoreErrorDialog that invokes
   onFinished with `false` because even with the catch fixed, this
   was getting the event as its first arg which is truthy, so
   clicking cancel still deleted your data.
3. DialogButtons: Don't pass onCancel straight into the button event
   handler as this leaks the MouseEvent through as an argument.
   Nothing is using it and it exacerbates failures like this
   because there are surprise arguments.

Fixes https://github.com/vector-im/riot-web/issues/6616
2018-04-26 17:07:58 +01:00
Weblate
ceb7bfc863 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 14:24:23 +00:00
Luke Barnard
5da62c6ad9 Fix bug that caused crash when analytics HS/IS whitelists not specified 2018-04-26 15:18:29 +01:00
Luke Barnard
665e052596 Allow debugging of unhandled login errors 2018-04-26 15:09:17 +01:00
Weblate
1845ce29df Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 13:44:18 +00:00
Luke Barnard
b1af4ec9fd Fix Analytics to not import DEFAULTS, therefore avoiding NPE 2018-04-26 14:30:27 +01:00
Weblate
333d65c032 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 13:05:50 +00:00
Andrey
5c6b8d748a Translated using Weblate (Russian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-26 12:46:45 +00:00
Luke Barnard
d734a9ba6e Null check piwik config before using it
to avoid crashing at login
2018-04-26 13:41:43 +01:00
Weblate
7212831722 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 12:14:54 +00:00
Luke Barnard
452bf0bd09
Merge pull request #1853 from matrix-org/luke/fix-piwik-page-url-reporting
Track actual window location origin and hash
2018-04-26 13:14:49 +01:00
Luke Barnard
053ef0bc0a PPI->PII 2018-04-26 13:05:59 +01:00
Luke Barnard
6b0af81f71 For paths with variables, insert <redacted>
To preserve the analytics for these pages we did previously
2018-04-26 12:22:56 +01:00
Weblate
f51211ac93 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 10:05:44 +00:00
Luke Barnard
ff4909e6ab Merge branch 'develop' into luke/fix-piwik-page-url-reporting 2018-04-26 11:03:55 +01:00
Luke Barnard
0614ef6abe i18n
for new anayltics modal redesign
2018-04-26 11:00:50 +01:00
Luke Barnard
e16c50d4be Explain that full URL is sent to Piwik
Also, redesign analytics modal to be one big table, instead of table +
paragraph.
2018-04-26 10:59:43 +01:00
David Baker
53528f338a Replace document.origin with window.location.origin
document.origin is not a thing on firefox
2018-04-26 10:43:52 +01:00
Weblate
fb9dc8db7d Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 09:13:21 +00:00
David Baker
e26c3f3dc9 Get variable name right in commented usercontent code 2018-04-26 10:12:50 +01:00
Szimszon
c6c58ebc52 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-04-25 19:17:10 +00:00
Luke Barnard
1ff11ca493 Make analytics opt-in
If a Riot is upgraded to include this commit, it will stop reporting
analytics unless specified in config.json. The sample config already
contains the configuration required to continue reporting.
2018-04-25 17:19:57 +01:00
Andrey
841fa8b122 Translated using Weblate (Russian)
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-25 15:40:02 +00:00
Weblate
4cad39bb36 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 15:32:14 +00:00
Richard Lewis
b2d6dd8f6e Optionally hide widget popout button. 2018-04-25 16:28:27 +01:00
Luke Barnard
53016fa16e Report pathname 2018-04-25 16:21:30 +01:00
Val
2a1f9de323 Translated using Weblate (French)
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-25 15:07:33 +00:00
David Baker
81488b27e2
Merge pull request #1851 from matrix-org/rxl881/popoutWidget
Add a button to 'pop out' widgets in to their own tab.
2018-04-25 15:36:07 +01:00
Luke Barnard
3957222da3 Alter hashRegex to expect all handled URLs 2018-04-25 15:06:45 +01:00
Luke Barnard
0f480571e8 Track true origin, do not track unexpected hashes 2018-04-25 15:06:04 +01:00
Richard Lewis
0f0e89d394 Add a button to 'pop out' widgets in to their own tab. 2018-04-25 12:49:30 +01:00
Weblate
18d7be5080 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 10:35:34 +00:00
Andrey
181b109b8a Translated using Weblate (Russian)
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-25 10:35:34 +00:00
David Baker
54040659ec Fix cross-origin renderer code in comment 2018-04-25 11:35:08 +01:00
Weblate
6cb4248d84 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 10:22:53 +00:00
Andrey
6ca0fc2846 Translated using Weblate (Russian)
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-25 10:22:53 +00:00
Scott Rothrock
84f3faaea0 Translated using Weblate (Japanese)
Currently translated at 21.1% (246 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2018-04-25 10:22:53 +00:00
David Baker
7720585cea
Merge pull request #1849 from matrix-org/dbkr/cross_origin_renderer_origin_lock
Support origin lock in cross-origin renderer
2018-04-25 11:22:48 +01:00
Ivan Shapovalov
2421617d3f Translated using Weblate (Russian)
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-25 10:12:25 +00:00
Weblate
eb07a0db79 Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 16:59:35 +00:00
Ivan Shapovalov
81d4265ab6 Translated using Weblate (Russian)
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-24 16:59:35 +00:00
David Baker
4ced12d407
Merge pull request #1850 from matrix-org/dbkr/contian
s/contian/contain/g
2018-04-24 17:59:30 +01:00
David Baker
80837a9199 s/contian/contain/g
Fixes https://github.com/vector-im/riot-web/issues/6565
2018-04-24 17:53:23 +01:00
David Baker
79c3335765 Support origin lock in cross-origin renderer
This adds a URL parameter to the cross-origin renderer that makes
it only accept messages from a given domain. This adds an extra
layer of security to the cross-origin iframe and is backwards
compatible in both directions.
2018-04-24 16:05:14 +01:00
Weblate
efbbd5ec0e Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 14:08:43 +00:00
Ivan Shapovalov
8c008c244b Translated using Weblate (Russian)
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-24 14:08:43 +00:00
RainSlide
c4a1fa531a Translated using Weblate (Chinese (Simplified))
Currently translated at 97.5% (1132 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-24 14:08:42 +00:00