Commit Graph

10717 Commits (f2e3e30af895d36b42b042a17f1eb0015b216693)

Author SHA1 Message Date
Michael Telatynski b7396c8ef0
trigger urlPreviews state update on {,room}AccountData changes of settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 19:17:55 +01:00
Michael Telatynski d1600bdacf
fix event type which room-account settings were read from
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 19:17:31 +01:00
Michael Telatynski d4f9fec707
run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:48:48 +01:00
Michael Telatynski acbc84a69c
switch to another settings key for e2e url previews to protect on change
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:44:54 +01:00
Michael Telatynski ed4b82f8fc
update wording and style it like text (text cursor)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:36:19 +01:00
Michael Telatynski ed1f801254
add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:36:07 +01:00
Michael Telatynski a45dc837b4
add copyright
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:36:01 +01:00
Michael Telatynski 891070d001
update UrlPreview settings to be more privacy-aware in e2ee rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:35:54 +01:00
David Baker 64fc7d3840 v0.12.8-rc.2 2018-06-22 18:08:57 +01:00
David Baker f94ecf9ff5 Prepare changelog for v0.12.8-rc.2 2018-06-22 18:08:57 +01:00
David Baker 60a9752e6e
Merge pull request #2005 from matrix-org/t3chguy/fix_commands
slash got consumed in the consolidation
2018-06-22 17:59:27 +01:00
Weblate b24e599c45 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 15:01:56 +00:00
Michael Telatynski 5b027c6410
Merge pull request #2003 from matrix-org/t3chguy/lang_select_register_view
factor out conditional LanguageSelector as functional component
2018-06-22 16:01:51 +01:00
Weblate 52fe65f8b1 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 14:46:14 +00:00
Luke Barnard 5596dc4e57
Merge pull request #1993 from matrix-org/t3chguy/community_autocomplete
Autocomplete and Pillify Communities
2018-06-22 15:46:06 +01:00
Michael Telatynski 548a06cad2
use JSX and import via sdk rather than directly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 14:47:57 +01:00
Michael Telatynski 32ab997230
properly style Group Pill
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 14:38:06 +01:00
Jeff Huang f236b319cc Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-06-22 12:20:07 +00:00
Michael Telatynski d92d95c37d
don't fall back to getGroups as it gets it no additional data
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 12:11:16 +01:00
Michael Telatynski 9ee78de7e5
pr iteration, don't assume js-sdk stores group stuff other than groupId
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 12:05:46 +01:00
Michael Telatynski 561b9699fc
Merge branch 'develop' into t3chguy/community_autocomplete 2018-06-22 12:00:34 +01:00
Weblate f887369a54 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 10:45:23 +00:00
David Baker 771eac0075
Merge pull request #1971 from matrix-org/dbkr/jitsi_makewidget
Very basic Jitsi integration
2018-06-22 11:45:18 +01:00
Weblate 6583befa76 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 10:41:20 +00:00
Luke Barnard 3aee0b56ae
Merge pull request #1994 from matrix-org/t3chguy/fix_group_tile_overflow
add additional classes which protect the text from overflowing
2018-06-22 11:41:13 +01:00
David Baker 6252f5b818 Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget 2018-06-22 11:31:54 +01:00
David Baker 9d68c9e1a1 Logging & comment fix 2018-06-22 11:24:30 +01:00
Weblate 8eeff746d3 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:56:22 +00:00
Michael Telatynski 88ecaced82
Merge pull request #1992 from matrix-org/t3chguy/focus_rte_after_when_uploadingFile
Upload File confirmation modal steals focus, send it back to composer
2018-06-22 10:56:17 +01:00
Weblate a470f250b5 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:39:00 +00:00
Luke Barnard 5b8e453484
Merge pull request #1991 from matrix-org/t3chguy/delint_MImageBody
delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry
2018-06-22 10:38:56 +01:00
Weblate fe3b9dbed2 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:35:34 +00:00
Luke Barnard f15b877a55
Merge pull request #1977 from matrix-org/t3chguy/ctrl-k_tab
allow using tab to navigate room list in a smarter way
2018-06-22 10:35:28 +01:00
Weblate 4ef8defd90 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:34:10 +00:00
Luke Barnard 9265f0d032
Merge pull request #1990 from matrix-org/t3chguy/no_displayname
fix no displayname usersettings
2018-06-22 10:34:04 +01:00
Weblate 3b2349b28c Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:24:10 +00:00
Luke Barnard 8b257f2f50
Merge pull request #1989 from matrix-org/t3chguy/right_click_tagpanel_contextmenu
trigger TagTile context menu on right click
2018-06-22 10:23:58 +01:00
random ca2937cd65 Translated using Weblate (Italian)
Currently translated at 100.0% (1197 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-06-21 15:38:26 +00:00
Weblate 6642292d1e Merge remote-tracking branch 'origin/develop' into develop 2018-06-21 13:07:59 +00:00
Michael Telatynski 26aec4364d
Merge pull request #2000 from matrix-org/t3chguy/deduplicate_address_picker
hide already chosen results from AddressPickerDialog
2018-06-21 14:07:52 +01:00
Michael Telatynski f32da97a3a
delint and run generate-eslint-error-ignore-file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 14:04:08 +01:00
Michael Telatynski 58be44ad9e
factor out conditional LanguageSelector as functional component
and reuse in Login, ForgotPassword and Registration views

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 13:51:39 +01:00
Michael Telatynski be612998bd
invert boolean operation for readability and add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 12:14:16 +01:00
Michael Telatynski 0737965079
s/userList/selectedList/ & s/queryList/suggestedList/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 12:13:27 +01:00
Weblate dd421b92cd Merge remote-tracking branch 'origin/develop' into develop 2018-06-21 11:00:21 +00:00
Luke Barnard e148eb1a93
Merge pull request #2002 from matrix-org/t3chguy/fix_ChatCreateOrReuseDialog_onCancel
delint ChatCreateOrReuseDialog
2018-06-21 12:00:15 +01:00
Weblate 0fabed5570 Merge remote-tracking branch 'origin/develop' into develop 2018-06-21 10:42:59 +00:00
Michael Telatynski a0207fb7fd
Merge pull request #1982 from matrix-org/t3chguy/nvl/fix_set_password-email_flow
fix set password & email flow possible to get stuck and onBlur murdering your email
2018-06-21 11:42:53 +01:00
Michael Telatynski 2428eb12af
delint ChatCreateOrReuseDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 11:37:37 +01:00
Slavi Pantaleev cb6c41ae66 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1197 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-06-21 09:50:06 +00:00