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
1895f82d62
Merge pull request #1918 from matrix-org/dbkr/leave_room_warning_space
...
Space between sentences in 'leave room' warning
2018-05-22 09:42:06 +01: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
Akihiko Odaki
35ab573bc5
Update sinon to 5.0.7
2018-05-21 18:44:00 +09: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
Luke Barnard
6699c4faed
Spelling/grammar
2018-05-18 11:29:30 +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
fa7f6c2c4c
v0.12.5
2018-05-17 17:04:39 +01:00