Luke Barnard
566034cf2b
Render children EventTiles before passing to summary element
2016-11-10 13:25:48 +00:00
Luke Barnard
764959ec1c
Comment on i after membershipchanges
2016-11-10 13:14:04 +00:00
Luke Barnard
0ec5eebfc9
Hoist isMembershipChange out of for loop
2016-11-10 13:03:17 +00:00
Luke Barnard
d01bb0b78f
Use sdk.getComponent
2016-11-10 13:01:48 +00:00
Luke Barnard
79c01fa1a4
Remove empty lines
2016-11-10 11:03:43 +00:00
Luke Barnard
f5bc8d1fe0
Removed logs, updated phrasing on 'others joined'
...
Now it's:
1 user joined and left
>1 others joined and left
2016-11-10 10:42:33 +00:00
Luke Barnard
5f0b891d47
Add date seperator to the expanded events
...
netsplits across midnight is not handled, and @richvdh suggested splitting the list in two
2016-11-09 17:44:43 +00:00
Luke Barnard
04a934f738
Trying to get rid of the date separator problem
2016-11-09 16:24:56 +00:00
Luke Barnard
2f02c4b84e
WIP nicer join/part folding
2016-11-09 16:03:35 +00:00
Luke Barnard
cd241a4a17
Truncate consecutive member events
...
This is needed for the IRC bridge to be able to do full membership list syncing without cluttering the message panel.
2016-11-08 16:34:02 +00:00
Luke Barnard
5a61a1e6e1
Merge pull request #543 from matrix-org/luke/feature-show-integration-error-popup
...
Show the error that occured when trying to reach scalar
2016-11-08 11:27:32 +00:00
Luke Barnard
de83e578e7
Use generic error message
2016-11-08 11:18:44 +00:00
Luke Barnard
c0c662aeaf
Show the error that occured when trying to reach scalar
...
Instead of removing the button and printing an error to console, show the error in a popup that appears next to the `Manage Integrations` button.
2016-11-08 10:57:48 +00:00
David Baker
884ae0e218
Merge pull request #541 from matrix-org/dbkr/dont_preview_matrix_to
...
Don't do URL previews for matrix.to
2016-11-07 12:32:33 +00:00
David Baker
5c2c01d414
Fix function to consistently return boolean
2016-11-07 11:45:55 +00:00
David Baker
2bb7aec0de
Don't do URL previews for matrix.to
2016-11-07 10:57:08 +00:00
David Baker
b86f9f362a
Merge pull request #540 from matrix-org/rav/fix_npe
...
Fix NPE in LoggedInView
2016-11-07 09:57:46 +00:00
Richard van der Hoff
2ee98e9fdc
Fix NPE in LoggedInView
...
Fixes a NPE displaying the new version bar
(also fix displayname for WithMatrixClient)
2016-11-07 09:28:10 +00:00
David Baker
c973dbf1c4
0.7.5 has been released
2016-11-04 13:02:12 +00:00
Richard van der Hoff
5ac0aac65b
Merge pull request #538 from matrix-org/dbkr/matrix_to_links
...
Make room alias & user ID links matrix.to links
2016-11-04 11:42:49 +00:00
David Baker
04c27205a3
Make room alias & user ID links matrix.to links
2016-11-04 11:38:28 +00:00
David Baker
3a0b63dbda
Merge pull request #537 from matrix-org/rav/memberinfo_use_client_from_context
...
Make MemberInfo use the matrixclient from the context
2016-11-04 10:59:11 +00:00
David Baker
f301e55b6e
Merge remote-tracking branch 'origin/develop' into rav/memberinfo_use_client_from_context
2016-11-04 10:54:32 +00:00
David Baker
0ab46df94a
Merge pull request #536 from matrix-org/rav/add_client_to_context
...
Add the MatrixClient to the react context
2016-11-04 10:54:11 +00:00
David Baker
da10660c86
Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context
2016-11-04 10:35:41 +00:00
David Baker
bd36792303
Merge pull request #535 from matrix-org/rav/factor_out_loggedinpanel
...
Factor out LoggedInView from MatrixChat
2016-11-04 10:34:52 +00:00
David Baker
6de5713543
Merge branch 'master' into develop
2016-11-04 10:11:24 +00:00
David Baker
1368d90e66
v0.7.5
2016-11-04 10:09:11 +00:00
David Baker
d7bc408070
Prepare changelog for v0.7.5
2016-11-04 10:09:10 +00:00
David Baker
fa967da2a9
matrix-js-sdk 0.6.4
2016-11-04 10:07:50 +00:00
Richard van der Hoff
cb5b311e44
Move saveScrollState into RoomView
...
It fits much more naturally here than in LoggedInView.
2016-11-04 09:28:35 +00:00
Richard van der Hoff
ab7007784f
Make MemberInfo use the matrixclient from the context
...
An arbitrary component to demonstrate how this works
2016-11-03 19:05:48 +00:00
Richard van der Hoff
d3f20e1d9d
Add the MatrixClient to the react context
...
Because that's the reacty way
2016-11-03 19:02:27 +00:00
Richard van der Hoff
f85a37c667
Factor out LoggedInView from MatrixChat
...
The idea here is to make a layer which sits around for as long as we have a
valid MatrixClient. Also it makes a plausible split for the render of
MatrixChat, even if they are much too tightly bound for now.
2016-11-03 18:59:32 +00:00
David Baker
31a47a9efd
Merge pull request #532 from matrix-org/dbkr/platform_version
...
Move 'new version' support into Platform
2016-11-03 13:30:30 +00:00
David Baker
8cafe4936d
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-03 11:51:06 +00:00
David Baker
d408b7c180
Fix copyright
2016-11-03 11:47:57 +00:00
David Baker
5ae4228bfe
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-02 19:45:40 +00:00
David Baker
0944408946
Merge pull request #534 from matrix-org/dbkr/platform_notification
...
Move Notifications into Platform
2016-11-02 19:44:12 +00:00
David Baker
743e54f9bb
Specify promise arg
2016-11-02 19:23:09 +00:00
David Baker
bd3fa6a7c5
Move version specific stuff to vector
2016-11-02 17:44:57 +00:00
David Baker
920e3346dc
Move Notifications into Platform
...
Also add support for clearing notifications if the Platform
supports it.
2016-11-02 17:35:31 +00:00
Richard van der Hoff
b057577b15
Merge branch 'develop' into dbkr/platform_version
2016-11-02 16:34:43 +00:00
David Baker
58c0e0e056
Merge pull request #531 from matrix-org/dbkr/platform
...
Move platform-specific functionality into Platform
2016-11-02 16:20:20 +00:00
David Baker
29bdf992ff
s/fir/for/
2016-11-02 16:15:35 +00:00
David Baker
3c4370c180
Move 'new version' support into Platform
...
Also adds support for the platform providing a changelog
2016-11-02 15:58:17 +00:00
David Baker
f433f9ca32
Move platform-specific functionality into Platform
...
Platform classes are provided by the application via
PlatformPeg.set().
2016-11-02 15:10:21 +00:00
David Baker
f2e59f1bd3
matrix-js-sdk dep back to develop
2016-11-02 11:10:20 +00:00
David Baker
a8a6a9d73d
v0.7.5-rc.1
2016-11-02 11:08:02 +00:00
David Baker
6cd55e0811
Prepare changelog for v0.7.5-rc.1
2016-11-02 11:08:02 +00:00
