OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,836 Commits
208 Branches
547 Tags
437 MiB
Commit Graph

9836 Commits (3f427a2603a175a4e8f27679eb145b542efa5566)

Author SHA1 Message Date
John Huang 92703d008f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-04-09 13:12:19 +00:00
Luke Barnard db9f50e814
Merge pull request #1829 from matrix-org/luke/fix-inline-source-map-warning 
Bump source-map-loader version to avoid bug /w inline base64 maps
 2018-04-09 14:12:15 +01:00
Luke Barnard ce80b82ab3 Bump source-map-loader version to avoid bug /w inline base64 maps 2018-04-09 13:53:02 +01:00
Michael Telatynski f765db7d16
only clear reply_to_event if there was one to begin with 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-07 12:18:53 +01:00
Weblate f13fd9ca7b Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 16:58:31 +00:00
David Baker 03016b9fc8
Merge pull request #1828 from matrix-org/luke/fix-redact-avatar 
Make stickers/messages continuations of each other
 2018-04-06 17:58:26 +01:00
Luke Barnard 01dd494f50 Make stickers/messages continuations of each other 2018-04-06 17:47:44 +01:00
Luke Barnard 008572afe1 Revert "Handle non-m.room.message event types." 
This reverts commit f8d7ab10fa.
 2018-04-06 16:42:59 +01:00
Weblate 9b11f2deaa Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 14:55:36 +00:00
Luke Barnard 666f419dfd
Merge pull request #1827 from matrix-org/luke/openly_joinable 
Update to match is_openly_joinable API
 2018-04-06 15:55:31 +01:00
Luke Barnard 1e586428ac Update to match is_openly_joinable API 2018-04-06 14:58:10 +01:00
Weblate d1c7187db0 Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 10:24:36 +00:00
Luke Barnard fb9b376cb8
Merge pull request #1826 from matrix-org/luke/fix-leaking-features-to-guests 
Fix to prevent guests from seeing features
 2018-04-06 11:24:32 +01:00
Weblate 40b71a681f Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 10:15:10 +00:00
Andrey e2cc4691f1 Translated using Weblate (Russian) 
Currently translated at 99.3% (1004 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-06 10:15:10 +00:00
John Huang a1b13d22d1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-04-06 10:15:09 +00:00
David Baker 5b8e75231d
Merge pull request #1825 from matrix-org/luke/fix-forgot-password-page 
Fix broken ForgotPassword component
 2018-04-06 11:15:01 +01:00
Kévin C b03e5d32f3 Translated using Weblate (French) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-06 10:04:36 +00:00
Luke Barnard 0306c365cc Fix to prevent guests from seeing features 2018-04-06 11:03:17 +01:00
Luke Barnard adb78c2931 Fix broken ForgotPassword component 2018-04-06 10:27:03 +01:00
Szimszon ad9249b666 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-06 05:20:09 +00:00
John Huang 3cb0bd404c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-04-06 02:15:04 +00:00
Weblate ec02e498cd Merge remote-tracking branch 'origin/develop' into develop 2018-04-05 16:49:39 +00:00
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 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
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 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 6a7d4cb5e2
Merge pull request #1822 from matrix-org/rxl881/stickerPickerStyling 
Sticker picker styling
 2018-04-04 14:59:06 +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
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