Commit graph

8729 commits

Author SHA1 Message Date
Luke Barnard
ffcba9498e Keep context menus that extend downwards vertically on screen
This fixes https://github.com/vector-im/riot-web/issues/3429 in the case
of RoomList context menus *and* EventTile context menus.

This was mostly stolen from #1903 and it would be good to factor things
out at a later date such that #1903 is replaced with similar logic
within ContextualMenu.
2018-06-12 16:14:24 +01:00
Michael Telatynski
ed779cabc4
add mx_filterFlipColor to mx_MemberInfo_cancel img
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:35:06 +01:00
Michael Telatynski
9dd2184b33
remove unused imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:29:05 +01:00
Michael Telatynski
c820836bcc
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:23:11 +01:00
Weblate
f073178a1f Merge remote-tracking branch 'origin/develop' into develop 2018-06-12 13:27:26 +00:00
strix aluco
848052bb80 Translated using Weblate (Ukrainian)
Currently translated at 23.6% (281 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2018-06-12 13:27:26 +00:00
Silke
9b6c3f44ec Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-06-12 13:27:24 +00:00
David Baker
e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker
13d52065f5 Merge branch 'release-v0.12.7' 2018-06-12 14:23:48 +01:00
Luke Barnard
0934006817 Track decryption success/failure rate with piwik
Emit a piwik event when a decryption occurs in the category "E2E" with
the action "Decryption result" and the name either "failure" or
"success".

NB: This will cause Riot to a lot of networking when decrypting many
events. One HTTP request per decrypted event should be expected.
2018-06-12 14:13:09 +01:00
Michael Telatynski
18546dbe06
QR Code align [m] logo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:33:38 +01:00
Michael Telatynski
f9b3f0f9d1
run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:02 +01:00
Michael Telatynski
d8a1feb501
fix Modal typo and refactor BaseDialog to fix " undefined" className
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:02 +01:00
Michael Telatynski
7f1ce52dd3
link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
Michael Telatynski
64bcf6fd7e
allow ContextualMenu to run without background, for tooltips & fix copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
Michael Telatynski
074051297a
add a ShareDialog for sharing users,groups and rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:21:55 +01:00
Luke Barnard
2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-06-11 14:24:40 +01:00
Weblate
6172196495 Merge remote-tracking branch 'origin/develop' into develop 2018-06-08 16:36:48 +00:00
David Baker
50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone
re-run checkIfAlone if a member change occurred in the active room
2018-06-08 17:36:42 +01:00
Weblate
13675b258d Merge remote-tracking branch 'origin/develop' into develop 2018-06-08 15:48:46 +00:00
David Baker
06321deea9
Merge pull request #1935 from turt2live/travis/persist-pinned-open
Persist pinned message open-ness between room switches
2018-06-08 16:48:40 +01:00
Weblate
2f8814d1c5 Merge remote-tracking branch 'origin/develop' into develop 2018-06-08 15:46:39 +00:00
David Baker
8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics
Pinned message cosmetic improvements
2018-06-08 16:46:33 +01:00
Kenneth Larsson
62978b7a2b Translated using Weblate (Swedish)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-06-08 15:41:18 +00:00
Andrey
b8cc438cb3 Translated using Weblate (Russian)
Currently translated at 99.8% (1188 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-06-08 15:41:18 +00:00
Yao Wei
92c146bcac Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-06-08 15:41:16 +00:00
Michael Telatynski
0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-07 22:01:27 +01:00
Silvano
89b927e278 Translated using Weblate (Italian)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-06-07 15:34:12 +00:00
Travis Ralston
83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open 2018-06-06 09:17:08 -06:00
Walter
03d67988e8 Translated using Weblate (Russian)
Currently translated at 99.8% (1188 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-06-06 14:40:42 +00:00
Weblate
8b33c13517 Merge remote-tracking branch 'origin/develop' into develop 2018-06-06 09:08:58 +00:00
Michael Telatynski
ffec32c7d9
Merge pull request #1943 from akihikodaki/react
Import react as React in src/components/views/elements/DNDTagTile.js
2018-06-06 10:08:52 +01:00
Akihiko Odaki
bf0d03bce3 Import react as React in src/components/views/elements/DNDTagTile.js
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-06-06 17:59:50 +09:00
Weblate
0ca7fb4abc Merge remote-tracking branch 'origin/develop' into develop 2018-06-05 09:37:06 +00:00
David Baker
bea99e07b3
Merge pull request #1940 from matrix-org/luke/exit_settings
Fix click on faded left/right/middle panel -> close settings
2018-06-05 10:36:58 +01:00
Weblate
21e4ee5901 Merge remote-tracking branch 'origin/develop' into develop 2018-06-04 15:40:03 +00:00
Peter Vágner
c792ae1c6f Translated using Weblate (Slovak)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-04 15:40:03 +00:00
Nathan van Beelen
3c204f1eb8 Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-06-04 15:40:01 +00:00
Slavi Pantaleev
195d596c89 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-06-04 15:40:01 +00:00
Osoitz
8f135c650e Translated using Weblate (Basque)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-06-04 15:40:00 +00:00
Luke Barnard
6a317569d7 Add null-guard to support browsers that don't support performance
Like Tor.

Fixes https://github.com/vector-im/riot-web/issues/6781
2018-06-04 09:38:21 +01:00
Kenneth Larsson
f5892b8c61 Translated using Weblate (Swedish)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-06-03 22:34:19 +00:00
Luke Barnard
d30bc2dc6b
Merge pull request #1937 from turt2live/travis/no-guest
Replace "Login as guest" with "Try the app first" on login page
2018-06-01 11:58:26 +01:00
Krombel
7053302f77 Translated using Weblate (German)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-05-31 16:01:40 +00:00
Slavi Pantaleev
56541c7ea7 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-05-29 17:00:56 +00:00
Peter Vágner
577b2564c0 Translated using Weblate (Slovak)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-05-29 15:47:22 +00:00
Luke Barnard
404c071f2a Remove lie from docs 2018-05-29 13:19:56 +01:00
Luke Barnard
da9fe9917b Fix click on faded left/right/middle panel -> close settings
- implement generic dispatch to close user/room/group settings
 - use dispatch to allow clicks on disabled left/right/middle panel to
   close settings

A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
2018-05-29 13:16:39 +01:00
Michael Telatynski
05357b9f8c
improve comment 2018-05-29 12:07:56 +01:00
Weblate
bea30bceae Merge remote-tracking branch 'origin/develop' into develop 2018-05-29 09:11:27 +00:00
Kenneth Larsson
16ebef81f2 Translated using Weblate (Swedish)
Currently translated at 84.4% (1005 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-29 09:11:27 +00:00
Andrey
6467349921 Translated using Weblate (Russian)
Currently translated at 99.6% (1186 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-29 09:11:26 +00:00
random
e968ccb24c Translated using Weblate (Italian)
Currently translated at 99.4% (1183 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-05-29 09:11:26 +00:00
Sveinn í Felli
6f6d28d4ee Translated using Weblate (Icelandic)
Currently translated at 54.2% (645 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
2018-05-29 09:11:26 +00:00
Szimszon
1bd8182b1a Translated using Weblate (Hungarian)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-29 09:11:26 +00:00
Kévin C
f885def748 Translated using Weblate (French)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-29 09:11:26 +00:00
Nathan van Beelen
f23f5614c1 Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-05-29 09:11:25 +00:00
Travis Ralston
254e8c358a Remove unused imports
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-28 11:38:09 -06:00
Sveinn í Felli
4a3c7bc6e4 Translated using Weblate (Icelandic)
Currently translated at 54.2% (645 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
2018-05-28 15:42:49 +00:00
Sveinn í Felli
b6e2815f22 Translated using Weblate (Icelandic)
Currently translated at 43.6% (520 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
2018-05-28 11:43:18 +00:00
Sveinn í Felli
181e5ee7d3 Translated using Weblate (Icelandic)
Currently translated at 42.5% (506 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
2018-05-28 11:27:58 +00:00
Sveinn í Felli
cc241edb4b Added translation using Weblate (Icelandic) 2018-05-28 10:57:39 +00:00
Nathan van Beelen
779579dea4 Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-05-28 07:40:22 +00:00
Jeff Huang
9b86040856 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-05-28 06:58:22 +00:00
Brendan Abolivier
5a9c32a5a7 Translated using Weblate (French)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-28 06:48:21 +00:00
Osoitz
77bfce5f9a Translated using Weblate (Basque)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-05-27 23:47:18 +00:00
Travis Ralston
98613748b6 Move Scalar Widget URL check to WidgetUtils
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 11:12:55 -06:00
Kévin C
47ae19672f Translated using Weblate (French)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-27 16:58:07 +00:00
Travis Ralston
23162c8625 Support third party integration managers in AppPermission
Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL).

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 10:56:50 -06:00
Weblate
ffe9a6f4f9 Merge remote-tracking branch 'origin/develop' into develop 2018-05-27 16:50:27 +00:00
Michael Telatynski
96ec3ab78a
Merge pull request #1934 from turt2live/travis/realtime-pins
Update pinned messages in real time
2018-05-27 17:50:23 +01:00
Weblate
7da4201ed1 Merge remote-tracking branch 'origin/develop' into develop 2018-05-27 16:46:27 +00:00
Kenneth Larsson
65a30572f3 Translated using Weblate (Swedish)
Currently translated at 81.4% (968 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-27 16:46:26 +00:00
Travis Ralston
929da30df8 onEvent -> onStateEvent
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 10:28:47 -06:00
Travis Ralston
ec53b5f5ab Expose at-room power level setting
Fixes https://github.com/vector-im/riot-web/issues/5835

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 21:22:42 -06:00
Travis Ralston
e690bcb6ef Replace "Login as guest" with "Try the app first" on login page
Fixes vector-im/riot-web#5875

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 20:54:19 -06:00
Travis Ralston
752605429c Persist pinned message open-ness between room switches
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 19:58:12 -06:00
Travis Ralston
53396ff38d Show timestamp of pinned messages on hover
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 19:46:11 -06:00
Travis Ralston
085271a864 Update pinned messages in real time
Fixes https://github.com/vector-im/riot-web/issues/5358

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 19:18:35 -06:00
Travis Ralston
033c41a2a8 Align pinned message contents and reduce image size
Fixes https://github.com/vector-im/riot-web/issues/5421

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 18:40:48 -06:00
Travis Ralston
62f4cfe734 Don't affect avatars in pinned message contents
This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 18:21:24 -06:00
Michael Telatynski
689b00c618
run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 17:24:07 +01:00
Michael Telatynski
6636fa32f6
Allow selecting audio output for WebRTC Audio/Video calls
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 17:22:23 +01:00
Michael Telatynski
5147246c17
kill stream when using gUM for permission to device labels to kill camera
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 15:41:25 +01:00
stuve20
296174998b Translated using Weblate (Swedish)
Currently translated at 80.6% (959 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-25 14:35:28 +00:00
Kenneth Larsson
ab12613211 Translated using Weblate (Swedish)
Currently translated at 80.6% (959 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-25 14:21:58 +00:00
stuve20
c116de441a Translated using Weblate (Swedish)
Currently translated at 80.4% (957 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-25 14:19:22 +00:00
stuve20
e1fc7a56ff Translated using Weblate (Swedish)
Currently translated at 80.4% (957 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-25 14:17:01 +00:00
Andrey
806458dfc2 Translated using Weblate (Russian)
Currently translated at 99.6% (1185 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-25 14:17:01 +00:00
Kenneth Larsson
35aeac1b25 Translated using Weblate (Swedish)
Currently translated at 80.4% (957 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-25 14:12:45 +00:00
Peter Vágner
475e2d16d8 Translated using Weblate (Slovak)
Currently translated at 100.0% (1189 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-05-25 09:52:21 +00:00
Szimszon
f13672df39 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1189 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-25 06:50:59 +00:00
Jeff Huang
065e2a9802 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1189 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-05-24 23:50:05 +00:00
Kévin C
eb25b63a35 Translated using Weblate (French)
Currently translated at 100.0% (1189 of 1189 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-24 18:12:29 +00:00
Richard Lewis
b2c26e6984
Merge pull request #1920 from matrix-org/rxl881/refreshWidget
Add a "reload widget" button.
2018-05-24 18:11:22 +01:00
Richard Lewis
6288e9bc08
Merge pull request #1923 from matrix-org/rxl881/devTools
Make devTools styling more consistent and easier to edit event data.
2018-05-24 18:10:59 +01:00
Andrey
33e5f32390 Translated using Weblate (Russian)
Currently translated at 99.6% (1184 of 1188 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-24 17:02:10 +00:00
Weblate
a059be1d93 Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 16:19:11 +00:00
Andrey
24ae804a80 Translated using Weblate (Russian)
Currently translated at 99.8% (1184 of 1186 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-24 16:19:11 +00:00
Luke Barnard
033b110f5f
Merge pull request #1929 from matrix-org/luke/cookie-bar-update
Cookie bar update
2018-05-24 17:19:05 +01:00
Luke Barnard
023c4e2a43
Merge pull request #1928 from matrix-org/dbkr/leave_server_notices_room_message
Message for leaving server notices room
2018-05-24 17:06:41 +01:00
David Baker
168b956b3c homeserver 2018-05-24 17:01:00 +01:00
Luke Barnard
fd8d501732 Update cookie bar wording 2018-05-24 16:58:14 +01:00
David Baker
9d2f223773 Message for leaving server notices room 2018-05-24 16:54:48 +01:00
Luke Barnard
24aeda2e05 Fix bug where usage data link not visible when no cookie policy url 2018-05-24 16:52:04 +01:00
Richard Lewis
9753ee8d82 Better check of jitsi widget message origin. 2018-05-24 16:14:18 +01:00
Richard Lewis
a13d58f6c2 More thorough check of IM URL validity. 2018-05-24 14:58:59 +01:00
Szimszon
f8415548d0 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1186 of 1186 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-24 13:05:53 +00:00
Kévin C
e6aa204484 Translated using Weblate (French)
Currently translated at 100.0% (1186 of 1186 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-24 12:23:27 +00:00
Weblate
b53b3ef4bd Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 12:11:41 +00:00
Kévin C
44a150aaab Translated using Weblate (French)
Currently translated at 99.7% (1182 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-24 12:11:40 +00:00
Luke Barnard
aae89efa01 Add usage data link to cookie bar
this opens the analytics modal
2018-05-24 12:47:27 +01:00
Luke Barnard
6f77b8ae26 Modify showDetailsModal to give examples if analytics is not enabled 2018-05-24 12:46:06 +01:00
Szimszon
cd91974fe8 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-24 11:24:54 +00:00
Weblate
239b86712d Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 11:08:32 +00:00
Luke Barnard
e0a3debb7a prune-i18n 2018-05-24 12:08:22 +01:00
Luke Barnard
8dcf43a88d gen-i18n 2018-05-24 12:08:05 +01:00
Weblate
7674668f1c Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 11:02:15 +00:00
Osoitz
4c38d7a5cd Translated using Weblate (Basque)
Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-05-24 11:02:14 +00:00
Luke Barnard
03c97140a6
Merge pull request #1925 from matrix-org/luke/deactivate-account-reword
Change wording and appearance of Deactivate Account dialog
2018-05-24 12:02:10 +01:00
Luke Barnard
dca1217a45 Change wording and appearance of Deactivate Account dialog 2018-05-24 11:50:45 +01:00
Weblate
6e1e19fe0d Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 10:29:34 +00:00
Matthew Hodgson
3bee23e733
Merge pull request #1924 from matrix-org/matthew/fix-memberlist-ordering
fix membership list ordering when presence is disabled.
2018-05-24 11:29:29 +01:00
Szimszon
2e67eecf3d Translated using Weblate (Hungarian)
Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-24 10:23:46 +00:00
Kévin C
a2946b0796 Translated using Weblate (French)
Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-24 10:09:11 +00:00
Weblate
9a1761ce78 Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 09:49:06 +00:00
stuve20
8907469f06 Translated using Weblate (Swedish)
Currently translated at 81.2% (959 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-24 09:49:06 +00:00
Andrey
03684f2720 Translated using Weblate (Russian)
Currently translated at 99.8% (1178 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-24 09:49:06 +00:00
Osoitz
16987c3ef2 Translated using Weblate (Basque)
Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-05-24 07:02:54 +00:00
Matthew Hodgson
cc79384839 fix https://github.com/vector-im/riot-web/issues/6643 2018-05-24 01:57:22 +01:00
Kenneth Larsson
a0e3ec5307 Translated using Weblate (Swedish)
Currently translated at 81.1% (958 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-23 20:37:06 +00:00
stuve20
3f229d5c55 Translated using Weblate (Swedish)
Currently translated at 81.1% (958 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-23 20:34:43 +00:00
Kenneth Larsson
7b00982a35 Translated using Weblate (Swedish)
Currently translated at 81.1% (957 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-23 20:33:08 +00:00
Richard Lewis
2a9859c7b6 Styling for consistency. 2018-05-23 17:40:15 +01:00
Richard Lewis
9f9cde12ce Make devTools styling more consistent and easier to edit event data. 2018-05-23 17:18:33 +01:00
Luke Barnard
b124989968 Implement erasure option upon deactivation 2018-05-23 16:33:32 +01:00
Luke Barnard
ba3dd0c87a Refactor onOk to async function 2018-05-23 13:35:42 +01:00
Kévin C
94f7d1b224 Translated using Weblate (French)
Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-23 10:42:18 +00:00
Szimszon
b9f597b75f Translated using Weblate (Hungarian)
Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-23 10:16:09 +00:00
Weblate
0baeedec9c Merge remote-tracking branch 'origin/develop' into develop 2018-05-23 10:07:21 +00:00
Kenneth Larsson
a6e7a8106c Translated using Weblate (Swedish)
Currently translated at 78.2% (923 of 1179 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-23 10:07:21 +00:00
Luke Barnard
ef686a966d Add cookie warning to widget warning (AppPermission) 2018-05-23 10:46:32 +01:00
Weblate
c11635172e Merge remote-tracking branch 'origin/develop' into develop 2018-05-23 09:17:19 +00:00
Kenneth Larsson
424dea1d4a Translated using Weblate (Swedish)
Currently translated at 77.2% (909 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-23 09:17:19 +00:00
Luke Barnard
c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog
Terms and Conditions dialog
2018-05-23 10:17:14 +01:00
Jeff Huang
ab5a4f58a2 Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2018-05-22 23:56:28 +00:00
Richard Lewis
975332633b Translation. 2018-05-23 00:26:55 +01:00
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