sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
22,933 Commits 4 Branches 19 Tags
fe401ce4dab7b0a71a9999c60c8d3c7129e48173
Commit Graph
1240 Commits
Author SHA1 Message Date
Matthew Hodgson 28d28b55d1 correctly reflect verify/blacklist state in UI 2017-02-03 01:49:22 +00:00
Matthew Hodgson be41462f3a merge 2017-02-02 22:05:44 +00:00
Richard van der Hoff 67bd2cf9dd Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified 2017-01-26 14:09:25 +00:00
David Baker e1e87807b5 Look up email addresses in ChatInviteDialog 
So email addresses known to the IS get a display name & avatar
 2017-01-25 18:51:28 +00:00
David BakerandGitHub a3b938427d Merge pull request #625 from matrix-org/dbkr/user_search_feedback 
Better feedback in invite dialog
 2017-01-25 15:59:47 +00:00
Richard van der HoffandGitHub 9cadc2f55f Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality 
Overhaul MELS to deal with causality, kicks, etc.
 2017-01-25 15:20:30 +00:00
David Baker fd8d5af63a Fix import of InviteAddressType 
and rewrite to import while we're at it
 2017-01-25 14:54:21 +00:00
Luke Barnard f9ca2a8e59 Fix _renderCommaSeparatedList 2017-01-25 11:28:12 +00:00
Luke Barnard b887d5b823 Much linting 2017-01-25 11:05:45 +00:00
Luke Barnard 8091cf7df8 Enumerate->label 2017-01-25 09:32:28 +00:00
Luke Barnard f8e46819c5 Rename truncated->coalesced 2017-01-25 09:28:26 +00:00
Luke Barnard 3b8b2cf500 Document _getCanonicalTransitions 2017-01-25 09:18:47 +00:00
Richard van der Hoff 770820e6fa Fix a bunch of lint complaints 2017-01-24 22:41:52 +00:00
Richard van der Hoff 6dd46d532a Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux 2017-01-24 20:47:24 +00:00
David Baker 6c263c1c89 Change what AddressTile takes to be Objects 
Rather than just passing in a list of strings. This paves the way
for passing in display names & avatars of looked-up threepids.
 2017-01-24 18:23:34 +00:00
Luke Barnard bd106968ce Merge branch 'develop' into luke/fix-join-part-collapsing-causality 
Conflicts:
	src/components/structures/MessagePanel.js
 2017-01-24 14:22:18 +00:00
Luke Barnard d690677bde Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality 
Conflicts:
	src/components/views/elements/MemberEventListSummary.js
 2017-01-24 14:17:11 +00:00
David Baker 5091bab657 Fix failed merge #2 2017-01-24 13:59:02 +00:00
David Baker 5f24fc3e5d Fix merge fail 2017-01-24 13:56:22 +00:00
David Baker f1f6fc809c Merge remote-tracking branch 'origin/develop' into dbkr/user_search_feedback 2017-01-24 11:26:09 +00:00
David Baker 506d37bbad Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users 2017-01-23 11:34:44 +00:00
Matthew Hodgson 7bc3fc8696 make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020 2017-01-22 01:28:43 +01:00
David Baker 18d4d3392a Fix a bunch of linting errors 
eslint --fix and a few manual ones
 2017-01-20 14:22:27 +00:00
David Baker f105ec2794 Attempt to sanitize ChatInviteDialog a bit 
* Use binds rather than onFoo functions which aren't actually
   handler functions themselves but return them
 * Rename onKeyUp to moveSelectionDown etc,, reserving onKeyUp
   for "a key has been released" rather than, "the up arrow key
   has been pressed"
 2017-01-18 17:51:39 +00:00
David Baker de621902fc Better feedback in invite dialog 
Show feedback if you enter a valid but unknown email address
or mxid

Fixes https://github.com/vector-im/riot-web/issues/2933
 2017-01-18 15:21:50 +00:00
lukebarnard 5dd1512ff2 Move aggregation code to dedicated function 2017-01-18 10:59:19 +01:00
lukebarnard 484549e50b Refactor a few things and document everything 2017-01-18 10:26:25 +01:00
lukebarnard 3ba9f50873 Move functions around, remove redundancies, add docs 2017-01-17 19:07:45 +01:00
lukebarnard 9574a0b663 Remove pointless length guard 2017-01-17 18:56:57 +01:00
David Baker 0b67fd5b4e Add 'searching known users' to the user picker 
So it's more obvious it's only finding people you've already seen

