lukebarnard
867a532e5e
Remove parentDiv from tests
2017-01-18 11:58:54 +01:00
lukebarnard
78e2c787e0
Refactor and document test helpers.
2017-01-18 11:53:17 +01: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
lukebarnard
49f2b9df88
Remove duplicate test
2017-01-17 18:53:38 +01:00
lukebarnard
ade7c65617
Add test for MemberEventListSummary
2017-01-17 12:01:54 +01: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
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
David Baker
1f96467145
Merge pull request #609 from matrix-org/luke/fix-join-part-collapsing-redacted-joins
...
Fix redacted member events being visible
2017-01-11 17:10:35 +00:00
David Baker
4e1af30186
Merge pull request #611 from matrix-org/luke/fix-join-part-collapsing-use-state-key
...
Use `getStateKey` instead of `getSender`
2017-01-11 17:09:14 +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
6e2a75bbee
Fix redacted member events being visible
...
This was due to the `MemberEventListSummary` not ignoring redacted joins/leaves. This was also causing bug #2765 .
2017-01-11 11:27:07 +00:00
David Baker
e95f5b959f
Merge pull request #608 from matrix-org/dbkr/move_screen_sharing_error
...
Move screen sharing error check into platform
2017-01-11 10:12:51 +00:00
David Baker
37d9108ceb
Add error popup if screen sharing fails
2017-01-11 10:06:48 +00:00
David Baker
a16aae1124
Move screen sharing error check into platform
...
Because on the browser it depends on HTTPS, on electron it doesn't
matter.
2017-01-10 18:37:57 +00:00
David Baker
085f134e84
Merge pull request #606 from matrix-org/dbkr/fix_forgot_password_create_account
...
Fix 'create account' link in 'forgot password'
2017-01-10 15:27:51 +00:00
David Baker
13a5337e0f
Fix 'create account' link in 'forgot password'
...
Fixes https://github.com/vector-im/riot-web/issues/2853
2017-01-10 15:16:39 +00:00
Richard van der Hoff
42de77e588
Remove "Cannot re-join empty room" error
...
This is a lying error message. burn it with fire
2016-12-27 19:17:48 +00:00
Matthew Hodgson
9c4671568d
fix disasterous thinko in 69b277b282
2016-12-24 22:33:04 +00:00
Matthew Hodgson
97514cf80e
Merge branch 'master' into develop
2016-12-24 19:03:42 +00:00
Matthew Hodgson
45bfb93f17
v0.8.4
2016-12-24 19:03:08 +00:00
Matthew Hodgson
b88afab7af
Prepare changelog for v0.8.4
2016-12-24 19:03:07 +00:00
Matthew Hodgson
223caae842
Merge branch 'master' into develop
2016-12-24 18:54:00 +00:00
Matthew Hodgson
1976bb70bd
v0.8.3-electron
2016-12-24 18:53:24 +00:00
Matthew Hodgson
2e888f7f27
Prepare changelog for v0.8.3-electron
2016-12-24 18:53:24 +00:00
Matthew Hodgson
7d42ef90d6
improve captcha warning
2016-12-24 18:49:03 +00:00
Matthew Hodgson
386770a22a
ask electron users to do captchas in a web browser.
...
This will happen anyway when they follow email verification links.
make captchas poll for success so if they are completed elsewhere, electron moves on
2016-12-24 18:48:58 +00:00
Matthew Hodgson
1b46ab7a80
blind fix for captcha on electron
2016-12-24 18:48:52 +00:00
Matthew Hodgson
e2e3bc0637
improve captcha warning
2016-12-24 18:40:20 +00:00
Matthew Hodgson
cb7ef76dcb
Merge pull request #601 from matrix-org/matthew/electron-captcha2
...
Let electron users complete captchas in a web browser
2016-12-24 18:38:40 +00:00
Matthew Hodgson
69b277b282
ask electron users to do captchas in a web browser.
...
This will happen anyway when they follow email verification links.
make captchas poll for success so if they are completed elsewhere, electron moves on
2016-12-24 03:15:30 +00:00
Matthew Hodgson
b1c4c759f4
blind fix for captcha on electron
2016-12-23 14:35:40 +00:00
Luke Barnard
2a63017372
Account for timezone in date separator calculation ( #595 )
...
* Account for timezone in date separator calculation
Decide on date separators using MatrixEvent.getDate(). This requires matrix-org/matrix-js-sdk#311
2016-12-22 17:54:30 +00:00
David Baker
fd44d9f4d6
Merge pull request #597 from matrix-org/dbkr/delete_threepid
...
Add support for deleting threepids
2016-12-22 15:31:34 +00:00
David Baker
8a3f2d9e91
Merge pull request #598 from matrix-org/dbkr/display_msisdn_threepid
...
Display msisdn threepids as 'Phone'
2016-12-22 15:28:09 +00:00
David Baker
a6fdbda011
Get variable name right
2016-12-22 15:26:08 +00:00
David Baker
98b22460ec
They're not all emails anymore
2016-12-22 15:03:24 +00:00
David Baker
9cbe401866
Back to js-sdk develop
2016-12-22 14:13:48 +00:00
David Baker
9bf98161a2
v0.8.3
2016-12-22 14:09:42 +00:00
David Baker
df1d48b6a6
Prepare changelog for v0.8.3
2016-12-22 14:09:42 +00:00
David Baker
57412b3315
released matrix-js-sdk
2016-12-22 14:06:42 +00:00
Matthew Hodgson
645349f542
Merge pull request #599 from DanielDent/unbranded-error-messages
...
Unbranded error messages
2016-12-21 22:46:38 +00:00
