0b52a7e7c9
Merge branch 'push-rules-settings' into develop
...
# Conflicts:
# lib/sync.js
2016-01-18 17:35:51 +01:00
80f7220a7b
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# lib/sync.js
2016-01-18 17:33:13 +01:00
2e664adb32
Updated push rules methods after review
2016-01-18 17:22:35 +01:00
14ef9348be
Add getUsers()
2016-01-18 12:05:26 +00:00
3c170bf063
Merge pull request #66 from matrix-org/matthew/roomsettings2
...
deleteAlias() support
2016-01-18 10:27:58 +00:00
3e67406a30
Tweak docs
2016-01-18 10:27:43 +00:00
d6075bb5bd
add an XXX
2016-01-17 23:32:00 +00:00
d8e56dad1b
oops
2016-01-16 01:01:11 +00:00
67872206ff
deleteAlias() support
2016-01-16 00:58:44 +00:00
43e7173c30
fix some racy tests
2016-01-16 00:18:51 +00:00
e0ddd65922
Address review comments
...
Improve comments and naming.
2016-01-15 23:50:09 +00:00
dfb2fa821d
minor jsdoc fixes
2016-01-15 17:11:00 +00:00
fce7248ed5
Flag the top of the timeline when we hit it
2016-01-15 17:10:01 +00:00
e68ab7d54a
Tweak duplicateStrategy code to reduce diff
2016-01-15 13:23:51 +00:00
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
e3b4cb03e1
Fixed Jenkins tests complaints
2016-01-14 19:17:08 +01:00
8011aab561
Added MatrixClient getRoomPushRule and setRoomMutePushRule methods
2016-01-14 18:58:15 +01:00
a8d24798e6
oooooooops... let's pretend nobody saw this
2016-01-14 17:23:04 +00:00
e4c38ac78c
Linting
2016-01-13 15:31:27 +00:00
5fa6f0037f
Cache the third_party_invite token to allow constant time lookups
2016-01-13 15:31:27 +00:00
a0df2a70cd
s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit'
2016-01-13 14:02:26 +00:00
0bab00c47c
Add debug logging to sync polling. Add speculative fix for vector-im/vector-web#544
2016-01-13 13:17:21 +00:00
f48fb34818
Merge pull request #62 from matrix-org/matthew/roomsettings2
...
Room.getImplicitRoomName
2016-01-13 12:58:52 +00:00
8810ff2256
merge and add null check
2016-01-13 12:58:46 +00:00
17efc5163f
Merge branch 'develop' into matthew/roomsettings2
2016-01-13 12:55:30 +00:00
3ce07a020d
ooops - fix getDomain expression
2016-01-13 12:52:22 +00:00
71abef0117
fix merge conflict
2016-01-13 12:46:47 +00:00
a79270b8f8
Merge pull request #61 from matrix-org/matthew/accountdata
...
implement account data
2016-01-13 12:43:53 +00:00
87db054e22
fix jsdoc
2016-01-13 12:43:42 +00:00
ae06dd2ab8
Fix thinko where idServerRequests return strings
2016-01-12 17:23:50 +00:00
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
051e83582b
add a cli.getDomain() method rather than react-sdk maintaining its own (multiple) implementations
2016-01-11 18:23:07 +00:00
57072bc4f4
s/implicit/ignoreRoomNameEvent/ on calculateRoomName
2016-01-11 18:20:26 +00:00
e8f77256de
Set the updated .sender and .target props on the event when the event itself updates these props.
2016-01-11 17:35:46 +00:00
51fe73bc27
Return v2 prev_content when calling getPrevContent()
2016-01-11 17:15:52 +00:00
97003f7382
Use timeout=0 rather than timeout=1 because of SYN-588
...
Fixes https://github.com/vector-im/vector-web/issues/606
2016-01-11 16:33:43 +00:00
c10218a1fa
Fixed Jenkins tests complaints
2016-01-11 17:12:28 +01:00
5c59a2ea3e
Fixed MatrixClient pushRules method and ivar clash.
...
Added MatrixClient.setPushRuleEnabled method.
2016-01-11 17:00:05 +01:00
0b79ac1386
Merge pull request #60 from matrix-org/kegan/guest-access
...
Add constructs for guest access
2016-01-11 15:19:14 +00:00
4fe95f18b9
More commenting on the creation of guest filters
2016-01-11 14:52:06 +00:00
db5ca49ee2
Linting
2016-01-11 09:31:00 +00:00
d7158b575f
fix trailing space
2016-01-10 20:05:58 +00:00
678d70528e
add a Room.getImplicitRoomName so clients can know what a room would be called if it didn't have an explicit m.room.name state event
2016-01-10 20:02:35 +00:00
02b33766ee
Document the order of the room timeline because I can never remember which way round it is.
2016-01-08 20:26:07 +00:00
9bd45cf7c7
more lint and thinkos
2016-01-08 03:45:05 +00:00
c64aebdb17
lint and thinkos
2016-01-08 03:41:05 +00:00
387ad09c5f
implement account data
2016-01-08 03:22:08 +00:00
ea3bd1450e
Add functions to support upgrading guest accounts
2016-01-07 17:23:56 +00:00
8f4bd9c693
NOP typing/receipts when a guest
2016-01-07 15:03:37 +00:00
cdb4bc5107
Implement peek syncing.
...
This involves hitting room initial sync then /events?room_id=!thing:here
It even works.
2016-01-07 14:58:28 +00:00
manuroe