Commit graph

6795 commits

Author SHA1 Message Date
Luke Barnard
28b8582bd6 Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings 2017-10-04 10:37:45 +01:00
Luke Barnard
4e9694be6d Maintain "blur to add" function to match previous UX 2017-10-04 10:28:26 +01:00
Luke Barnard
407a632a8d Fix typo 2017-10-04 10:26:43 +01:00
Luke Barnard
d25ebfb844 Remove cruft from EIL 2017-10-04 10:15:44 +01:00
Luke Barnard
011aadcb94 Merge pull request #1421 from pafcu/develop
Add dummy translation function to mark translatable strings
2017-10-04 10:09:09 +01:00
Luke Barnard
8243c39d83 Factor out EditableItemList from AliasSettings
Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).
2017-10-04 10:00:01 +01:00
Luke Barnard
03581adf85 Merge pull request #1438 from matrix-org/luke/groups-remove-room
Implement button to remove a room from a group
2017-10-03 11:45:03 +01:00
Luke Barnard
6b834bc72e Add confirmation dialog for removing room from group 2017-10-03 11:16:22 +01:00
Luke Barnard
0116c4b486 Log the error when failing to removie room from group 2017-10-03 10:14:08 +01:00
Luke Barnard
3e34a460a4 Add error dialog for when removing room fails 2017-10-03 10:12:11 +01:00
Stefan Parviainen
a96169e80e Fix merge conflict 2017-10-02 17:57:22 +02:00
Luke Barnard
8d189cc322 Merge pull request #1443 from matrix-org/dbkr/fix_3pid_invites
Fix showing 3pid invites in member list
2017-10-02 15:18:00 +01:00
David Baker
b202601d65 Fix showing 3pid invites in member list 2017-10-02 15:10:32 +01:00
Travis Ralston
20798dd2fa Expose power level setting for widgets
Fixes https://github.com/vector-im/riot-web/issues/4866

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 15:37:32 -06:00
Travis Ralston
8ee9d39ffa Expose option for m.room.topic power level
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 15:12:05 -06:00
Travis Ralston
8ab3d94c1c Always show common events in the PL section of room settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 15:11:48 -06:00
Travis Ralston
614cf950b6 Supply user-friendly labels for common events
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 14:45:00 -06:00
Travis Ralston
2e1b2178a1 Remove assumptions on how languages work in the power levels section
This does mean that the strings will need to be re-translated, but now they may be more accurate because the comma is not assumed in the code.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 14:35:49 -06:00
Travis Ralston
415693bd83 Support editing power levels of events.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 14:32:40 -06:00
Luke Barnard
955ca6cd2b Implement button to remove a room from a group
NB: This doesn't provide any feedback to the user. We should use a GroupSummaryStore-style component to refresh the view after a successful hit to the API. This could affect the summary view as well, because when rooms are removed from a group, they are also removed from the summary (if necessary).
2017-09-29 17:59:24 +01:00
Luke Barnard
0a53630806 Merge pull request #1435 from matrix-org/luke/groups-button
Add button to get to MyGroups (view_my_groups or path #/groups)
2017-09-29 11:00:22 +01:00
Luke Barnard
c8b2158156 Lint 2017-09-29 10:42:23 +01:00
Luke Barnard
18e0d8da86 Rename Flair feature to Groups 2017-09-29 10:27:40 +01:00
Luke Barnard
739ddb8410 Merge branch 'develop' into luke/groups-button 2017-09-28 12:11:26 +01:00
Luke Barnard
6a988a0d08 Merge pull request #1436 from matrix-org/luke/lint-jsx-curly-spacing
Add eslint rule to disallow spaces inside of curly braces
2017-09-28 12:09:46 +01:00
Luke Barnard
07b6040c39 Update travis script to use lintwithexclusions 2017-09-28 11:33:36 +01:00
Luke Barnard
f3d155b62c Merge pull request #1437 from matrix-org/lukebarnard1-patch-fix-inviting
Fix ability to invite existing mx users
2017-09-28 11:27:07 +01:00
Luke Barnard
010b8d8be6 Merge branch 'luke/lint-jsx-curly-spacing' of github.com:matrix-org/matrix-react-sdk into luke/lint-jsx-curly-spacing 2017-09-28 11:23:19 +01: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
3c99b2af3d Fix ability to invite existing mx users
Bug introduced by https://github.com/matrix-org/matrix-react-sdk/pull/1432

We should really not be using string constant literals all over the place. 
We'd be less likely to run into this sort of bug these address types weren't copied literals.
2017-09-28 10:55:09 +01:00
Luke Barnard
e70336af11 Add rule to enforce JSX tag spacing 2017-09-28 10:27:03 +01:00
Luke Barnard
1699c37fcf Merge pull request #1434 from matrix-org/luke/fix-address-picker-error-message
Construct address picker message using provided `validAddressTypes`
2017-09-28 10:08:36 +01:00
Luke Barnard
6eedf8b073 Add eslint rule to disallow spaces inside of curly braces 2017-09-28 10:06:51 +01:00
Luke Barnard
e9cf25f946 Remove "You have entered an invalid contact..." from translations 2017-09-28 10:06:51 +01:00
Luke Barnard
38fdd155f0 Construct address picker message using provided validAddressTypes 2017-09-28 10:06:51 +01:00
Luke Barnard
c7728bd9ad Add eslint rule to disallow spaces inside of curly braces 2017-09-28 10:02:40 +01:00
Luke Barnard
1f66baca4b Remove "You have entered an invalid contact..." from translations 2017-09-27 17:55:09 +01:00
Luke Barnard
929c8627d3 Add button to get to MyGroups (view_my_groups or path #/groups) 2017-09-27 17:45:49 +01:00
Luke Barnard
3a8bfbf7e0 Construct address picker message using provided validAddressTypes 2017-09-27 17:11:30 +01:00
Luke Barnard
19e4e245c2 Merge pull request #1433 from matrix-org/luke/fix-groups-summary-rooms-with-no-avatar
Fix GroupView summary rooms displaying without avatars
2017-09-27 16:34:03 +01:00
Luke Barnard
ac76154518 Merge pull request #1432 from matrix-org/luke/groups-add-rooms-by-id
Implement adding rooms to a group (or group summary) by room ID
2017-09-27 16:20:32 +01:00
Luke Barnard
f3b6b2cc06 Fix GroupView summary rooms displaying without avatars
- GroupView can now render with rooms in the summary that do not have an avatar
 - RoomAvatar no longer has a redundant fallback avatar (this is handled by BaseAvatar)
 - RoomAvatar was delinted
2017-09-27 16:18:15 +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
David Baker
2d8bc783b0 Merge pull request #1431 from matrix-org/luke/feature-flair-tooltip
Give flair avatars a tooltip = the group ID
2017-09-27 14:44:25 +01:00
Luke Barnard
3d30cc3733 Merge pull request #1430 from matrix-org/luke/groups-fix-feature-self
Fix ability to feature self in a group summary
2017-09-27 14:43:50 +01:00
Luke Barnard
f528e147e3 Give flair avatars a tooltip = the group ID 2017-09-27 14:36:22 +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
Luke Barnard
1ca9102442 Fix spinner appearing above RP header
By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel
2017-09-27 10:36:44 +01:00
Stefan Parviainen
35cb52febc Fix merge conflict 2017-09-27 08:41:37 +02:00