David Baker
bbf3b2637a
Re-apply: 5297855ad3
...
Separate the actual processing of the sync response from the loop doing the requests.
2016-01-29 11:25:01 +00:00
David Baker
04a1c4f1a2
Revert "Separate the actual processing of the sync response from the loop doing the requests."
...
This reverts commit 5297855ad3
2016-01-29 11:17:12 +00:00
David Baker
5297855ad3
Separate the actual processing of the sync response from the loop doing the requests.
2016-01-29 11:05:32 +00:00
Richard van der Hoff
a221674680
Merge pull request #64 from matrix-org/rav/timeline_window
...
TimelineWindow object
2016-01-28 16:46:03 +00:00
Richard van der Hoff
8db95f42fb
Add some unit tests for TimelineWindow.
2016-01-28 16:38:45 +00:00
Richard van der Hoff
b42e5d5fcf
Address review comments
...
Rearrange a couple of things for clarity, and add some comments.
2016-01-28 12:36:12 +00:00
Richard van der Hoff
b1e2090eef
TimelineWindow object
...
A handy thing for tracking a window into a room timeline
Could really do with some unit tests... sorry.
2016-01-27 09:53:15 +00:00
Richard van der Hoff
8716185f4a
Merge pull request #63 from matrix-org/rav/context
...
Support for non-contiguous event timelines
2016-01-27 09:50:57 +00:00
Richard van der Hoff
3c2fad7c8d
Merge remote-tracking branch 'origin/develop' into rav/context
2016-01-27 09:49:00 +00:00
Richard van der Hoff
60a243f160
Rename 'exceptFail' to 'failTest', and move it out to test-utils.js
2016-01-27 09:48:28 +00:00
Richard van der Hoff
a87cefa035
Replace the boolean args on EventTimeline methods with constants
2016-01-26 22:38:26 +00:00
Richard van der Hoff
101d3952d3
Test that the pagination tokens actually start at null
2016-01-26 21:25:10 +00:00
Richard van der Hoff
a01501b42c
Address a number of review comments.
...
Make sure that room state is copied correctly when resetting the live
timeline.
Also comments and bits.
2016-01-26 18:09:15 +00:00
David Baker
d37369b463
Merge pull request #70 from matrix-org/dbkr/receipt_local_echo
...
Add local echo for read receipts.
2016-01-26 14:11:49 +00:00
David Baker
0c3abcccf2
camelCase
2016-01-26 14:11:36 +00:00
Richard van der Hoff
48d1bc3158
Fix incompatibility with peeking.
...
The peek code needs to make sure it sets the pagination token /after/ adding
the events to the timeline, otherwise it will get reset when the events
are added.
2016-01-26 11:21:49 +00:00
David Baker
15e8784daf
Add local echo for read receipts. Fixes https://github.com/vector-im/vector-web/issues/623
2016-01-25 17:49:41 +00:00
Richard van der Hoff
840b8f0bc0
Merge branch 'develop' into rav/context
...
Conflicts:
lib/models/room.js
2016-01-25 10:45:22 +00:00
Kegsay
7a4cc62280
Merge pull request #69 from matrix-org/kegan/sync-keep-alive
...
Implement a keep-alive timer for /sync requests
2016-01-22 16:23:43 +00:00
Kegan Dougal
f8ec35691f
Interrupt /sync backoff when keep-alive succeeds in order to immediately retry if we were waiting
2016-01-21 18:02:26 +00:00
Kegan Dougal
c5e7df8975
Hit /versions instead of / since it is actually a known endpoint
2016-01-21 17:52:52 +00:00
Kegan Dougal
7bdab05785
Unbreak tests
2016-01-21 17:34:12 +00:00
Kegan Dougal
197144dcda
Implement a keep-alive timer for /sync requests
...
When a /sync request fails, we spin up a keep-alive poll to /_matrix/client/r0
which 400s. We treat any HTTP response code as a success for the purposes of
polling the server. When a successful poll is done, we shoot the current /sync
request in the head immediately (via a hacky abort() on the promise) and retry
the /sync.
2016-01-21 17:17:27 +00:00
Kegan Dougal
ff990914b2
Remove low client-side timeouts hack
2016-01-21 16:12:07 +00:00
David Baker
4bc2869522
Merge pull request #68 from matrix-org/dbkr/new_unread_count_format
...
Update for new unread count format
2016-01-21 09:54:51 +00:00
David Baker
1f1d743678
Merge remote-tracking branch 'origin/develop' into dbkr/new_unread_count_format
2016-01-21 09:50:20 +00:00
Matthew Hodgson
787c0ebabc
fix another test
2016-01-21 00:14:29 +00:00
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
