Commit graph

6659 commits

Author SHA1 Message Date
David Baker
af2df77b8e Merge pull request #1418 from matrix-org/luke/groups-summary-store
Create GroupSummaryStore for storing group summary stuff
2017-09-25 14:59:32 +01:00
Luke Barnard
e42e7bd3ad Merge pull request #1419 from matrix-org/dbkr/publicity_toggle
Add status & toggle for publicity
2017-09-25 14:52:57 +01:00
Luke Barnard
1bd200f1b1 Merge pull request #1417 from matrix-org/dbkr/member_list_show_more
MemberList: show 100 more on overflow tile click
2017-09-25 14:50:33 +01:00
Luke Barnard
83e6218930 Remove listeners from group summary store on unmount 2017-09-25 14:49:12 +01:00
Luke Barnard
8e7d58797d _loadGroupFromServer -> _initGroupSummaryStore 2017-09-25 14:48:49 +01:00
David Baker
1a82f121c0 lint 2017-09-25 13:17:07 +01:00
David Baker
175fed490f Merge pull request #1425 from matrix-org/rav/memberlist_fixes
Fix NPE in MemberList
2017-09-25 11:08:56 +01:00
Richard van der Hoff
e2f8bb2ec0 Fix NPE in MemberList
_getChildCountInvited would throw an NPE if invoked before the js-sdk had found
the room. Make sure we initialise the state correctly.
2017-09-25 10:25:21 +01:00
Luke Barnard
b8dca58f4f Pass matrixClient as an argument to GSS constructor 2017-09-25 10:02:13 +01:00
David Baker
26af29183e Merge pull request #1422 from pafcu/var-typofix
Fix incorrect variable in string
2017-09-23 18:01:06 +01:00
Stefan Parviainen
4da7a368a4 Fix incorrect variable in string 2017-09-23 10:04:59 +02:00
David Baker
4b7c50810c Merge pull request #1420 from matrix-org/t3chguy/missing-i18n
apply i18n _t to string which has already been translated
2017-09-22 20:58:59 +01:00
Michael Telatynski
6d530eeb6e
apply i18n _t to string which has already been translated
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-22 20:04:04 +01:00
David Baker
af73f1c3bb Add status & toggle for publicity
This doesn't work at the moment because it looks like it's broken
in synapse as per https://github.com/matrix-org/sytest/pull/391

But if it did work, the client side code might look something
like this.
2017-09-22 19:27:02 +01:00
Luke Barnard
791bc5e7ac Create GroupSummaryStore for storing group summary stuff
- Acts as a layer between GroupView and the group APIs that modify the summary individually. This allows for abstraction of getting the new summary once a successful API hit has been done.
 - The plan is to also control the avatar, topic, body of the summary via the same class
2017-09-22 18:52:06 +01:00
David Baker
86ceef712d Fix broken i18n files 2017-09-22 18:24:45 +01:00
David Baker
5004d90a3a Merge remote-tracking branch 'origin/develop' into dbkr/member_list_show_more 2017-09-22 18:03:16 +01:00
David Baker
de43972881 Merge pull request #1416 from matrix-org/dbkr/truncatedlist_invite
Make the invite section a truncatedlist too
2017-09-22 18:02:44 +01:00
David Baker
25da0f6a7a MemberList: show 100 more on overflow tile click
Not the full list because on HQ that causes your browser to implode.

This should really be a decent paginated list at this point, but this is better
for now.
2017-09-22 17:01:14 +01:00
David Baker
11f6c8cf53 Fix null pointer
Check if users is null, not the room
2017-09-22 16:56:26 +01:00
David Baker
9cbfc22352 Make the invite section a truncatedlist too
For uniformity and to speed up rooms like HQ with have a lot of
lingering invites.
2017-09-22 16:50:54 +01:00
Luke Barnard
4c1a85cb71 Merge pull request #1415 from matrix-org/luke/groups-remove-featured-rooms-and-users
Implement removal function of features users/rooms
2017-09-22 16:32:40 +01:00
David Baker
a868fa4be9 Merge pull request #1412 from matrix-org/dbkr/truncatedlist_experiment
Allow TruncatedList to get children via a callback
2017-09-22 16:25:45 +01:00
Luke Barnard
2e45f121ee Add missing comma to en_EN.json 2017-09-22 16:25:31 +01:00
Luke Barnard
3f9d20de97 Implement removal function of features users/rooms
With the appeareance of a "X" in the top right of each featured item when editing.

