OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,344 Commits
215 Branches
561 Tags
462 MiB
Commit Graph

7344 Commits (e2a0cba6cb4e42e10602ab604e7c560df1e31995)

Author SHA1 Message Date
Luke Barnard e2a0cba6cb If group member privilege level is equal, disambiguate with displayname or userId 2017-11-08 13:57:38 +00:00
Luke Barnard e3e161fbea Order users in the group member list with admins first 2017-11-08 11:51:58 +00:00
Luke Barnard c1d9d3714a Fix not being able to filter community rooms - fixes vector-im/vector-web#5538 2017-11-08 10:55:51 +00:00
Luke Barnard 120e7b821f
Merge pull request #1585 from matrix-org/luke/groups-inviter-profile 
Use the getProfileInfo API for group inviter profile
 2017-11-08 10:24:00 +00:00
Luke Barnard 10778e075e Merge branch 'develop' into luke/groups-inviter-profile 2017-11-08 10:10:43 +00:00
Luke Barnard 4bb083d959 Style 2017-11-08 10:08:04 +00:00
Luke Barnard f53f9ed8ca inviterProfile = null initially 2017-11-08 10:07:43 +00:00
Luke Barnard 4c47f75918
Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility 
Add checkbox to GroupAddressPicker for determining visibility of group rooms
 2017-11-08 10:04:41 +00:00
Matthew Hodgson ce6957a288
Merge pull request #1581 from matrix-org/luke/groups-update-group-members-api 
Alter group member api
 2017-11-07 22:46:11 +00:00
Luke Barnard 8fbe50a1cf
Merge pull request #1580 from matrix-org/luke/groups-new-group-settings 
Improve group creation UX
 2017-11-07 18:55:34 +00:00
Luke Barnard d777e370f2
Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing 
Disable RoomDetailList in GroupView when editing
 2017-11-07 18:53:04 +00:00
Luke Barnard edc744067f Add checkbox to GroupAddressPicker for determining visibility of group rooms 2017-11-07 18:51:41 +00:00
Matthew Hodgson 3b1726657f
Merge pull request #1586 from turt2live/travis/message-pinning-fix1 
Default to no read pins if there is no applicable account data
 2017-11-07 18:24:21 +00:00
David Baker 49a935881f
Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk 
UnknownDeviceDialog: get devices from SDK
 2017-11-07 18:15:59 +00:00
Travis Ralston e0ddd88ec9 Default to no read pins if there is no applicable account data 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 11:14:27 -07:00
Matthew Hodgson e14e0bf200
Merge pull request #1486 from turt2live/travis/pinned-notice 
Add a small indicator for when a new event is pinned
 2017-11-07 17:56:12 +00:00
David Baker 10f15dfc56 Unmounted guard 2017-11-07 17:10:40 +00:00
Luke Barnard 80d4873542 Disable RoomDetailList in GroupView when editing 
Otherwise the rooms can be clicked on.
 2017-11-07 16:54:28 +00:00
Luke Barnard ed709f52d1 Use the getProfileInfo API for group inviter profile 2017-11-07 16:42:43 +00:00
David Baker ec560345c7 UnknownDeviceDialog: get devices from SDK 
rather than having to have the error message passed in.

This is in preparation for not having the dialog pop up straight
away when a message isn't sent so we don't have to keep the error
object knocking around somewhere.
 2017-11-07 16:37:43 +00:00
Travis Ralston 142d23a099
Cap the read pin event IDs to 10 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 09:16:19 -07:00
Luke Barnard 4d9f946388
Merge pull request #1582 from matrix-org/luke/group-rooms-tooltip 
Implement tooltip for group rooms
 2017-11-07 15:22:35 +00:00
Luke Barnard 646cabf324 Add missing whitespace 2017-11-07 15:15:10 +00:00
Luke Barnard ddc1ff2f23 Name things in a sane way 2017-11-07 15:13:26 +00:00
Luke Barnard 62305a1ccd Implement tooltip for group rooms 2017-11-07 14:07:31 +00:00
Luke Barnard 7a09127687 Alter group member api 
To match https://github.com/matrix-org/synapse/pull/2647
 2017-11-07 11:27:42 +00:00
Luke Barnard 9019fee49e Adjust long desc placeholder text 2017-11-07 10:48:56 +00:00
Luke Barnard 47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills 
Room notifs in autocomplete & composer
 2017-11-07 10:25:48 +00:00
David Baker df5c6470e8 get dict syntax right 2017-11-06 22:01:23 +00:00
Luke Barnard 956c5ff343 Use a constant for easy reading of long desc placeholder 2017-11-06 18:52:55 +00:00
Luke Barnard 477051cfa6 Add placeholder for when a long desc hasn't been set 
this is only visible to group admins.
 2017-11-06 18:35:52 +00:00
Luke Barnard 137f1311b3 Add useful placeholder for the long description textarea 2017-11-06 18:35:23 +00:00
Luke Barnard 36cd22663a Open group settings when the group is created 2017-11-06 18:02:50 +00:00
Matthew Hodgson 17ae37bd3b
Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug 
Ignore img tags in HTML if src is not specified
 2017-11-06 18:02:38 +00:00
Luke Barnard d14f943629 Ignore img tags in HTML if src is not specified 
This applies to HTML messages and group summaries.
 2017-11-06 17:52:46 +00:00
David Baker 029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges 
Indicate admins in the group member list with a sheriff badge
 2017-11-06 17:16:34 +00:00
David Baker 08d006d112 PR feedback 2017-11-06 17:15:09 +00:00
Luke Barnard d6a6e59d6c Indicate admins in the group member list with a sheriff badge 2017-11-06 16:37:16 +00:00
David Baker 41e7496ff1 unused var 2017-11-06 15:25:25 +00:00
David Baker adc4290451 Pillify room notif pills in composer 2017-11-06 15:11:42 +00:00
Richard Lewis f1db564506
Merge pull request #1533 from anoadragon453/develop 
Remember whether widget drawer was hidden per-room
 2017-11-06 14:29:25 +00:00
David Baker 48def50fec
Merge pull request #1576 from matrix-org/luke/throw-on-undefined-group 
Throw an error when trying to create a group store with falsey groupId
 2017-11-06 13:02:46 +00:00
Luke Barnard febeb0429e Throw an error when trying to create a group store with falsey groupId 2017-11-06 10:18:10 +00:00
Matthew Hodgson 3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing 
Fixes React warning
 2017-11-04 15:41:57 +00:00
Travis Ralston de6fc32a87 Show an indicator when there are any pins in the room 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 20:00:48 -06:00
Travis Ralston a2b7f6d30e Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice 2017-11-03 19:57:39 -06:00
Travis Ralston 5c37155730 Don't assume we have a valid event. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 18:18:09 -06:00
Travis Ralston 3656fdb571 Store read pinned events as an array to avoid racing saves. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 18:12:57 -06:00
Matthew Hodgson d4adff3d25
Merge pull request #1575 from matrix-org/luke/fix-flair-store-again 
Fix Flair not appearing due to missing this._usersInFlight
 2017-11-03 22:44:16 +00:00
Luke Barnard da23afdec2 Better comment on FlairStore _usersInFlight 2017-11-03 18:48:15 +00:00