Fixes https://github.com/vector-im/riot-web/issues/2931
 2017-01-17 14:48:50 +00:00
lukebarnard 45655f4de3 Modified desc for invitation rejections, withdrawals 2017-01-17 12:01:19 +01:00
lukebarnard aa6e168505 Remove comment 2017-01-16 18:58:53 +01:00
lukebarnard 5ab287fa1a Use pre-calculated displaynames to handle dupes 2017-01-16 18:57:49 +01:00
lukebarnard a79dc886ba Order sequences by occurance of the first event in each sequence 2017-01-16 18:46:17 +01:00
lukebarnard 4be444d524 Move shouldComponentUpdate 2017-01-16 15:12:00 +01:00
lukebarnard 82d6805a71 Canonicalise certain transition pairs, handle arbitrary consecutive transitions 
Transition pairs joined,left and left,joined are now transformed into single meta-transitions "joined_and_left" and "left_and_joined" respectively. These are described as "joined and left", "left and rejoined".

Treat consecutive sequences of transitions as repetitions, and handle any arbitrary repetitions of transitions:

...,joined,left,joined,left,joined,left,...

is canonicalised into
...,joined_and_left, joined_and_left, joined_and_left,...

which is truncated and described as
... , joined and left 3 times, ...

This also works if there are multiple consecutive sequences separated by other transitions:

..., banned, banned, banned, joined, unbanned, unbanned, unbanned,...

becomes
... was banned 3 times, joined, was unbanned 3 times ...
 2017-01-16 14:49:07 +01:00
lukebarnard fb68fff536 Refactor renderCommaSeparated for reuse 2017-01-16 13:45:42 +01:00
Jani Mustonen b323551f22 Adhered to code review 2017-01-13 19:36:41 +02:00
Jani Mustonen 5e013860ee Definition for AccessibleButton 2017-01-13 19:36:41 +02:00
Jani Mustonen 041196d729 Added quick search functionality 2017-01-13 19:36:40 +02:00
Luke Barnard 77ae041407 Order names by order of first events for users 2017-01-13 16:40:33 +00:00
Luke Barnard d2d78919ce Overhaul MELS to deal with causality, kicks, etc. 
The MELS can now deal with arbitrary sequences of transitions per user, where a transition is a change in membership. A transition can be joined, left, invite_reject, invite_withdrawal, invited, banned, unbanned or kicked.

Repeated segments (modulo 1 and 2), such as joined,left,joined,left,joined will be handled and will be rendered as " ... and 10 others joined and left 2 times and then joined". The repeated segments are assumed to be at the beginning of the sequence. This could be improved to handle arbitrary repeated sequences.
 2017-01-12 18:55:53 +00:00
Luke Barnard baaf827c48 Use getStateKey instead of getSender 
This makes sure that the kickee is not the user used for the MemberEventListSummary
 2017-01-11 17:03:14 +00:00
Luke Barnard 7475056bb4 MELS component should update if there are fewEvents, effectively expanding the summary 2016-12-15 18:33:13 +00:00
Luke Barnard 55f85befc1 Allow component to update if currently expanded or if about to collapse 2016-12-15 14:43:59 +00:00
Luke Barnard 86739e7d1e Simplify handling of only one member event 2016-12-15 13:15:00 +00:00
Luke Barnard c07e5d4992 Improve the performance of MemberEventListSummary 
- The MessagePanel now uses the same key for the MELS instances rendered so that entirely new instances are not created, they are simply passed new props (namely when new events arrive).
- MELS itself now uses `shouldComponentUpdate` so that it only updates if it is given a different number of events to previous or if it is toggled to expand.
 2016-12-14 15:31:35 +00:00
David Baker a3ab59832e Give the search box field a name 
Should fix https://github.com/vector-im/riot-web/issues/2462
 2016-12-06 14:40:09 +00:00
Richard van der Hoff c7fb83ed2d s/block/blacklist for e2e 
Fixes https://github.com/vector-im/vector-web/issues/2315
 2016-11-29 18:48:43 +00:00
Luke Barnard 7e88f0083d Fix more join-part collapsing regressions 
Use the previous content of the first event known for a user in a block of membership changes. This means single events are not special cased.
 2016-11-16 16:26:24 +00:00