Commit graph

10432 commits

Author SHA1 Message Date
Will Hunt
76f0f15e49 Fix nitpicks 2018-06-23 13:00:56 +01:00
Will Hunt
7c0811dd92 size > upload_size as per spec feedback 2018-06-23 13:00:56 +01:00
Will Hunt
0fad90eb43 Linting 2018-06-23 13:00:56 +01:00
Will Hunt
c99f5c0df8 Check upload limits before trying to upload large files 2018-06-23 13:00:56 +01: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
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
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
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
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
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
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
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
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
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
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
Luke Barnard
e148eb1a93
Merge pull request #2002 from matrix-org/t3chguy/fix_ChatCreateOrReuseDialog_onCancel
delint ChatCreateOrReuseDialog
2018-06-21 12:00:15 +01: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
Luke Barnard
df58715a17
Merge pull request #1998 from matrix-org/t3chguy/fix_commands
slash got consumed in the consolidation
2018-06-21 10:13:23 +01:00
Michael Telatynski
fd252ded60
take into account the addressType also
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 00:47:21 +01:00
Michael Telatynski
4040e3f5cf
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 00:37:37 +01:00
Michael Telatynski
bce87829b6
hide already chosen results from AddressPickerDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 00:33:24 +01:00
Michael Telatynski
884fa3b913
use existing command hashmap over linear array search
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-20 17:25:23 +01:00
Michael Telatynski
7d9d17145c
change so that if someone enters invalid command with args we strict match
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-20 17:21:06 +01:00
Michael Telatynski
f5b12bd66a
slash got consumed in the consolidation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-20 17:09:49 +01:00
David Baker
4dba23b81d
Merge pull request #1997 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2018-06-20 14:06:05 +01:00
Weblate
14cf2327b4 Merge remote-tracking branch 'origin/develop' into develop 2018-06-20 12:56:37 +00:00
David Baker
a6d9c25b70
Merge pull request #1988 from matrix-org/t3chguy/refactor_slashcommands
refactor, consolidate and improve SlashCommands
2018-06-20 13:56:29 +01:00
Weblate
8a4f6f0048 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/gl.json
2018-06-20 09:13:31 +00:00
David Baker
86abf8bf50
Merge pull request #1996 from matrix-org/dbkr/unlabs_replies
Take replies out of labs!
2018-06-20 10:10:24 +01:00
David Baker
e5a509bb91 i18n & prunei18n 2018-06-20 10:04:03 +01:00
David Baker
2e2c347ef7 Merge remote-tracking branch 'origin/develop' into dbkr/unlabs_replies 2018-06-20 10:03:05 +01:00
Miguel Branco
0011f23125 Translated using Weblate (Galician)
Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-06-20 09:01:27 +00:00
David Baker
0e8b4ac2ad i18n & prunei18n 2018-06-20 10:01:09 +01:00
David Baker
e67dae704a Take replies out of labs! 2018-06-20 09:57:11 +01:00
Michael Telatynski
5cc15b2e03
add additional classes which protect the text from overflowing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-19 19:11:22 +01:00
Michael Telatynski
287745f8c6
delint, remove unused imports and fix flow annotations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-19 12:06:13 +01:00
Michael Telatynski
c1e608f1a8
show permalinks to communities as Pills
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-19 11:53:17 +01:00
Michael Telatynski
b79cd205a0
Support autocompleting Communities
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-19 11:52:48 +01:00
Michael Telatynski
72f50a8c61
rewrite group permalinks in <a hrefs> also
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-19 11:51:06 +01:00