Commit Graph

337 Commits

Author SHA1 Message Date
Luke Barnard d3f9a3aeb5 Run eslint --fix
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
Luke Barnard ffb9dd844a Merge pull request #868 from psaavedra/set_default_federate_by_settings
Added TextInputWithCheckbox dialog
2017-10-11 16:28:03 +02:00
Luke Barnard 99aabd9025 Merge pull request #1451 from matrix-org/t3chguy/redundant_thing
Remove redundant stale onKeyDown
2017-10-11 14:31:08 +02:00
Luke Barnard 917957c1dc Modify the group store to include group rooms
and modify components to use this new part of the store such that feedback can be given
when adding or removing a room from the room list.
2017-10-05 14:30:04 +01:00
Michael Telatynski a8231f7bf9 Remove redundant stale onKeyDown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-05 08:26:57 +01:00
Michael Telatynski c115980f21 remove redundant&stale onKeyDown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-05 08:08:39 +01:00
Michael Telatynski 38de4ae152 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-05 08:00:22 +01:00
Michael Telatynski 7492f2dffa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings 2017-10-04 22:35:29 +01:00
Stefan Parviainen a96169e80e Fix merge conflict 2017-10-02 17:57:22 +02:00
Luke Barnard 6b9a2909df Add rule to enforce spacing in curly brackets in JSX children
This required an updated in version of eslint-plugin-react to 7.4.0.
2017-09-28 11:21:06 +01:00
Luke Barnard 38fdd155f0 Construct address picker message using provided validAddressTypes 2017-09-28 10:06:51 +01:00
Luke Barnard d52355f80e Implement adding rooms to a group (or group summary) by room ID 2017-09-27 15:30:58 +01:00
Luke Barnard e3405cfd95 shouldOmitSelf -> includeSelf 2017-09-27 11:52:05 +01:00
Luke Barnard 6bc9b32ab7 Fix ability to feature self in a group summary
By default the AddressPicker would omit the currently logged-in user. This adds a property to override that to allow "self" to be picked.
2017-09-27 11:04:41 +01:00
Stefan Parviainen 35cb52febc Fix merge conflict 2017-09-27 08:41:37 +02:00
Luke Barnard 20d65535c0 Use all known rooms instead of public rooms 2017-09-26 17:11:54 +01:00
Luke Barnard ddab8d7b5c Implement "Add room to group" feature 2017-09-26 14:49:13 +01:00
Stefan Parviainen cc441f42f9 Some more translatable strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-23 09:02:51 +02:00
Luke Barnard 5f840a3031 Implement adding rooms to the group summary
This includes making UserPickerDialog more generic such that it can also pick rooms from groups.
2017-09-21 16:53:10 +01:00
Luke Barnard 9cd4cdf6df Filter group users results based on query 2017-09-21 10:52:28 +01:00
Luke Barnard 7ef55946da Fix console error log statement 2017-09-20 17:04:05 +01:00
Luke Barnard 1c1bf82c2a Add users to group summary using new API 2017-09-20 16:32:02 +01:00
Luke Barnard 44c38652ab Implement UserPickerDialog for adding users
Also, use AccessibleButtons.
2017-09-20 15:44:42 +01:00
David Baker 299db845ff PR feedback 2017-08-25 12:10:13 +01:00
David Baker 5f816666e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-22 10:08:02 +01:00
David Baker ac64e9b705 Lint 2017-08-21 19:34:07 +01:00
David Baker e77ea352e4 Support full group membership cycle
Apart from knocking, ie. Invite / accept / reject / leave
2017-08-21 19:18:32 +01:00
Richard van der Hoff 764d5891ad Fix proptypes on UserPickerDialog
... so that it doesn't log an error
2017-08-21 16:30:49 +01:00
Michael Telatynski bdb2d6b475 Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings
# Conflicts:
#	src/components/structures/MatrixChat.js
2017-08-17 13:39:19 +01:00
Michael Telatynski ca5e26744f Make dialog more specific and hide options behind advanced spoiler 2017-08-17 13:33:07 +01:00
David Baker e1ddd3781d Merge branch 'dbkr/userpicker' into dbkr/group_userlist 2017-08-15 14:10:45 +01:00
David Baker 81273ec855 Move non-invite specific stuff to UserAddress 2017-08-15 13:42:23 +01:00
David Baker bbcf7e1d9b s/inviteList/userList/ 2017-08-15 13:30:13 +01:00
David Baker fa660c8211 PR feedback 2017-08-15 10:57:24 +01:00
David Baker 64f352dda7 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-15 10:49:07 +01:00
David Baker b7b449434d Lint 2017-08-15 09:10:13 +01:00
David Baker 1b66e88b6e ChatInviteDialog -> UserPickerDialog pt 2
The other changes I forgot to add
2017-08-14 17:43:00 +01:00
David Baker 447aa1e5a0 Refactor ChatInviteDialog to be UserPickerDialog
Now it's just a means of choosing users and all the actual inviting
functionality is moved out to Invite.js. This will allow us to
reuse it for inviting to groups.

Adds the ability to restrict what types of addresses may be chosen,
although this isn;t used yet, it will be necessary for groups
because groups don't support 3pid invites.
2017-08-14 17:38:59 +01:00
Michael Telatynski b19c1010aa Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/Analytics.js
2017-08-10 13:54:55 +01:00
Michael Telatynski 67f9c3774d make string more human-friendly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:51:47 +01:00
Michael Telatynski 24599ace32 don't track error messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:49:11 +01:00
Michael Telatynski 579090a4e3 add comment 2017-08-09 16:37:38 +01:00
David Baker 234a88c098 WIP group member list/tiles 2017-08-04 15:00:34 +01:00
Michael Telatynski 6e39e72849 fix m.federate always being false because value is a string. Y HTML...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 14:00:24 +01:00
Michael Telatynski 4b4b730233 fix and i18n the impl
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-02 13:41:26 +01:00
Michael Telatynski fd454b476a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings 2017-08-02 12:15:00 +01:00
Michael Telatynski 62af06104d resolve -> reject because semantics. 2017-07-31 14:22:05 +01:00
Michael Telatynski f310d4446c i18n the title of the set mxid dialog 2017-07-31 13:31:07 +01:00
Michael Telatynski 25d1d21d93 copy logic from RegistrationForm to detect invalid localparts 2017-07-31 13:28:43 +01:00
Michael Telatynski bf98c0da7c un-i18n Modal Analytics
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:19:18 +01:00