Erik Johnston
|
8a59915d7d
|
Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop
|
2015-02-16 09:47:22 +00:00 |
|
Erik Johnston
|
6dd5c95841
|
Bump version
|
2015-02-15 20:38:52 +00:00 |
|
Erik Johnston
|
b99a33f283
|
resolve_events expect lists, not dicts
|
2015-02-15 20:20:51 +00:00 |
|
Erik Johnston
|
5f68529036
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-02-13 16:21:30 +00:00 |
|
David Baker
|
64def4f953
|
Merge branch 'hotfixes-0.7.0e' into develop
|
2015-02-13 16:18:34 +00:00 |
|
Erik Johnston
|
a78838c5ba
|
Bump version
|
2015-02-13 16:17:54 +00:00 |
|
David Baker
|
8d5cce62ab
|
Update pushers by app id and pushkey, not user id and pushkey
|
2015-02-13 16:16:16 +00:00 |
|
Erik Johnston
|
650dc7f0f9
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-02-13 15:46:42 +00:00 |
|
Erik Johnston
|
be26697b29
|
Bump version
|
2015-02-13 15:37:35 +00:00 |
|
Erik Johnston
|
b11a6e1c3c
|
Fix wrong variable name
|
2015-02-13 15:37:18 +00:00 |
|
Mark Haines
|
0d872f5aa6
|
Merge pull request #50 from matrix-org/application-services
Application Services
|
2015-02-13 15:06:14 +00:00 |
|
Mark Haines
|
fa662b52d0
|
Merge pull request #72 from matrix-org/in_memory_sqlite_for_testing
Prepare the database whenever a connection is opened from the db_pool so...
|
2015-02-13 14:42:27 +00:00 |
|
Mark Haines
|
183b3d4e47
|
Prepare the database whenever a connection is opened from the db_pool so that in-memory databases will work
|
2015-02-13 14:38:24 +00:00 |
|
Erik Johnston
|
0546126cc5
|
Bump version
|
2015-02-13 14:36:40 +00:00 |
|
Erik Johnston
|
e441c10a73
|
pyflakes
|
2015-02-13 14:23:39 +00:00 |
|
Erik Johnston
|
8c652a2b5f
|
When we see a difference in current state, actually use state conflict resolution algorithm
|
2015-02-13 14:20:05 +00:00 |
|
Erik Johnston
|
6375abcdac
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-02-13 13:34:25 +00:00 |
|
Erik Johnston
|
c09493d7aa
|
Bump version
|
2015-02-13 13:33:37 +00:00 |
|
Erik Johnston
|
74626a8de4
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-02-13 10:09:55 +00:00 |
|
Paul "LeoNerd" Evans
|
55e0916ffc
|
Reindent code to be less human-readable to keep pep8 from complaining
|
2015-02-12 21:04:34 +00:00 |
|
Paul "LeoNerd" Evans
|
f22646efcc
|
Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)
|
2015-02-12 21:01:29 +00:00 |
|
Erik Johnston
|
789251afa7
|
Fix logging
|
2015-02-12 19:29:43 +00:00 |
|
Erik Johnston
|
38df10b99e
|
Remove unused function
|
2015-02-12 19:29:32 +00:00 |
|
Paul "LeoNerd" Evans
|
93d07c87dc
|
Reindent code to be less human-readable to keep pep8 from complaining
|
2015-02-12 19:19:37 +00:00 |
|
Paul "LeoNerd" Evans
|
5f6e6530d0
|
Appease pyflakes
|
2015-02-12 19:15:23 +00:00 |
|
Paul "LeoNerd" Evans
|
29805213d1
|
Can now remove the FIXME too
|
2015-02-12 19:13:21 +00:00 |
|
Paul "LeoNerd" Evans
|
860b1b4841
|
Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)
|
2015-02-12 19:13:21 +00:00 |
|
Erik Johnston
|
58d848adc0
|
Parrellize fetching of events
|
2015-02-12 18:35:36 +00:00 |
|
Erik Johnston
|
963256638d
|
Correctly handle all the places that can throw exceptions
|
2015-02-12 18:17:11 +00:00 |
|
Erik Johnston
|
48fbe79f71
|
Bump version
|
2015-02-12 14:52:02 +00:00 |
|
Erik Johnston
|
6b186a57ba
|
Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0a
|
2015-02-12 14:51:46 +00:00 |
|
Erik Johnston
|
717687e1fc
|
Get an auth query one at a time
|
2015-02-12 14:39:31 +00:00 |
|
Erik Johnston
|
a566ed2f0e
|
Bump webclient version
|
2015-02-12 10:49:07 +00:00 |
|
Erik Johnston
|
83d41f25d8
|
Set database schema version in delta
|
2015-02-12 10:05:47 +00:00 |
|
Erik Johnston
|
ff2a2ae56e
|
Bump version
|
2015-02-12 10:02:06 +00:00 |
|
Erik Johnston
|
8bbdf32849
|
Convert get_rooms to use runInteraction so the transacion has a more helpful description
|
2015-02-11 18:56:13 +00:00 |
|
Erik Johnston
|
2bf0e85f3d
|
Use encode_canonical_json for http client
|
2015-02-11 17:34:23 +00:00 |
|
Erik Johnston
|
e9e54449f5
|
Use encode_canonical_json for pushes
|
2015-02-11 17:32:42 +00:00 |
|
Erik Johnston
|
af89456c3c
|
Update dependency links
|
2015-02-11 17:15:16 +00:00 |
|
Erik Johnston
|
c52e8d395b
|
Merge pull request #61 from matrix-org/timeout-federation-requests
Timeout federation requests
|
2015-02-11 17:10:33 +00:00 |
|
Erik Johnston
|
021d93db11
|
Merge pull request #62 from matrix-org/state-chache
State chache
|
2015-02-11 17:10:28 +00:00 |
|
Erik Johnston
|
a793a0b810
|
Bump syutil version
|
2015-02-11 17:02:52 +00:00 |
|
Erik Johnston
|
42bc56dad3
|
Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson
|
2015-02-11 17:01:38 +00:00 |
|
Mark Haines
|
9c24cff6ef
|
Allow newer versions of syutil
|
2015-02-11 17:00:32 +00:00 |
|
Erik Johnston
|
7eef84a95b
|
pyflakes
|
2015-02-11 16:52:22 +00:00 |
|
Erik Johnston
|
76935078d1
|
Remove more debug logging
|
2015-02-11 16:51:22 +00:00 |
|
Erik Johnston
|
ed877d6585
|
Remove debug logging
|
2015-02-11 16:50:46 +00:00 |
|
Erik Johnston
|
ef276e8770
|
Fix so timing out connections to actually work.
|
2015-02-11 16:48:05 +00:00 |
|
Kegan Dougal
|
f2fdcb7c4b
|
Merge branch 'develop' into application-services
|
2015-02-11 16:43:26 +00:00 |
|
Kegan Dougal
|
f518324426
|
Minor tweaks based on PR feedback.
|
2015-02-11 16:41:16 +00:00 |