Matthew Hodgson
d559ad794a
STUPID LINE LENGTH LIMITS
2016-01-21 00:10:15 +00:00
Matthew Hodgson
24655ac60e
missing semicolon
2016-01-21 00:02:24 +00:00
Matthew Hodgson
5fd0ea2f6f
fix test
2016-01-20 23:56:16 +00:00
Matthew Hodgson
eaf7b03bb1
if we are the only person in a room, call it an 'Empty room' too, given this is how humans see a room if they're the only person in it...
2016-01-20 23:55:09 +00:00
David Baker
d375804cd6
Merge branch 'develop' into dbkr/new_unread_count_format
2016-01-20 18:53:14 +00:00
David Baker
a24a9d35c4
Fix PR comments: typos and redundant line
2016-01-20 18:52:32 +00:00
Kegan Dougal
a0d81fccdb
Fix test
2016-01-20 17:29:27 +00:00
David Baker
b4e4aaff00
Merge branch 'develop' into dbkr/new_unread_count_format
2016-01-20 17:25:54 +00:00
Matthew Hodgson
3a73b54e4a
.name defaults to mxid
2016-01-20 17:22:16 +00:00
David Baker
5ec0fce2a4
style
2016-01-20 17:19:26 +00:00
Matthew Hodgson
8b7497374f
name self-chats by displayname if possible rather than mxid, and name empty-chats as 'Empty room' rather than the fugly '?'
2016-01-20 17:19:13 +00:00
David Baker
8cb180525e
Add getter/setter for unread notif counts.
2016-01-20 17:16:20 +00:00
Kegan Dougal
6df9d08dc1
Fix tests
2016-01-20 15:59:34 +00:00
David Baker
b3c06dd723
Update for new unread count format
2016-01-20 15:59:06 +00:00
Kegan Dougal
2a88b8db4e
Improve performance of hasMembershipState to not be stupid
2016-01-20 15:09:35 +00:00
Kegsay
31c29b7e5e
Merge pull request #67 from matrix-org/kegan/address-book
...
Make getUsers() return users for *EEEEEVERYOOOOONE*
2016-01-19 12:51:16 +00:00
Kegan Dougal
865db906e3
Make getUsers() return users for *EEEEEVERYOOOOONE* regardless of presence events
2016-01-19 11:40:08 +00:00
manuroe
0b52a7e7c9
Merge branch 'push-rules-settings' into develop
...
# Conflicts:
# lib/sync.js
2016-01-18 17:35:51 +01:00
manuroe
80f7220a7b
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# lib/sync.js
2016-01-18 17:33:13 +01:00
manuroe
2e664adb32
Updated push rules methods after review
2016-01-18 17:22:35 +01:00
Kegan Dougal
14ef9348be
Add getUsers()
2016-01-18 12:05:26 +00:00
Kegsay
3c170bf063
Merge pull request #66 from matrix-org/matthew/roomsettings2
...
deleteAlias() support
2016-01-18 10:27:58 +00:00
Kegan Dougal
3e67406a30
Tweak docs
2016-01-18 10:27:43 +00:00
Matthew Hodgson
d6075bb5bd
add an XXX
2016-01-17 23:32:00 +00:00
Matthew Hodgson
d8e56dad1b
oops
2016-01-16 01:01:11 +00:00
Matthew Hodgson
67872206ff
deleteAlias() support
2016-01-16 00:58:44 +00:00
Richard van der Hoff
43e7173c30
fix some racy tests
2016-01-16 00:18:51 +00:00
Richard van der Hoff
e0ddd65922
Address review comments
...
Improve comments and naming.
2016-01-15 23:50:09 +00:00
Richard van der Hoff
dfb2fa821d
minor jsdoc fixes
2016-01-15 17:11:00 +00:00
Richard van der Hoff
fce7248ed5
Flag the top of the timeline when we hit it
2016-01-15 17:10:01 +00:00
Richard van der Hoff
e68ab7d54a
Tweak duplicateStrategy code to reduce diff
2016-01-15 13:23:51 +00:00
Richard van der Hoff
706966ffe9
Support for non-contiguous event timelines
...
This provides optional support for fetching old events via the /context API,
and paginating backwards and forwards from them, eventually merging into the
live timeline.
To support it, events are now stored in an EventTimeline, rather than directly
in an array in the Room; the old names are maintained as references for
compatibility.
The feature has to be enabled explicitly, otherwise it would be impossible for
existing clients to back-paginate to the old events after a gappy /sync.
Still TODO here:
* An object which provides a window into the timelines to make them possible to
use. This will be a separate PR.
* Rewrite the 'EventContext' used by the searchRoomEvents API in terms of an
EventTimeline - it is essentially a subset.
2016-01-15 13:19:11 +00:00
manuroe
e3b4cb03e1
Fixed Jenkins tests complaints
2016-01-14 19:17:08 +01:00
manuroe
8011aab561
Added MatrixClient getRoomPushRule and setRoomMutePushRule methods
2016-01-14 18:58:15 +01:00
Matthew Hodgson
a8d24798e6
oooooooops... let's pretend nobody saw this
2016-01-14 17:23:04 +00:00
Kegan Dougal
e4c38ac78c
Linting
2016-01-13 15:31:27 +00:00
Kegan Dougal
5fa6f0037f
Cache the third_party_invite token to allow constant time lookups
2016-01-13 15:31:27 +00:00
Matthew Hodgson
a0df2a70cd
s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit'
2016-01-13 14:02:26 +00:00
Kegan Dougal
0bab00c47c
Add debug logging to sync polling. Add speculative fix for vector-im/vector-web#544
2016-01-13 13:17:21 +00:00
Matthew Hodgson
f48fb34818
Merge pull request #62 from matrix-org/matthew/roomsettings2
...
Room.getImplicitRoomName
2016-01-13 12:58:52 +00:00
Matthew Hodgson
8810ff2256
merge and add null check
2016-01-13 12:58:46 +00:00
Matthew Hodgson
17efc5163f
Merge branch 'develop' into matthew/roomsettings2
2016-01-13 12:55:30 +00:00
Matthew Hodgson
3ce07a020d
ooops - fix getDomain expression
2016-01-13 12:52:22 +00:00
Matthew Hodgson
71abef0117
fix merge conflict
2016-01-13 12:46:47 +00:00
Matthew Hodgson
a79270b8f8
Merge pull request #61 from matrix-org/matthew/accountdata
...
implement account data
2016-01-13 12:43:53 +00:00
Matthew Hodgson
87db054e22
fix jsdoc
2016-01-13 12:43:42 +00:00
Kegan Dougal
ae06dd2ab8
Fix thinko where idServerRequests return strings
2016-01-12 17:23:50 +00:00
Matthew Hodgson
88c7293838
based on PR review, rewrite account_data support to avoid tracking the section that events came from, and instead having /sync results piped into the right bit of the room directly
2016-01-11 19:25:44 +00:00
Matthew Hodgson
051e83582b
add a cli.getDomain() method rather than react-sdk maintaining its own (multiple) implementations
2016-01-11 18:23:07 +00:00
Matthew Hodgson
57072bc4f4
s/implicit/ignoreRoomNameEvent/ on calculateRoomName
2016-01-11 18:20:26 +00:00
