Erik Johnston
7a8307fe7c
Merge branch 'master' of github.com:matrix-org/synapse into develop
2014-09-25 18:21:42 +01:00
Erik Johnston
697f6714a4
Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse
2014-09-25 18:21:00 +01:00
David Baker
ec5fb77a66
Just use a yaml list for turn servers
2014-09-25 19:18:32 +02:00
Erik Johnston
f1c9ab4e4f
More change log lines
2014-09-25 18:10:02 +01:00
Erik Johnston
3b0fb6aae8
Bump version and changelog
2014-09-25 18:05:06 +01:00
David Baker
6e72ee62ae
Add realm to coturn options (it needs it).
2014-09-25 17:21:52 +01:00
Erik Johnston
37bfe44046
Merge branch 'deletions' of github.com:matrix-org/synapse into develop
2014-09-25 17:02:53 +01:00
David Baker
48ea055781
fix rst warnings
2014-09-25 17:01:27 +01:00
Erik Johnston
dcadfbbd4a
Don't strip out null's in serialized events, as that is not need anymore and it's not in the spec (yet)
2014-09-25 17:00:17 +01:00
David Baker
9bcedf224e
add howto for setting up your very own TURN server
2014-09-25 16:58:21 +01:00
Erik Johnston
69ddec6589
Don't strip of False values from events when serializing
2014-09-25 16:49:02 +01:00
Erik Johnston
72e80dbe0e
Rename redaction test case to something helpful
2014-09-25 15:52:23 +01:00
Erik Johnston
c818aa13eb
Add LIMIT to scalar subquery
2014-09-25 15:51:21 +01:00
Erik Johnston
ba87eb6753
Fix bug where we tried to insert state events with null state key
2014-09-25 14:45:27 +01:00
Emmanuel ROHEE
d170fbdb9f
BF: Do a pagination when opening a room from an invitation
2014-09-25 14:46:11 +02:00
David Baker
c58eb0d5a3
Merge branch 'turn' into develop
2014-09-25 13:09:56 +01:00
Erik Johnston
59f2bef187
Fix test where we changed arguments used to call the notifier
2014-09-25 13:04:33 +01:00
Erik Johnston
1ca51c8586
SYN-46: An invite received from fedearation didn't wake up the event stream for the invited user.
2014-09-25 13:01:05 +01:00
David Baker
c0936b103c
Add stun server fallback and I-told-you-so message if we get no TURN server and the connection fails.
2014-09-25 11:14:29 +01:00
Emmanuel ROHEE
9d3246ed12
Fixed SYWEB-36: use getUserDisplayName for disambiguating display name in member list and message sender name. This method is robust when disambiguation is no more required
2014-09-25 11:49:43 +02:00
Emmanuel ROHEE
ef99a5d972
getUserDisplayName: Disambiguate users who have the same displayname in the room.
...
Displayname are then disambiguate where it is necessary
2014-09-25 11:45:01 +02:00
David Baker
a31bf77776
Make turn server endpoint return an empty object if no turn servers to
...
match the normal response. Don't break if the turn_uris option isn't
present.
2014-09-25 11:24:49 +02:00
Erik Johnston
24e4c48468
More tests.
2014-09-25 10:19:16 +01:00
Erik Johnston
2721f5ccc9
Add test for redactions
2014-09-25 10:02:20 +01:00
David Baker
6806caffc7
Refresh turn server before the ttl runs out. Support firefox.
2014-09-24 17:57:34 +01:00
Mark Haines
52ca867670
Sign federation transactions
2014-09-24 17:25:41 +01:00
Erik Johnston
72eb360f2d
Don't set the room name to be the room alias on room creation if the client didn't supply a name
2014-09-24 16:59:57 +01:00
Emmanuel ROHEE
2b4736afcd
Fixed getUserDisplayname when the user has a null displayname
2014-09-24 17:42:40 +02:00
David Baker
7dc7c53029
The REST API spec only alows for returning a single server so name the
...
endpoint appropriately.
2014-09-24 17:28:47 +02:00
Erik Johnston
327dcc98e3
SYN-70: And fix another bug where I can't type
2014-09-24 16:19:29 +01:00
Erik Johnston
87deaf1658
SYN-70: Fix typo
2014-09-24 16:15:58 +01:00
David Baker
7679ee7321
Hopefully implement turn in the web client (probably wrong for Firefox because Firefox is a special snowflake)
2014-09-24 16:08:31 +01:00
David Baker
4553651138
Oops
2014-09-24 17:04:33 +02:00
David Baker
5383ba5587
rename endpoint to better reflect what it is and allow specifying multiple uris
2014-09-24 16:01:36 +01:00
Emmanuel ROHEE
432e8ef2bc
Fixed SYWEB-74: Emote desktop notifications sometimes lack a name: "undefined waves"
2014-09-24 16:52:48 +02:00
Erik Johnston
70899d3ab2
Rename deletions to redactions
2014-09-24 15:27:59 +01:00
David Baker
b42b0d3fe5
Use standard base64 encoding with padding to get the same result as
...
coturn.
2014-09-24 15:29:24 +02:00
Erik Johnston
7d9a84a445
Make deleting deletes not undelete
2014-09-24 14:18:08 +01:00
Erik Johnston
1e6c5b205c
Fix bug where we didn't correctly pull out the event_id of the deletion
2014-09-24 13:29:20 +01:00
Emmanuel ROHEE
c7620cca6f
SYWEB-27: Public rooms with 2 users must not considered as 1:1 chat room and so, they must no be renamed
2014-09-24 13:17:47 +02:00
Emmanuel ROHEE
b02bb18a70
Fixed SYWEB-28: show displayname changes in recents
2014-09-24 12:48:24 +02:00
Erik Johnston
4e79b09dd9
Fill out the prune_event method.
2014-09-24 11:37:14 +01:00
Emmanuel ROHEE
6f5970a2e1
Added hasOwnProperty tests when required to be robust to random properties added to he Object prototype
2014-09-24 12:22:40 +02:00
Erik Johnston
3d2cca6762
Fix test.
2014-09-24 11:17:43 +01:00
Erik Johnston
4354590a69
Add v4 deltas to current sql.
2014-09-24 11:06:41 +01:00
Emmanuel ROHEE
ef5b39c410
State data now provides up-to-date users displaynames. So use it first.
...
Continue to use presence data as fallback solution which is required when users do not join the room yet.
Created eventHandlerService.getUserDisplayName() as a single point to compute display name.
2014-09-24 11:04:27 +02:00
Matthew Hodgson
7b8e24a588
close buttons on recents (SYWEB-68)
2014-09-24 01:12:59 +01:00
Matthew Hodgson
53841642a8
close buttons on recents (SYWEB-68)
2014-09-24 01:12:45 +01:00
Matthew Hodgson
b08112f936
on safari at least keypress's event.which returns ASCII rather than keycodes, so 38 & 40 was swallowing ( and & rather than up-arrow and down-arrow(!)
2014-09-23 23:35:17 +01:00
Matthew Hodgson
53ae5bce13
comment-convo with kegan
2014-09-23 23:25:56 +01:00
