Commit graph

5646 commits

Author SHA1 Message Date
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
6b52b247e7 Update comment on MELS key 2016-12-15 18:26:41 +00:00
Luke Barnard
88aeb6417e Use the first member event ID or "initial" in the MELS key 2016-12-15 18:23:54 +00:00
Kegsay
71132c4610 Merge pull request #592 from matrix-org/kegan/bulk-reject-invites
Implement bulk invite rejections
2016-12-15 16:16:55 +00:00
Kegan Dougal
ec41fc284a Null guard on componentWillUnmount 2016-12-15 16:13:09 +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
Kegan Dougal
8a511ed54b Add .done() to catch exceptions which may be thrown in setState 2016-12-15 14:17:29 +00:00
Luke Barnard
e7564f4dc5 Spelling 2016-12-15 13:16:36 +00:00
Luke Barnard
86739e7d1e Simplify handling of only one member event 2016-12-15 13:15:00 +00:00
Richard van der Hoff
238a30789f Merge pull request #591 from matrix-org/luke/fix-wantsdateseparator-performance
Fix performance issues with wantsDateSeperator
2016-12-15 12:45:18 +00:00
Kegan Dougal
8f42134d9f Explain why binding 2016-12-14 16:04:20 +00:00
Luke Barnard
b908e7ef29 Fix performance issues with wantsDateSeperator
This was causing rendering of MemberEventListSummary to be quite slow. Instead of creating two date objects, just check to see if they represent timestamps that happened on different days.
2016-12-14 16:01:32 +00:00
Kegan Dougal
13dfe9ef0f Implement bulk invite rejects 2016-12-14 16:00:50 +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
Kegan Dougal
1d4591ce68 Add UI in UserSettings for bulk rejecting invites 2016-12-14 15:01:50 +00:00
David Baker
1fbc938f87 js-sdk develop 2016-12-09 19:57:44 +00:00
David Baker
9f2c453643 Merge branch 'master' into develop 2016-12-09 19:57:08 +00:00
David Baker
57c56992f1 v0.8.1 2016-12-09 19:53:27 +00:00
David Baker
fc39b35369 One more, one more try 2016-12-09 19:52:40 +00:00
David Baker
8ea299bcea v0.8.1 2016-12-09 19:51:27 +00:00
David Baker
15f556406f One more try... 2016-12-09 19:50:02 +00:00
David Baker
fb95b71f7b v0.8.1 2016-12-09 19:48:27 +00:00
David Baker
3ddeece619 Back to rc temporarily 2016-12-09 19:47:28 +00:00
David Baker
56d51687f9 v0.8.1 2016-12-09 19:34:21 +00:00
David Baker
eb6492200d Prepare changelog for v0.8.1 2016-12-09 19:34:21 +00:00
David Baker
d0850d67cd js-sdk 0.7.1 2016-12-09 19:32:27 +00:00
Kegsay
21e7b03e53 Merge pull request #586 from matrix-org/kegan/read-receipt-show-time-on-hover
Add read receipt times to the hovertip of read markers
2016-12-09 13:19:44 +00:00
Kegan Dougal
5d99d68a64 Show the full date and time if the receipt was sent days after the event 2016-12-09 11:43:23 +00:00
Kegan Dougal
49010c3e93 Refactor how 'readReceipts' are passed into EventTiles
Instead of passing a list of RoomMembers, pass a list of records with a
`roomMember` prop and a `ts` prop so we can display the timestamp on hover.
2016-12-09 11:24:10 +00:00
David Baker
aed5a95c8f Merge pull request #589 from matrix-org/dbkr/dont_crash_if_no_dmroommap
Don't throw exception on stop if no DMRoomMap
2016-12-09 11:04:33 +00:00
David Baker
6a017ba763 Merge pull request #587 from matrix-org/dbkr/fix_test_fail
Fix failing test
2016-12-09 11:04:23 +00:00
David Baker
e52907a462 Missed semicolon 2016-12-09 10:59:05 +00:00
David Baker
8d1095bc26 Don't throw exception on stop if no DMRoomMap
Prevents an exception when running the riot 'loading' tests in
isolation
2016-12-09 10:32:56 +00:00
David Baker
289f8ab439 Fix failing test
For some reason, update webpack causes the promise to no longer
complete by the next tick. Change the test to not depend on how
fast the promise goes through.
2016-12-08 18:44:38 +00:00
Kegan Dougal
bd7553d1ea Add read receipt times to the hovertip of read markers
Fixes #2709. Surprisingly, this data was never passed down to
ReadReceiptMarker.
2016-12-08 16:23:20 +00:00
David Baker
a297015d27 v0.8.1-rc.2 2016-12-06 16:04:05 +00:00
David Baker
a8a07a01de Prepare changelog for v0.8.1-rc.2 2016-12-06 16:04:05 +00:00
David Baker
1006d50a0d Merge remote-tracking branch 'origin/develop' into release-v0.8.1 2016-12-06 16:02:14 +00:00
Richard van der Hoff
587325b36c Merge pull request #585 from matrix-org/dbkr/fix_exception_roomdir
Fix exception when clearing room dir search
2016-12-06 15:58:07 +00:00
David Baker
fe0dc85d66 Merge pull request #583 from matrix-org/luke/fix-post-message-api-origin-check
Allow integration UI URLs with paths
2016-12-06 15:00:26 +00:00
David Baker
9e3c94edf4 Fix exception when clearing room dir search
Needed more isMounted checks after promises return.
2016-12-06 14:59:10 +00:00
Richard van der Hoff
b3f642e835 Merge pull request #584 from matrix-org/dbkr/search_box_field_name
Give the search box field a name
2016-12-06 14:48:25 +00:00
Richard van der Hoff
004b420eaa Merge pull request #582 from matrix-org/dbkr/fix_notification_click
Pass the room object into displayNotification
2016-12-06 14:47:37 +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
Luke Barnard
ef1cb9530f Allow integration UI URLs with paths
The postMessage API assumed that event origins contained paths of their window origins, but they do not (https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage). This changes the origin check such that the integrations UI URL must start with the event origin.
2016-12-06 14:30:21 +00:00
David Baker
28e663dd48 Pass the room object into displayNotification
It needs it to do the view_room if the notification is clicked.
2016-12-06 13:27:36 +00:00
Richard van der Hoff
c0b931a837 Merge pull request #581 from matrix-org/dbkr/dont_crash_settings_if_no_e2e
Don't throw an exception entering settings page
2016-12-06 09:49:55 +00:00
David Baker
6777e07a41 Remove device name from crypto section
As it was getting it by assuming our device was the first one,
which is just not a valid assumption.
2016-12-05 20:03:43 +00:00
David Baker
8ffe14881e Don't throw an exception entering settings page
if end to end encryption is disabled (eg. if you're a guest and
the server is too old to support e2e for guests).
2016-12-05 18:33:38 +00:00
David Baker
66f72e674b v0.8.1-rc.1 2016-12-05 17:51:04 +00:00