69c4d7b66e
Merge pull request #118 from matrix-org/dbkr/maysendevent
Richard van der Hoff
2016-03-24 11:43:29 +00:00
d7b3b91eec
Failed to remove extra param
David Baker
2016-03-23 17:08:22 +00:00
88cc63e2a2
Add maySendEvent to match maySendStateEvent. Make them use the same function internally. Also add convenience maySendMessage. Also tests.
David Baker
2016-03-23 15:10:51 +00:00
cdea96fa0a
Release script tweaks
Richard van der Hoff
2016-03-23 14:50:03 +00:00
cfc10fa82d
fix invite picker info again...
Matthew Hodgson
2016-03-23 12:03:56 +00:00
7f95237e02
Prepare changelog for v0.5.0
Richard van der Hoff
2016-03-22 17:56:05 +00:00
e1415d9829
Merge pull request #117 from matrix-org/matthew/roomlist
Matthew Hodgson
2016-03-22 12:30:18 +00:00
19a12b3c79
Merge pull request #115 from matrix-org/rav/txnid_clashes
Richard van der Hoff
2016-03-22 12:20:02 +00:00
bec41e4f94
incorporate review
Matthew Hodgson
2016-03-22 10:20:02 +00:00
5f177aeec4
get/setRoomVisibility API
Matthew Hodgson
2016-03-22 00:55:53 +00:00
b422916452
add to existing users if present, to avoid destroying presence data
Matthew Hodgson
2016-03-21 18:15:55 +00:00
10378c0e7f
Merge pull request #116 from matrix-org/matthew/fix-invite-picker-info
Matthew Hodgson
2016-03-21 16:12:42 +00:00
fba4d5fb0a
Merge pull request #114 from matrix-org/matthew/stop-peeking
Matthew Hodgson
2016-03-21 16:12:29 +00:00
77101823f5
track kicked rooms correctly
Matthew Hodgson
2016-03-19 02:18:37 +00:00
15bc608368
presence no longer returns profile data, so we have to update our store's users based on membership events instead
Matthew Hodgson
2016-03-19 01:45:10 +00:00
dfc4b34d09
Include a counter in generated transaction IDs
Richard van der Hoff
2016-03-18 21:32:15 +00:00
ad9daecbd4
Pass the right options into SyncApi when peeking
Richard van der Hoff
2016-03-18 20:59:23 +00:00
d29302716d
oops
Matthew Hodgson
2016-03-18 19:25:22 +00:00
6c7d13f8ce
API to stop peeking
Matthew Hodgson
2016-03-18 19:22:34 +00:00
e15a2d138c
Merge pull request #112 from matrix-org/rav/cancel_send
Richard van der Hoff
2016-03-18 16:17:44 +00:00
8bc9c19278
Merge pull request #111 from matrix-org/rav/pending_event_list
Richard van der Hoff
2016-03-18 16:17:30 +00:00
dd86fade11
Merge pull request #113 from matrix-org/dbkr/threepid_lookup
David Baker
2016-03-18 15:54:43 +00:00
ba1991aa8f
Add more docs :)
David Baker
2016-03-18 15:54:19 +00:00
f4fd8d9ba6
Add a method to the js sdk to look up 3pids on the ID server.
David Baker
2016-03-18 15:15:10 +00:00
02be0f659a
Support for cancelling pending events
Richard van der Hoff
2016-03-17 20:34:58 +00:00
c7be310bdf
Fix addPendingEvent invocation in unit test
Richard van der Hoff
2016-03-17 22:10:40 +00:00
55d8f56f98
update docs
Richard van der Hoff
2016-03-17 17:53:20 +00:00
ab35fff9e8
Implement 'pendingEventList'
Richard van der Hoff
2016-03-17 12:43:26 +00:00
fdbc7a3112
Merge pull request #110 from matrix-org/rav/refactor_remote_echo
Richard van der Hoff
2016-03-17 16:40:47 +00:00
3c6bd4774d
Refactor transmitted-messages code
Richard van der Hoff
2016-03-15 20:53:26 +00:00
a2861c5781
Merge pull request #109 from matrix-org/rav/log_sync_error_stack
Richard van der Hoff
2016-03-17 14:24:07 +00:00
eaf3fe16eb
sync error: Don't log the exception twice
Richard van der Hoff
2016-03-17 12:05:01 +00:00
963eaf7ec7
Log the stack when we get a sync error
Richard van der Hoff
2016-03-17 11:54:43 +00:00
e6e5b9b748
release.sh: fix -z option
Richard van der Hoff
2016-03-17 01:33:51 +00:00
9ad031c857
Make changelog file and jsdoc generation switchable
Richard van der Hoff
2016-03-17 01:27:48 +00:00
a0d465cb34
Merge master to develop after release
Richard van der Hoff
2016-03-17 01:12:39 +00:00
2dcf5227f0
Merge remote-tracking branch 'origin/master' into develop
Richard van der Hoff
2016-03-17 01:12:18 +00:00
518e92027c
Add missing "Changes in" to changelog
Richard van der Hoff
2016-03-17 01:07:34 +00:00
3d316959f9
Revert this as it just doesn't work - our events are always m.room.members at this point
Matthew Hodgson
2016-03-16 16:44:22 +00:00
8aa3b79501
Merge pull request #107 from matrix-org/revert-106-matthew/fix-displaynames
Matthew Hodgson
2016-03-16 14:49:38 +00:00
f35409700a
Revert "make sure we show display names & avatars on parts, and use the right…"
Matthew Hodgson
2016-03-16 14:49:29 +00:00
b009739b9e
Merge pull request #106 from matrix-org/matthew/fix-displaynames
Matthew Hodgson
2016-03-16 14:39:59 +00:00
f007af741e
Merge pull request #104 from matrix-org/matthew/may-client-send-state
Matthew Hodgson
2016-03-16 14:35:27 +00:00
3db4d9488b
oops, normal events should use the chronologically earlier content, but membership changes should use the current content.
Matthew Hodgson
2016-03-16 14:31:03 +00:00
6b0fa84697
if synapse handed us profile data in the leave event, then use it. unbreaks overzealous tests
Matthew Hodgson
2016-03-16 14:14:14 +00:00