Commit Graph

62531 Commits

Author SHA1 Message Date
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
Weblate 8bc0188c53 Merge remote-tracking branch 'origin/develop' into develop 2018-05-18 11:41:40 +00:00
David Baker 66ca9a355b Merge branch 'master' into develop 2018-05-18 12:41:30 +01:00
David Baker ec62b5f03c v0.15.3 v0.15.3 2018-05-18 12:38:59 +01:00
David Baker 3467ca5230 Prepare changelog for v0.15.3 2018-05-18 12:38:58 +01:00
David Baker d5b21021fb v0.15.3 2018-05-18 12:36:22 +01:00
David Baker 4656d25590 Hide URL options for e2e blob: URL images
These won't work outside of the electron app so there is zero point
in trying to open them in an external browser or offerring to copy
them to the clipboard
2018-05-18 12:24:22 +01:00
David Baker b1f0f33204 Update to electron 2.0.1
It does have a security fix
2018-05-18 12:24:12 +01:00
David Baker d353c13bf1 Comment why we're passing empty objects in 2018-05-18 12:24:02 +01:00
David Baker 8872a6a24a Fix right click menu in electron
Fixes https://github.com/vector-im/riot-web/issues/6762
2018-05-18 12:23:56 +01:00
Weblate 8b0de948d0 Merge remote-tracking branch 'origin/develop' into develop 2018-05-18 11:18:14 +00:00
David Baker 2e7da36af0 Merge pull request #6765 from vector-im/dbkr/electron_hide_nonsensical_menu_options
Hide URL options for e2e blob: URL images
2018-05-18 12:18:09 +01:00
David Baker 38c295427a Hide URL options for e2e blob: URL images
These won't work outside of the electron app so there is zero point
in trying to open them in an external browser or offerring to copy
them to the clipboard
2018-05-18 12:00:55 +01:00
Weblate 2025cc7747 Merge remote-tracking branch 'origin/develop' into develop 2018-05-18 10:55:45 +00:00
David Baker e5fd579935 Merge pull request #6763 from vector-im/dbkr/fix_electron_menus
Fix right click menu in electron
2018-05-18 11:55:41 +01:00
Weblate 3bd97650dc Merge remote-tracking branch 'origin/develop' into develop 2018-05-18 10:47:08 +00:00
David Baker 1e8bb5e852 Merge pull request #6764 from vector-im/dbkr/electron_201
Update to electron 2.0.1
2018-05-18 11:47:02 +01:00
David Baker 6722eedf7a Comment why we're passing empty objects in 2018-05-18 11:42:40 +01:00
Luke Barnard 015093b371 Move inline style to stylesheet 2018-05-18 11:34:41 +01:00
David Baker 53dfdbda08 Update to electron 2.0.1
It does have a security fix
2018-05-18 11:32:59 +01:00
David Baker e857ab762c Fix right click menu in electron
Fixes https://github.com/vector-im/riot-web/issues/6762
2018-05-18 11:30:05 +01:00
Luke Barnard 6699c4faed Spelling/grammar 2018-05-18 11:29:30 +01:00
Simone Salsi 14f5d2a489 Translated using Weblate (Italian)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2018-05-18 10:17:13 +00: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
David Baker 07456ee174 Merge branch 'master' into develop 2018-05-17 17:13:08 +01:00
David Baker b128431128 v0.15.2 v0.15.2 2018-05-17 17:10:17 +01:00
David Baker d606ad99b7 Prepare changelog for v0.15.2 2018-05-17 17:10:17 +01:00
David Baker 3598df0d28 v0.15.2 2018-05-17 17:07:50 +01:00
David Baker b90017ff15 react-sdk v0.12.5 2018-05-17 17:06:24 +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
David Baker 43dbf306b0 Prepare changelog for v0.12.5 2018-05-17 17:04:38 +01:00