Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker 28bf76b319 Merge pull request #1824 from matrix-org/luke/fix-wrappedRef-warning
Fix warning "Unknown prop `wrappedRef` on <div> tag..."
2018-04-05 17:49:35 +01:00
Luke Barnard e20f223e78 Fix warning "Unknown prop wrappedRef on <div> tag..."
GeminiScrollbar should not receive wrappedRef as a property,
so remove it using object destructuring.
2018-04-05 17:39:25 +01:00
Weblate 992bd15f4a Merge remote-tracking branch 'origin/develop' into develop 2018-04-05 16:17:49 +00:00
Dudi Maroshi c173a67bae Translated using Weblate (Hebrew)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/he/
2018-04-05 16:17:49 +00:00
Luke Barnard 7f78c75246 Merge pull request #6415 from vector-im/luke/feature-group-set-joinable
Add CSS for new group admin radio button
2018-04-05 17:17:44 +01:00
Weblate 3e1ff92bdd Merge remote-tracking branch 'origin/develop' into develop 2018-04-05 16:03:10 +00:00
Dudi Maroshi e73018b333 Translated using Weblate (Hebrew)
Currently translated at 8.6% (87 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/he/
2018-04-05 16:03:10 +00:00
John Huang 027c7aab0e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1009 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-04-05 16:03:09 +00:00
Luke Barnard 59abfa6337 Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable
Add radio button for setting group m.join_policy
2018-04-05 17:03:04 +01:00
David Baker 03747b8287 Update to use new join_policy API 2018-04-05 16:56:35 +01:00
Szimszon 9da5e6692b Translated using Weblate (Hungarian)
Currently translated at 100.0% (1009 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-04-05 15:27:50 +00:00
Dudi Maroshi 853661f3bb Translated using Weblate (Hebrew)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/he/
2018-04-05 15:19:19 +00:00
Weblate d3f0d355b9 Merge remote-tracking branch 'origin/develop' into develop 2018-04-05 13:19:16 +00:00
random d05da36c52 Translated using Weblate (Italian)
Currently translated at 99.5% (1004 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-04-05 13:19:15 +00:00
John Huang ea82393b3e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1009 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-04-05 13:19:14 +00:00
David Baker 6a49197adb Merge pull request #1823 from matrix-org/rxl881/bindingFix
Fix widget grant / revoke permission binding
2018-04-05 14:19:10 +01:00
Richard Lewis a41384a994 Fix function binding. 2018-04-04 23:45:47 +01:00
Weblate e4a7dc6998 Merge remote-tracking branch 'origin/develop' into develop 2018-04-04 13:59:16 +00:00
Walter 7f82cecf6c Translated using Weblate (Ukrainian)
Currently translated at 96.3% (213 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2018-04-04 13:59:16 +00:00
Andrey 0625669352 Translated using Weblate (Russian)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2018-04-04 13:59:15 +00:00
Moo e77e67db70 Translated using Weblate (Lithuanian)
Currently translated at 96.3% (213 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
2018-04-04 13:59:15 +00:00
Yao Wei 9c7feb3150 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2018-04-04 13:59:15 +00:00
Weblate 07e65fbd7f Merge remote-tracking branch 'origin/develop' into develop 2018-04-04 13:59:12 +00:00
Andrey 2e05435a5c Translated using Weblate (Russian)
Currently translated at 99.3% (1002 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-04 13:59:12 +00:00
random 5c422d7e35 Translated using Weblate (Italian)
Currently translated at 99.5% (1004 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-04-04 13:59:11 +00:00
Oriol Gual 410c2ed9d9 Translated using Weblate (Catalan)
Currently translated at 87.2% (880 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-04-04 13:59:11 +00:00
Richard Lewis d95db207bf Merge pull request #6447 from vector-im/rxl881/stickerPickerStyling
Rxl881/sticker picker styling
2018-04-04 14:59:10 +01:00
Richard Lewis 6a7d4cb5e2 Merge pull request #1822 from matrix-org/rxl881/stickerPickerStyling
Sticker picker styling
2018-04-04 14:59:06 +01:00
Richard Lewis 0296919dfb Remove top margin 2018-04-04 13:48:33 +01:00
Richard Lewis da6c2c51fb Remove left and right menu padding 2018-04-04 13:38:48 +01:00
Richard Lewis 369cbdaaf6 Add missing PropType declarations. 2018-04-04 13:38:07 +01:00
Richard Lewis 702380c591 Add props to style (remaining) menu padding attributes. 2018-04-04 13:37:52 +01:00
Michael Telatynski 871fee26f8 run i18n prune and gen
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 11:28:31 +01:00
Michael Telatynski 4081321733 run i18n prune and gen
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 11:19:28 +01:00
Michael Telatynski 9df2f7ddc8 Add warning to Upload Confirm prompt if replying, as can't reply with file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 11:19:13 +01:00
Oriol Gual 0cbc85f81f Translated using Weblate (Catalan)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
2018-04-04 10:10:59 +00:00
Michael Telatynski 1d90835de0 Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/RoomView.js
2018-04-04 11:08:34 +01:00
Michael Telatynski 2854f2b6c8 allow BigEmoji calc to ignore replies fallback if enabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 10:36:48 +01:00
Michael Telatynski 9c2e3e25f0 clear reply_to_event at queue not send time
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 10:34:39 +01:00
Jeff Huang eb9f2261ce Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1009 of 1009 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-04-04 07:01:33 +00:00
Weblate 3d3fd35815 Merge remote-tracking branch 'origin/develop' into develop 2018-04-03 17:37:10 +00:00
Richard Lewis 06f1c504e7 Merge pull request #1672 from matrix-org/rxl881/snapshot
Bi-directional widget postMessaging API (stickerpacks) [WIP]
2018-04-03 18:37:03 +01:00
Slavi Pantaleev 3376366b55 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (999 of 999 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-04-03 17:10:05 +00:00
Weblate 7ea67c03e7 Merge remote-tracking branch 'origin/develop' into develop 2018-04-03 16:52:01 +00:00
Peter Vágner cc15e582fb Translated using Weblate (Slovak)
Currently translated at 100.0% (999 of 999 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-04-03 16:52:01 +00:00
Moo baba8dec43 Translated using Weblate (Lithuanian)
Currently translated at 1.4% (14 of 999 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2018-04-03 16:52:00 +00:00
WSKaCrs 597ccbafad Translated using Weblate (Chinese (Simplified))
Currently translated at 80.1% (801 of 999 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-03 16:52:00 +00:00
Slavi Pantaleev b6435601c5 Translated using Weblate (Bulgarian)
Currently translated at 99.6% (996 of 999 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-04-03 16:52:00 +00:00
Luke Barnard 7273921706 Merge pull request #1821 from matrix-org/luke/fix-room-avatar-null-room
Add null-guard to prevent RoomAvatar NPE when room is null
2018-04-03 17:51:56 +01:00
Luke Barnard 8ca1243ecb Add null-guard to prevent RoomAvatar NPE when room is null
which may have been occuring when peeking into a room that the
client hasn't got a Room object for.

Fixes https://github.com/vector-im/riot-web/issues/6432
2018-04-03 17:35:34 +01:00