|  Erik Johnston | ee06023573 | Get the equalities right. | 2014-08-29 13:28:06 +01:00 | 
				
					
						|  Erik Johnston | 47fb286184 | Merge branch 'presence_logging' into develop | 2014-08-29 12:10:00 +01:00 | 
				
					
						|  Erik Johnston | 5dd38d579b | Fix a couple of bugs in presence handler related to pushing updatesto the correct user. Fix presence tests. | 2014-08-29 12:08:33 +01:00 | 
				
					
						|  Erik Johnston | 8113eb7c79 | Turn of trace_function logging | 2014-08-28 18:45:00 +01:00 | 
				
					
						|  Erik Johnston | aaf4fd98ee | Only poll remote users if they are in our presence list, rather than in a common room | 2014-08-28 18:43:03 +01:00 | 
				
					
						|  Mark Haines | 722c19d033 | Fix FederationHandler to event.origin | 2014-08-28 18:32:44 +01:00 | 
				
					
						|  Erik Johnston | 1b7686329e | Don't query the rooms members table so much by using the new notifier api that allows you to specify room_ids to notify. | 2014-08-28 17:43:15 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | 2c7c12bc6e | Initial room event stream token must be s0, not s1, or everyone will miss the very first room event | 2014-08-28 17:39:34 +01:00 | 
				
					
						|  Erik Johnston | 54d0a75573 | Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging Conflicts:
	synapse/handlers/presence.py | 2014-08-28 16:52:46 +01:00 | 
				
					
						|  Erik Johnston | a8d318cf82 | Up timeout to 10 minutes | 2014-08-28 16:44:09 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | efc5f3440d | Only send presence "poll"/"unpoll" EDUs when changing from/to zero remotes | 2014-08-28 16:43:55 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | b1da3fa0a7 | Avoid AlreadyCalledError from EDU sending failures | 2014-08-28 16:19:16 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | c46c806126 | Re-enable presence, un-skip presence tests | 2014-08-28 16:00:14 +01:00 | 
				
					
						|  Erik Johnston | eb3094ed31 | And more logging. | 2014-08-28 15:58:38 +01:00 | 
				
					
						|  Mark Haines | 7b079a26a5 | Remove get_state_for_room function from federation handler | 2014-08-28 15:32:38 +01:00 | 
				
					
						|  Mark Haines | bddc1d9fff | use @wraps to set the __name__ __module__ and __doc__ correctly for logged functions | 2014-08-28 15:32:38 +01:00 | 
				
					
						|  Erik Johnston | e0ba81344c | Add more logging. Up the event stream timer to 10s | 2014-08-28 15:30:42 +01:00 | 
				
					
						|  Erik Johnston | b8b52ca09d | Add logging to try and figure out what is going on with the presence stuff | 2014-08-28 14:58:51 +01:00 | 
				
					
						|  Kegan Dougal | 8d7d251c35 | Support multiple login flows when deciding how to login. Updated cmdclient and spec. Webclient doesn't need updating for this. | 2014-08-28 14:56:55 +01:00 | 
				
					
						|  Mark Haines | 7acede1e42 | Fix pyflakes warnings | 2014-08-28 13:51:50 +01:00 | 
				
					
						|  Mark Haines | 15ab5f5ad8 | Merge backfill_ and backfill in federation handler | 2014-08-28 13:45:35 +01:00 | 
				
					
						|  Erik Johnston | b485d622cc | Fix bug where we used UserID objects instead of strigns | 2014-08-28 13:40:27 +01:00 | 
				
					
						|  Erik Johnston | f3f32addca | Fix typo in NullSource.get_pagination_rows. Remove unused import. | 2014-08-28 10:57:53 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | 407c86c013 | Define a NullSource useful for unit-testing | 2014-08-27 18:30:09 +01:00 | 
				
					
						|  Erik Johnston | c2b4b73751 | Split out MessageHandler | 2014-08-27 17:59:36 +01:00 | 
				
					
						|  Mark Haines | 357dd1871d | Merge branch 'develop' into storage_transactions Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py | 2014-08-27 17:28:55 +01:00 | 
				
					
						|  Erik Johnston | 410a74b0f3 | If timeout=0, return immediately | 2014-08-27 17:21:48 +01:00 | 
				
					
						|  Mark Haines | 2aeaa7b77c | Merge branch 'develop' into storage_transactions Conflicts:
	synapse/handlers/room.py
	synapse/storage/stream.py | 2014-08-27 17:15:58 +01:00 | 
				
					
						|  Erik Johnston | 7c89d5e97a | Merge branch 'develop' of github.com:matrix-org/synapse into develop | 2014-08-27 17:05:48 +01:00 | 
				
					
						|  Erik Johnston | 226025e9ca | Comments! | 2014-08-27 17:04:47 +01:00 | 
				
					
						|  Mark Haines | f54b70520a | Return the store_id from persist_event | 2014-08-27 17:03:45 +01:00 | 
				
					
						|  Mark Haines | 1d95e78759 | Merge branch 'develop' into storage_transactions | 2014-08-27 16:54:12 +01:00 | 
				
					
						|  Mark Haines | b30358f439 | add _get_room_member, fix datastore methods | 2014-08-27 16:51:54 +01:00 | 
				
					
						|  Kegan Dougal | f64887e15c | Added RestServlet for /rooms/$roomid/initialSync | 2014-08-27 16:49:01 +01:00 | 
				
					
						|  Erik Johnston | 52cb5e6324 | Remove stale FIXMEs | 2014-08-27 16:44:29 +01:00 | 
				
					
						|  Kegan Dougal | 4e8d19ee2b | Added RestServlet for /rooms/$roomid/state | 2014-08-27 16:42:33 +01:00 | 
				
					
						|  Erik Johnston | 8af5e360d6 | Remove store_id from notifier.on_new_room_event calls. | 2014-08-27 16:23:33 +01:00 | 
				
					
						|  Erik Johnston | 7917ff1271 | Turn off presence again. | 2014-08-27 16:09:48 +01:00 | 
				
					
						|  Erik Johnston | 08881d808d | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | 2014-08-27 15:34:01 +01:00 | 
				
					
						|  Erik Johnston | bfe9faad5a | Index sources in a nicer fashion. | 2014-08-27 15:33:52 +01:00 | 
				
					
						|  Erik Johnston | 05672a6a8c | Convert get_paginat_rows to use PaginationConfig. This allows people to supply directions. | 2014-08-27 15:25:27 +01:00 | 
				
					
						|  Mark Haines | a0d1f5a014 | Start updating state handling to use snapshots | 2014-08-27 15:11:51 +01:00 | 
				
					
						|  Kegan Dougal | c585c87c4b | Renamed /ds to /directory | 2014-08-27 14:54:29 +01:00 | 
				
					
						|  Kegan Dougal | 1d9d287c7c | Renamed /public/rooms to /publicRooms | 2014-08-27 14:52:07 +01:00 | 
				
					
						|  Mark Haines | 46a2f6a816 | Remove call to get_federation from homeserver | 2014-08-27 14:36:20 +01:00 | 
				
					
						|  Mark Haines | a03c7f27a8 | Fill out prev_events before calling persist_event | 2014-08-27 14:32:19 +01:00 | 
				
					
						|  Erik Johnston | 77a255c7c3 | PEP8 tweaks. | 2014-08-27 14:19:39 +01:00 | 
				
					
						|  Erik Johnston | 47519cd8c2 | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor Conflicts:
	synapse/handlers/events.py
	synapse/rest/events.py
	synapse/rest/room.py | 2014-08-27 14:13:06 +01:00 | 
				
					
						|  Erik Johnston | bd16b93e8f | Implement presence event source. Change the way the notifier indexes listeners | 2014-08-27 14:03:27 +01:00 | 
				
					
						|  Paul "LeoNerd" Evans | 05fa81fee4 | A reliable logger.info() message /after/ the TCP port has been opened and is listening; this is essential for avoiding races in wrapper scripts e.g. integration testing | 2014-08-27 13:08:55 +01:00 |