Kegan Dougal
c059c9fea5
Merge branch 'develop' into application-services
...
Conflicts:
synapse/handlers/__init__.py
synapse/storage/__init__.py
2015-02-02 15:57:59 +00:00
Mark Haines
6e856d7729
Merge master into develop
...
Conflicts:
README.rst
setup.py
2015-02-02 14:05:42 +00:00
Matthew Hodgson
30ed0884fc
fix OSX stuff and typos
2015-02-02 14:03:03 +00:00
Mark Haines
898835d924
Merge pull request #45 from matrix-org/hotfixes-v0.6.1d
...
Hotfixes v0.6.1d
2015-02-02 13:21:03 +00:00
Mark Haines
d8cf06e525
Bump version to 0.6.1d
2015-02-02 13:18:36 +00:00
Mark Haines
d3dd749044
Pin the version of Twisted to 14.0.2 since we are using some of its internals
2015-02-02 13:17:45 +00:00
Mark Haines
c3979b236e
Tell people to "source" the activate script for virtualenv, Remove --user from pip install
2015-02-02 13:12:06 +00:00
Mark Haines
b993555bf4
Update documentation to recommend virtual env
...
Conflicts:
README.rst
2015-02-02 13:12:06 +00:00
Erik Johnston
bcb8d2fe54
Merge branch 'hotfixes-v0.6.1c' of github.com:matrix-org/synapse
2015-02-02 13:09:48 +00:00
Erik Johnston
83c31735d0
Use >= for version of webclient
2015-02-02 13:07:43 +00:00
Erik Johnston
3b33529dfd
Bump version
2015-02-02 13:03:25 +00:00
Erik Johnston
c934760014
Bump version of webclient pulled in.
2015-02-02 13:03:03 +00:00
David Baker
365e007bee
Ignore empty strings for display names & room names in notifications
2015-01-31 12:48:06 +00:00
Matthew Hodgson
e9dfc4cfae
fix OSX stuff and typos
2015-01-31 06:09:59 +01:00
David Baker
0b354fcb84
Again, don't assume all member events have displayname.
2015-01-30 23:10:35 +00:00
David Baker
fe10b882b7
Don't assume all member events have a display nme.
2015-01-30 23:06:39 +00:00
Erik Johnston
4c0da49d7c
Resign events when we return them via /query_auth/
2015-01-30 22:53:13 +00:00
David Baker
68bd7dfbb7
s/homeserver.config/homeserver.yaml/ because that's what synctl looks for.
2015-01-30 17:37:37 +00:00
David Baker
9ccfdfcd7c
Add twisted to setup requires so it gets processed before setuptools_trial
2015-01-30 17:15:39 +00:00
David Baker
166c2cd4f3
add generate config instruction to the HS setup part
2015-01-30 17:11:29 +00:00
Mark Haines
33cf48118f
Tell people to "source" the activate script for virtualenv, Remove --user from pip install
2015-01-30 17:00:32 +00:00
Mark Haines
e709d61964
Update documentation to recommend virtual env
2015-01-30 16:56:53 +00:00
Mark Haines
0b1cc7cc0b
Return empty list rather than None when there are no emphemeral events for a room
2015-01-30 16:56:13 +00:00
Erik Johnston
2cd29dbdd9
Fix bug where accepting invite over federation didn't work. Add logging.
2015-01-30 16:51:58 +00:00
Erik Johnston
7d897f5bfc
Merge pull request #43 from matrix-org/rejections
...
Rejections
2015-01-30 16:11:14 +00:00
Erik Johnston
88391bcdc3
Allow any greater version for webclient
2015-01-30 16:09:38 +00:00
Erik Johnston
776ac820f9
Briefly doc structure of query_auth API.
2015-01-30 15:58:28 +00:00
Erik Johnston
b724a809c4
Only auth_events with event if event in event.auth_events
2015-01-30 15:57:53 +00:00
Erik Johnston
7a1e881665
Remove debug logging
2015-01-30 15:56:32 +00:00
David Baker
b4b892f4a3
Spit out server default rules too.
2015-01-30 15:54:51 +00:00
Mark Haines
6dc92d3427
Merge pull request #41 from matrix-org/client_v2_sync
...
Client v2 sync
2015-01-30 15:54:25 +00:00
Mark Haines
017dfaef4c
Add doc string for __nonzero__ overrides for sync results, raise not implemented if the client attempts to do a gapless sync
2015-01-30 15:52:05 +00:00
Erik Johnston
1bd540ef79
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
...
Conflicts:
synapse/storage/schema/im.sql
2015-01-30 15:16:38 +00:00
Mark Haines
9ec9d6f2cb
Merge pull request #42 from matrix-org/replication_split
...
Replication split
2015-01-30 15:14:10 +00:00
David Baker
4ffac34a64
Add glob asterisks when running rules.
...
Means that now you can't do exact matches even in override rules,
but I think we can live with that. Advantage is that you'll now
always get back what was put in to the API.
2015-01-30 15:03:56 +00:00
Mark Haines
9bfc8bf752
Merge pull request #40 from matrix-org/rejections_storage
...
Rejections storage
2015-01-30 15:00:56 +00:00
Erik Johnston
91015ad008
Remove merge conflict
2015-01-30 14:58:54 +00:00
Erik Johnston
4f7fe63b6d
Remember to add schema file to list
2015-01-30 14:57:53 +00:00
Erik Johnston
fdd2ac495a
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
...
Conflicts:
synapse/storage/__init__.py
2015-01-30 14:57:33 +00:00
Mark Haines
8bc3066e0b
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-30 14:57:04 +00:00
Erik Johnston
471c47441d
Merge pull request #37 from matrix-org/client_v2_filter
...
Client v2 filter
2015-01-30 14:56:08 +00:00
Mark Haines
e97f756a05
Use 'in' to test if the key exists, remove unused _filters_for_user
2015-01-30 14:54:06 +00:00
Erik Johnston
2f4cb04f45
Be more specific in naming columns in selects.
2015-01-30 14:48:11 +00:00
Erik Johnston
472cf532b7
Put CREATE rejections into seperate .sql
2015-01-30 14:48:03 +00:00
David Baker
322a047502
Add room member count condition and default rule to make a noise on rooms of only 2 people.
2015-01-30 14:46:45 +00:00
Mark Haines
1251d017c1
Merge pull request #38 from matrix-org/new_state_resolution
...
New state resolution
2015-01-30 14:38:30 +00:00
Erik Johnston
3d7026e709
Add a slightly more helpful comment
2015-01-30 14:37:31 +00:00
Erik Johnston
c515d37797
Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections
...
Conflicts:
synapse/storage/schema/delta/v12.sql
2015-01-30 14:19:49 +00:00
Erik Johnston
84b78c3b5f
Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split
2015-01-30 14:17:47 +00:00
Erik Johnston
f7b84eb92a
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
2015-01-30 14:14:27 +00:00