NB: No reloading of summary is done after adding/removing a user/room. The plan is to better than threading a callback all the way down.
2017-09-22 15:56:35 +01:00
David Baker
aed1b9072d Merge pull request #1413 from matrix-org/dbkr/userprovider_lazyload
Experimental: Lazy load user autocomplete entries
2017-09-22 15:16:07 +01:00
David Baker
77febdedfc Merge pull request #1414 from matrix-org/dbkr/member_list_profiles
Show displayname & avatar url in group member list
2017-09-22 15:15:55 +01:00
David Baker
621a108b5e Use flow style function definition for doc 2017-09-22 15:15:10 +01:00
David Baker
dba48e2f8f use start, end rather than min, max 2017-09-22 15:07:45 +01:00
David Baker
0f9f1c85a8 Remove done todo 2017-09-22 14:58:49 +01:00
David Baker
4a36e32c8d Show displayname & avatar url in group member list 2017-09-22 14:52:52 +01:00
David Baker
02894ee906 Experimental: Lazy load user autocomplete entries
Loading the users into the autocomplete provider is quite a large
chunk of work for a large room. Try lazy loading it the first time
a completion is done rather than up front when the room is loaded,
given that a lot of the time you switch to a room you won't say
anything.
2017-09-22 14:31:29 +01:00
David Baker
f1a2b6d327 lint 2017-09-22 13:35:49 +01:00
David Baker
16398fbfc2 Allow TruncatedList to get children via a callback
And update MemberList to use it as such. This means that the parent
only needs to make react elements for the elements that will
actually be rendered, rather than all of them.

In practive this doesn't make a huge difference as making React
elements is fairly fast, but experimentally (with all profiling
turned on), MemberList went from 25ms in the constructor and
81ms in render to 38ms in constructor but sub 1ms render for
Matrix HQ.
2017-09-22 13:15:02 +01:00
David Baker
45c4eeba01 Merge pull request #1411 from matrix-org/dbkr/delint_truncatedlist
De-lint TruncatedList
2017-09-22 10:20:26 +01:00
David Baker
29d8df2c9e De-lint TruncatedList 2017-09-22 10:00:46 +01:00
David Baker
77efe6a6d0 Merge pull request #1409 from pafcu/develop
Remove unneeded strings
2017-09-22 09:46:50 +01:00
David Baker
78e806f7f9 Merge branch 'master' into develop 2017-09-21 21:48:08 +01:00
David Baker
3552f08aad v0.10.6 2017-09-21 21:47:28 +01:00
David Baker
c40a3b9aab Prepare changelog for v0.10.6 2017-09-21 21:47:28 +01:00
David Baker
daac0ebdc0 js-sdk v0.8.4 2017-09-21 21:43:35 +01:00
Matthew Hodgson
946c439c28 hopefully fix https://github.com/vector-im/riot-web/issues/4166 2017-09-21 18:56:47 +01:00
David Baker
c6e4f606f9 Merge branch 'master' into develop 2017-09-21 18:02:16 +01:00
David Baker
99e4221e61 v0.10.5 2017-09-21 18:01:42 +01:00
David Baker
671743bcae Prepare changelog for v0.10.5 2017-09-21 18:01:41 +01:00
David Baker
3ac67077f9 Merge pull request #1410 from matrix-org/dbkr/prerelease_clean
Clean on prerelease
2017-09-21 17:59:48 +01:00
Luke Barnard
c19ee66565 Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign
Redesign membership section in GroupView
2017-09-21 17:49:47 +01:00
David Baker
a0b4d8a9f8 Clean on prerelease
To avoid any further problems where we ship build files with the
wrong capitalisation because npm is dumb
2017-09-21 17:39:34 +01:00
Luke Barnard
b5f141456c Merge pull request #1406 from matrix-org/luke/groups-add-feature-rooms
Implement adding rooms to the group summary
2017-09-21 17:27:40 +01:00
Luke Barnard
3351770b54 Fix dodgy merge 2017-09-21 17:26:16 +01:00