Commit graph

4099 commits

Author SHA1 Message Date
Stefan Parviainen
788be67c75 Clarifications 2017-11-14 20:08:27 +01:00
Stefan Parviainen
2acd42e7c5 Make eslint happy 2017-11-13 21:10:08 +01:00
Stefan Parviainen
3afbaf61e7 Refactor i18n stuff a bit 2017-11-13 20:19:33 +01:00
Luke Barnard
a96bfee9f2 Remove unused UserSettingsStore import 2017-11-10 16:12:27 +00:00
Luke Barnard
ceda5939f9 Remember to import React 2017-11-10 15:55:55 +00:00
Luke Barnard
853d33a93a Make groups a fully-fleged baked-in feature 2017-11-10 15:42:11 +00:00
Luke Barnard
6e1cf6ce17
Merge pull request #1548 from matrix-org/rxl881/widgetrendering
Improve widget rendering on prop updates
2017-11-10 12:41:20 +00:00
Luke Barnard
74c6ebc5c6
Merge pull request #1595 from matrix-org/luke/groups-show-user-profile-on-action
Display group member profile (avatar/displayname) in ConfirmUserActionDialog
2017-11-10 12:31:47 +00:00
David Baker
d2549b621c
Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule
Don't crash if there isn't a room notif rule
2017-11-10 11:57:43 +00:00
Luke Barnard
981ca458ec
Merge pull request #1596 from matrix-org/luke/groups-show-name-in-flair-tootip
Show group name in flair tooltip if one is set
2017-11-10 11:51:45 +00:00
Richard Lewis
ba8a9f2a43 Comment length 2017-11-10 11:50:14 +00:00
David Baker
ff5e00d244 Don't crash if there isn't a room notif rule 2017-11-10 11:50:00 +00:00
Luke Barnard
6deeaf94d6 group name not required 2017-11-10 11:43:05 +00:00
Richard Lewis
d2070a08d8 Replace 'qs' dep. with 'querystring' 2017-11-10 11:42:56 +00:00
Luke Barnard
90a63d78b9
Merge pull request #1597 from matrix-org/luke/groups-fix-invite-avatar
Convert group avatar URL to HTTP before handing to BaseAvatar
2017-11-10 11:41:51 +00:00
Luke Barnard
d179267714 Add prop type 2017-11-10 11:41:36 +00:00
Luke Barnard
0d174ffe9a Fix tests 2017-11-10 11:13:52 +00:00
Luke Barnard
f4428267a1 Refactor onboarding redirect, add groups to the onboarding starters 2017-11-10 10:51:28 +00:00
Luke Barnard
266a504981 Use the same MatrixClient for the duration of GroupView lifecycle
Using the pegged matrix client would lead to trying to call removeListener on `null` when GroupView is unmounted during logout.
2017-11-10 10:49:14 +00:00
Richard Lewis
bd6b5c4498 Improve function name. 2017-11-10 10:17:55 +00:00
Richard Lewis
98ac3dd19b Explicitly set initialisation state. 2017-11-10 09:44:58 +00:00
Luke Barnard
31be27515c Modify the group room visibility API to reflect the js-sdk changes
See https://github.com/matrix-org/matrix-js-sdk/pull/569
2017-11-09 16:28:21 +00:00
Luke Barnard
a8487c540f Convert group avatar URL to HTTP before handing to BaseAvatar
This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.
2017-11-09 14:34:04 +00:00
Richard Lewis
da8b1ff1cd Ensure that loading state is reset when showing app panel. 2017-11-09 14:28:24 +00:00
Luke Barnard
9a6c9594a1 Correctly display group invite
By making sure the groupName truncates in the right place
2017-11-09 14:16:54 +00:00
Richard Lewis
f796bc79c3 Fix addition of scalar token to widget URL.
Add error logging.
2017-11-09 14:07:29 +00:00
Luke Barnard
9027780215 Show group name in flair tooltip if one is set
e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver"

Fixes https://github.com/vector-im/riot-web/issues/5341
2017-11-09 12:38:43 +00:00
Luke Barnard
6eeb91ee2e Display group member profile (avatar/displayname) in ConfirmUserActionDialog
Fixes https://github.com/vector-im/riot-web/issues/5486
2017-11-09 12:24:20 +00:00
Richard Lewis
8016fb82d7 Fix broken commit. 2017-11-08 20:38:54 +00:00
Richard Lewis
56581ef408 Fix various loadingElement related issues. 2017-11-08 20:38:31 +00:00
Richard Lewis
b2b07d9370 Formatting 2017-11-08 20:17:28 +00:00
David Baker
7b243bf64d
Revert "UnknownDeviceDialog: get devices from SDK" 2017-11-08 18:49:50 +00:00
Richard Lewis
be0a76dbd6 Update variable name and JSdoc for improved clarity. 2017-11-08 17:44:54 +00:00
David Baker
b575df7da7
Merge pull request #1591 from matrix-org/luke/groups-order-admins-first
Order users in the group member list with admins first
2017-11-08 14:04:28 +00:00
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
7075931c58
Merge pull request #1589 from matrix-org/luke/improve-room-address-picker
Improve address picker for rooms
2017-11-08 11:49:45 +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
077ca36b05 Rank rooms with shorter matching aliases first 2017-11-08 10:47:45 +00:00
Luke Barnard
b3674f503d Do not search through room topics 2017-11-08 10:32:48 +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