David Baker
dd86fade11
Merge pull request #113 from matrix-org/dbkr/threepid_lookup
...
Add a method to the js sdk to look up 3pids on the ID server.
2016-03-18 15:54:43 +00:00
David Baker
ba1991aa8f
Add more docs :)
2016-03-18 15:54:19 +00:00
David Baker
f4fd8d9ba6
Add a method to the js sdk to look up 3pids on the ID server.
2016-03-18 15:15:10 +00:00
Richard van der Hoff
02be0f659a
Support for cancelling pending events
...
Implement client.cancelPendingEvent which will cancel queued or not_sent events
2016-03-17 22:15:46 +00:00
Richard van der Hoff
c7be310bdf
Fix addPendingEvent invocation in unit test
2016-03-17 22:10:40 +00:00
Richard van der Hoff
55d8f56f98
update docs
2016-03-17 17:53:20 +00:00
Richard van der Hoff
ab35fff9e8
Implement 'pendingEventList'
...
The existing 'pendingEventOrdering'=='end' semantics had been substantially
broken by the introduction of timelines and gappy syncs: after a gappy
sync, pending events would get stuck in the old timeline section. (Part of
https://github.com/vector-im/vector-web/issues/1120 ).
2016-03-17 17:05:23 +00:00
Richard van der Hoff
fdbc7a3112
Merge pull request #110 from matrix-org/rav/refactor_remote_echo
...
Refactor transmitted-messages code
2016-03-17 16:40:47 +00:00
Richard van der Hoff
3c6bd4774d
Refactor transmitted-messages code
...
This is some preparatory work for fixing up the problems with te timeline
ordering of unsent messages
(https://github.com/vector-im/vector-web/issues/1120 ). The functional changes
here should be minimal (bar an extra `Room.localEchoUpdated` when the local
echo is first added to the timeline).
Give `MatrixClient.sendEvent` its own entry point `Room.addPendingMessage`
instead of pushing it through `addEventsToTimeline`; this considerably
simplifies the implementation of the latter and also means that we can contain
the `_txnId` ming to MatrixClient.
Move the code which deals with a successful `/send` response from
`MatrixClient` into `Room.updatePendingEvent`, since it involves fiddling with
the innards of the Room.
Also adds a new EventStatus 'SENT' for events which have been successfully sent
but whose remote echo we still haven't received.
2016-03-17 14:26:36 +00:00
Richard van der Hoff
a2861c5781
Merge pull request #109 from matrix-org/rav/log_sync_error_stack
...
Log the stack when we get a sync error
2016-03-17 14:24:07 +00:00
Richard van der Hoff
eaf3fe16eb
sync error: Don't log the exception twice
...
If we have e.stack, then it will include the description of the exception.
2016-03-17 12:05:01 +00:00
Richard van der Hoff
963eaf7ec7
Log the stack when we get a sync error
...
If we have the stack for an exception in the /sync loop, we should log it.
2016-03-17 11:54:43 +00:00
Richard van der Hoff
e6e5b9b748
release.sh: fix -z option
2016-03-17 01:33:51 +00:00
Richard van der Hoff
9ad031c857
Make changelog file and jsdoc generation switchable
2016-03-17 01:27:48 +00:00
Richard van der Hoff
a0d465cb34
Merge master to develop after release
2016-03-17 01:12:39 +00:00
Richard van der Hoff
2dcf5227f0
Merge remote-tracking branch 'origin/master' into develop
2016-03-17 01:12:18 +00:00
Richard van der Hoff
518e92027c
Add missing "Changes in" to changelog
2016-03-17 01:07:34 +00:00
Matthew Hodgson
ebc95667b8
workaround for unicode regexp matches - https://github.com/vector-im/vector-web/issues/568
2016-03-17 01:02:50 +00:00
Richard van der Hoff
ad5d07caf8
0.4.2
2016-03-17 00:58:33 +00:00
Richard van der Hoff
b2d7abc0a1
Prepare changelog for v0.4.2
2016-03-17 00:58:16 +00:00
Richard van der Hoff
cc475e6392
add jsdoc as dev dependency
2016-03-17 00:58:16 +00:00
Richard van der Hoff
e4c6717bd5
Don't fail release if dist dir already exists
2016-03-17 00:58:16 +00:00
Richard van der Hoff
53f813207e
Add option to skip changelog generation
2016-03-17 00:45:39 +00:00
Richard van der Hoff
873fde27ac
Don't error if changelog is unchanged
2016-03-17 00:33:01 +00:00
Richard van der Hoff
8d9d638953
release.sh: fix 'read' syntax
2016-03-17 00:22:37 +00:00
Richard van der Hoff
2f93490054
Don't create release branch if we're already there
2016-03-17 00:19:30 +00:00
Richard van der Hoff
e22efc9dd5
release.sh: chmod +x
2016-03-16 23:40:44 +00:00
Richard van der Hoff
e7ac80cf2b
Script to do releases
2016-03-16 23:12:38 +00:00
Richard van der Hoff
4436087777
Use npm version to do release stuff
2016-03-16 23:12:38 +00:00
Matthew Hodgson
f7bc11361c
trivially add content.currently_active in m.presence events.
2016-03-16 22:35:55 +00:00
Matthew Hodgson
a68b61dafe
oops, revert accidental merge
2016-03-16 17:33:30 +00:00
Matthew Hodgson
84c9876b3a
if synapse handed us profile data in the leave event, then use it. unbreaks overzealous tests
2016-03-16 17:32:47 +00:00
Matthew Hodgson
de864c489a
make sure we show display names & avatars on parts, and use the right type of content for displaynames for member events in general. fixes https://github.com/vector-im/vector-web/issues/1140 and https://github.com/vector-im/vector-web/issues/873 and a bunch more
2016-03-16 17:32:47 +00:00
Matthew Hodgson
2c277f7d96
Merge pull request #108 from matrix-org/matthew/fix-displaynames
...
Matthew/fix displaynames
2016-03-16 17:31:41 +00:00
Kegan Dougal
d0560f594d
Set the right .sender value for m.room.member events
2016-03-16 17:18:33 +00:00
Matthew Hodgson
60b6310494
typo
2016-03-16 16:47:25 +00:00
Matthew Hodgson
abd27f9b75
failing test for https://github.com/vector-im/vector-web/issues/1140
2016-03-16 16:45:23 +00:00
Matthew Hodgson
3d316959f9
Revert this as it just doesn't work - our events are always m.room.members at this point
2016-03-16 16:44:22 +00:00
Matthew Hodgson
8aa3b79501
Merge pull request #107 from matrix-org/revert-106-matthew/fix-displaynames
...
Revert "make sure we show display names & avatars on parts, and use the right…"
2016-03-16 14:49:38 +00:00
Matthew Hodgson
f35409700a
Revert "make sure we show display names & avatars on parts, and use the right…"
2016-03-16 14:49:29 +00:00
Matthew Hodgson
b009739b9e
Merge pull request #106 from matrix-org/matthew/fix-displaynames
...
make sure we show display names & avatars on parts, and use the right…
2016-03-16 14:39:59 +00:00
Matthew Hodgson
f007af741e
Merge pull request #104 from matrix-org/matthew/may-client-send-state
...
Add RoomState.mayClientSendStateEvent()
2016-03-16 14:35:27 +00:00
Matthew Hodgson
3db4d9488b
oops, normal events should use the chronologically earlier content, but membership changes should use the current content.
2016-03-16 14:31:03 +00:00
Matthew Hodgson
6b0fa84697
if synapse handed us profile data in the leave event, then use it. unbreaks overzealous tests
2016-03-16 14:14:14 +00:00
Matthew Hodgson
98b0cf2560
make sure we show display names & avatars on parts, and use the right type of content for displaynames for member events in general. fixes https://github.com/vector-im/vector-web/issues/1140 and https://github.com/vector-im/vector-web/issues/873 and a bunch more
2016-03-16 13:51:55 +00:00
Matthew Hodgson
372759b6e4
fix lint
2016-03-16 13:43:38 +00:00
Matthew Hodgson
ec29b4ffeb
Add RoomState.mayClientSendStateEvent()
2016-03-16 13:08:36 +00:00
Matthew Hodgson
95494933fd
Merge pull request #103 from matrix-org/matthew/peek-presence
...
make presence work when peeking.
2016-03-16 11:55:25 +00:00
Matthew Hodgson
6fff29c07b
oops, that map should be a forEach
2016-03-16 11:54:56 +00:00
David Baker
6f7ed93b87
Merge pull request #100 from matrix-org/dbkr/session_logged_out
...
Add Session.logged_out event
2016-03-16 10:44:01 +00:00
