OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,231 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

8572 Commits (a50f6094cce296f8a4017a1e45116f2b95a79cae)

Author SHA1 Message Date
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
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