Erik Johnston
acb19068d0
Return /sync when something under the 'leave' key has changed
2016-01-05 14:49:06 +00:00
Erik Johnston
d74c4e90d4
Merge pull request #460 from matrix-org/erikj/create_room_3pid_invite
...
Support inviting 3pids in /createRoom
2016-01-05 14:06:23 +00:00
Erik Johnston
c3ea36304b
Use named args
2016-01-05 12:57:45 +00:00
Erik Johnston
1b5642604b
Support inviting 3pids in /createRoom
2016-01-05 11:56:21 +00:00
Erik Johnston
07c33eff43
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-01-05 10:25:13 +00:00
Matthew Hodgson
dc65d0ae9d
typoe
2016-01-04 17:23:15 +00:00
Matthew Hodgson
b18b99eb14
fix another whitespace rst bug
2016-01-04 17:17:27 +00:00
Matthew Hodgson
5680be70ae
fix whitespace bug
2016-01-04 17:13:52 +00:00
Mark Haines
f35f8d06ea
Merge remote-tracking branch 'origin/release-v0.12.0'
2016-01-04 14:02:50 +00:00
Mark Haines
d2709a5389
Bump changelog and version for v0.12.0
2016-01-04 13:57:39 +00:00
Richard van der Hoff
34c09f33da
Update CHANGES
2016-01-04 12:45:58 +00:00
Richard van der Hoff
cf3282d103
Merge pull request #459 from matrix-org/rav/fix_r0_login
...
Expose /login under r0
2016-01-04 12:41:53 +00:00
Richard van der Hoff
32d9fd0b26
Expose /login under r0
...
The spec says /login should be available at r0 and 'unstable', so make it so.
2016-01-02 17:24:28 +00:00
Mark Haines
c6e79c84de
Bump version and update changelog for v0.12.0-rc3
2015-12-23 16:15:54 +00:00
Mark Haines
8d6dde7825
Merge pull request #457 from matrix-org/markjh/cached_sync
...
Add a cache for initialSync responses that expires after 5 minutes
2015-12-23 16:04:52 +00:00
Mark Haines
d12c00bdc3
Add some docstring explaining the snapshot cache does
2015-12-23 15:18:11 +00:00
Mark Haines
ba39d3d5d7
Merge pull request #458 from matrix-org/markjh/guest_auth
...
Missing yield on guest access auth check
Needs matrix-org/sytest#125 to land first
2015-12-23 14:10:09 +00:00
Mark Haines
f3948e001f
Missing yield on guest access auth check
...
Needs matrix-org/sytest#125 to land first
2015-12-23 14:10:06 +00:00
Mark Haines
7fa71e3267
Add a unit test for the snapshot cache
2015-12-23 11:48:03 +00:00
Mark Haines
517fb9a023
Move the doc string to the public facing method
2015-12-22 18:53:47 +00:00
Mark Haines
9ac417fa88
Add a cache for initialSync responses that expires after 5 minutes
2015-12-22 18:27:56 +00:00
Mark Haines
7df276d219
Merge pull request #455 from matrix-org/markjh/guest_access
...
Allow guest access to /sync
2015-12-22 16:09:23 +00:00
Mark Haines
0ee0138325
Include the list of bad room ids in the error
2015-12-22 15:49:32 +00:00
Mark Haines
251aafccca
Use a list comprehension
2015-12-22 14:03:24 +00:00
Mark Haines
c058625959
Merge remote-tracking branch 'origin/develop' into markjh/guest_access
...
Conflicts:
synapse/api/filtering.py
2015-12-22 13:58:18 +00:00
Mark Haines
cdd04f7055
Hook up read receipts and typing notifications for guest access
2015-12-22 11:59:55 +00:00
Mark Haines
542ab0f886
Merge branch 'develop' into markjh/guest_access
2015-12-22 11:49:12 +00:00
Mark Haines
e525b46f12
Merge pull request #454 from matrix-org/markjh/room_filtering
...
Add top level filters for filtering by room id
Documented by matrix-org/matrix-doc#246
2015-12-22 11:40:35 +00:00
Mark Haines
b9b4466d0d
Add top level filters for filtering by room id
...
Documented by matrix-org/matrix-doc#246
2015-12-22 11:40:32 +00:00
Mark Haines
c3fff251a9
Allow guest access to /sync
2015-12-22 11:21:03 +00:00
Mark Haines
45a9e0ae0c
Allow guest access if the user provides a list of rooms in the filter
2015-12-22 10:25:46 +00:00
Mark Haines
489a4cd1cf
Add top level filtering by room id
2015-12-21 21:10:41 +00:00
Mark Haines
2a2b2ef834
Remove bogus comment about branch coverage
2015-12-21 20:21:52 +00:00
Daniel Wagner-Hall
2e2eeb43a6
Merge pull request #453 from matrix-org/daniel/avatarurls
...
Return room avatar URLs in /publicRooms
Spec: https://github.com/matrix-org/matrix-doc/pull/244
Tests: https://github.com/matrix-org/sytest/pull/121
2015-12-21 20:38:16 +01:00
Daniel Wagner-Hall
7f3148865c
Return room avatar URLs in /publicRooms
...
Spec: https://github.com/matrix-org/matrix-doc/pull/244
Tests: https://github.com/matrix-org/sytest/pull/121
2015-12-21 19:38:04 +00:00
Mark Haines
bb9c7f2dd9
Delete all the .coverage files, including the combined .coverage
2015-12-21 17:51:57 +00:00
Mark Haines
9036d2d6a8
Use an absolute path when specifying the directory for synapse in jenkins.sh
2015-12-21 17:15:05 +00:00
Mark Haines
64b6606824
Remove accidentally committed debug logging
2015-12-21 15:22:03 +00:00
Mark Haines
42a7a09eea
Merge pull request #452 from matrix-org/paul/SYN-558
...
Actually look up required remote server key IDs
2015-12-21 11:01:56 +00:00
Paul "LeoNerd" Evans
a6ba41e078
Actually look up required remote server key IDs
...
set.union() is a side-effect-free function that returns the union of two
sets. This clearly wanted .update(), which is the side-effecting mutator
version.
2015-12-18 21:36:42 +00:00
Mark Haines
f85949bde0
Merge pull request #451 from matrix-org/markjh/branch_coverage
...
Generate code coverage report when running jenkins.sh
2015-12-18 20:44:50 +00:00
Mark Haines
2f871ad143
Generate code coverage report when running jenkins.sh
2015-12-18 20:44:47 +00:00
Matthew Hodgson
c8ea2d5b1f
Merge pull request #450 from matrix-org/matthew/no-identicons
...
Matthew/no identicons
2015-12-18 18:14:06 +00:00
David Baker
0a2d73fd60
Merge branch 'release-v0.12.0' into develop
2015-12-18 10:07:48 +00:00
David Baker
ce4999268a
Fix typo that broke registration on the mobile clients
2015-12-18 10:07:28 +00:00
Daniel Wagner-Hall
633ceb9bb1
Merge pull request #449 from matrix-org/daniel/3pid
...
Add display_name to 3pid invite in m.room.member invites
2015-12-18 09:55:59 +01:00
Matthew Hodgson
64374bda5b
fix indentation level
2015-12-17 23:04:53 +00:00
Matthew Hodgson
772ad4f715
stop generating default identicons. reverts most of 582019f870 and solves vector-web/vector-im#346
2015-12-17 23:04:20 +00:00
Daniel Wagner-Hall
bdacee476d
Add display_name to 3pid invite in m.room.member invites
2015-12-17 18:55:08 +01:00
Daniel Wagner-Hall
10f82b4bea
Merge pull request #448 from matrix-org/daniel/3pid
...
Strip address and such out of 3pid invites
2015-12-17 18:29:22 +01:00
