Commit Graph

8976 Commits (42b77bfc48ceafda079631706a4c300553971bc1)

Author SHA1 Message Date
Weblate 42b77bfc48 Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 10:17:20 +00:00
Bruno Windels e61317284b
Merge pull request #2031 from matrix-org/t3chguy/notif_nag_bar
move nag bar clear statement to any desktop notif toggle not just 0->1
2018-07-09 11:17:15 +01:00
Weblate 2847a5355c Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 09:17:14 +00:00
David Baker 1646c3180c
Merge pull request #2041 from matrix-org/t3chguy/improve_devtools_perf
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes
2018-07-09 10:17:05 +01:00
Osoitz 0f1ae2b48d Translated using Weblate (Basque)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-07-08 08:54:54 +00:00
Weblate 51dc8d9528 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 19:28:14 +00:00
Will Hunt 6e1f62d16a
Fix stuff 2018-07-06 20:22:37 +01:00
Weblate 86dc444e37 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 18:17:35 +00:00
Matthew Hodgson aa9208d6b4
Merge pull request #2046 from Half-Shot/hs/show-server-bans
Show m.room.server_acl
2018-07-06 19:17:30 +01:00
Matthew Hodgson 4044185cdd
add space after commas 2018-07-06 19:17:01 +01:00
Will Hunt 83221da7d7 Delint 2018-07-06 16:54:28 +01:00
Will Hunt 9a4075c637 Semicolons 2018-07-06 16:38:04 +01:00
Will Hunt 52b1d946be Remove unused console.log 2018-07-06 16:37:52 +01:00
Will Hunt 1db803ccfc "/n" -> " " 2018-07-06 16:37:40 +01:00
Will Hunt 1ca164f1a9 Change all ban message and move further up 2018-07-06 16:36:44 +01:00
Will Hunt 12ce7839f3 Const things 2018-07-06 16:36:26 +01:00
Will Hunt 8b9fd7ddcb Clean up rules. 2018-07-06 15:31:21 +01:00
Weblate fdd3b966e3 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 10:45:53 +00:00
kR c4d66b6c56 Translated using Weblate (Polish)
Currently translated at 93.6% (1134 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-07-06 10:45:53 +00:00
Bamstam db860441bc Translated using Weblate (German)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-06 10:45:52 +00:00
Will Hunt 526459a9e0 Capitalise 2018-07-06 11:06:31 +01:00
Will Hunt a6cff4a969 Show server bans in the timeline 2018-07-06 11:06:31 +01:00
Luke Barnard 5af8ddcf10 Fix import 2018-07-06 11:00:39 +01:00
Luke Barnard d53c836fd7 Implement aggregation by error type for tracked decryption failures 2018-07-05 13:54:44 +01:00
Kévin C 7f9ef37bca Translated using Weblate (French)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-05 07:50:07 +00:00
Jeff Huang 34d234fa30 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-07-05 03:22:18 +00:00
Szimszon 39103a350a Translated using Weblate (Hungarian)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-04 16:36:02 +00:00
Michael Telatynski dc6b3cb081
showing all is pretty slow, show an additional 50 instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-04 13:07:57 +01:00
Michael Telatynski e5392e2c00
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-04 12:57:22 +01:00
Krombel 4d17dd2800 Translated using Weblate (German)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-04 11:06:49 +00:00
Krombel edfe94383a Translated using Weblate (German)
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-04 10:52:00 +00:00
Michael Telatynski 168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist 2018-07-04 11:21:16 +01:00
Weblate 64048665ad Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 10:11:58 +00:00
Michael Telatynski 6c91952d26
Merge pull request #2039 from akihikodaki/sticker_upstream
Import react as React in src/components/views/messages/MStickerBody.js
2018-07-04 11:11:53 +01:00
Weblate f4db42351a Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 09:29:58 +00:00
Michael Telatynski 5551855133
Merge pull request #2038 from akihikodaki/group_upstream
Import react as React in src/GroupAddressPicker.js
2018-07-04 10:29:53 +01:00
Akihiko Odaki f941c93322 Import react as React in src/components/views/messages/MStickerBody.js
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-07-04 18:28:56 +09:00
Weblate 71b11199e3 Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 08:20:56 +00:00
Andrey 36d3c3952b Translated using Weblate (Russian)
Currently translated at 99.8% (1208 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-07-04 08:20:56 +00:00
RainSlide 537e8da553 Translated using Weblate (Chinese (Simplified))
Currently translated at 94.5% (1144 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-07-04 08:20:55 +00:00
Akihiko Odaki 2ddcb83e8d Import react as React in src/GroupAddressPicker.js
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-07-04 10:57:03 +09:00
David Baker ad35fbf208 Pull out z-index to the sticker picker
As it's not a thing that's necessary for other PersistedElements,
only the sticker picker because it has to sit above the ContextMenu
it sits in.
2018-07-03 18:25:33 +01:00
Paweł Kozioł b69eb8fc88 Translated using Weblate (Polish)
Currently translated at 92.8% (1124 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-07-03 17:15:28 +00:00
Slavi Pantaleev c0aa1f1196 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-07-03 14:35:34 +00:00
David Baker 74f2d0a360 Use inline class field for PropTypes 2018-07-03 14:54:43 +01:00
David Baker 3f88721bc1 Give PersistedElement a key
So there can be more than one on a page
2018-07-03 14:43:27 +01:00
Kévin C 0ad8d5ed79 Translated using Weblate (French)
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-03 11:27:07 +00:00
Szimszon f7b84a412a Translated using Weblate (Hungarian)
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-03 10:19:09 +00:00
Weblate 00db7f84ff Merge remote-tracking branch 'origin/develop' into develop 2018-07-03 09:36:15 +00:00
Michael Telatynski 7225f7372c
Revert " make click to insert nick work on join/parts, /me's etc" 2018-07-03 10:30:08 +01:00