Mark Haines
							
						 | 
						
							
							
							
							
								
							
								d2798de660
								
							
								
							
						 | 
						
							
							
								
								Fold federation/handler into handlers/federation
							
							
							
							
							
						 | 
						
							2014-08-26 19:49:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								67c5f89244
								
							
								
							
						 | 
						
							
							
								
								Enable presence again. Fix up api to match old api.
							
							
							
							
							
						 | 
						
							2014-08-26 19:40:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3a2a5b959c
								
							
								
							
						 | 
						
							
							
								
								WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model.
							
							
							
							
							
						 | 
						
							2014-08-26 18:57:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a498df0428
								
							
								
							
						 | 
						
							
							
								
								Move new event boilerplate in room handlers into a method on a base clase.
							
							
							
							
							
						 | 
						
							2014-08-26 18:49:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9a93e83d90
								
							
								
							
						 | 
						
							
							
								
								Respect 'limit' param in initialSync api
							
							
							
							
							
						 | 
						
							2014-08-26 16:26:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								47c1a3d454
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into storage_transactions
							
							
							
							
							
						 | 
						
							2014-08-26 16:15:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								3281fec07a
								
							
								
							
						 | 
						
							
							
								
								Use state_key rather than target_user_id
							
							
							
							
							
						 | 
						
							2014-08-26 16:14:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a29d12a18a
								
							
								
							
						 | 
						
							
							
								
								Use state_key rather than target_user_id
							
							
							
							
							
						 | 
						
							2014-08-26 16:13:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4b63b06cad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into storage_transactions
							
							
							
							
							
							
							
							Conflicts:
	synapse/api/auth.py
	synapse/handlers/room.py
	synapse/storage/__init__.py 
							
						 | 
						
							2014-08-26 16:07:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								ac21dfff6d
								
							
								
							
						 | 
						
							
							
								
								Fix pyflakes errors
							
							
							
							
							
						 | 
						
							2014-08-26 16:02:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								32347bfcc9
								
							
								
							
						 | 
						
							
							
								
								fix a few pyflakes errors
							
							
							
							
							
						 | 
						
							2014-08-26 16:01:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								a664ec20e0
								
							
								
							
						 | 
						
							
							
								
								Add a do_users_share_a_room method and use that in the presence handler.
							
							
							
							
							
						 | 
						
							2014-08-26 13:38:26 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								47c3a089c5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
							
							
							
							
							
						 | 
						
							2014-08-26 09:26:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								cab3095803
								
							
								
							
						 | 
						
							
							
								
								Removed member list servlet: now using generic state paths.
							
							
							
							
							
						 | 
						
							2014-08-26 09:26:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								cda4ff8519
								
							
								
							
						 | 
						
							
							
								
								Oops, we need to use defer.returnValue.
							
							
							
							
							
						 | 
						
							2014-08-22 18:23:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5b058a79cb
								
							
								
							
						 | 
						
							
							
								
								Make is_presence_visible always return true as it was thrashing the database.
							
							
							
							
							
						 | 
						
							2014-08-22 18:21:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b18db63c06
								
							
								
							
						 | 
						
							
							
								
								Turn off more spammy logging.
							
							
							
							
							
						 | 
						
							2014-08-22 18:13:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9f514915af
								
							
								
							
						 | 
						
							
							
								
								Add indices to schema
							
							
							
							
							
						 | 
						
							2014-08-22 18:03:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								1379dcae6f
								
							
								
							
						 | 
						
							
							
								
								Take a snapshot of the state of the room before performing updates
							
							
							
							
							
						 | 
						
							2014-08-22 17:00:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e7ee0b9fc1
								
							
								
							
						 | 
						
							
							
								
								Change IM sync api to also return the current presence list.
							
							
							
							
							
						 | 
						
							2014-08-21 16:40:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3d1cae0e79
								
							
								
							
						 | 
						
							
							
								
								In the initial sync api, return the inviter for rooms in the 'invited' state
							
							
							
							
							
						 | 
						
							2014-08-21 15:07:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								c6950b18cc
								
							
								
							
						 | 
						
							
							
								
								Return the current state in the initial sync api.
							
							
							
							
							
						 | 
						
							2014-08-21 15:06:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1587ea26fe
								
							
								
							
						 | 
						
							
							
								
								Wait for getting a Join in response to an invite/join dance.
							
							
							
							
							
						 | 
						
							2014-08-21 14:38:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								583add34fe
								
							
								
							
						 | 
						
							
							
								
								Use the "collect_presencelike_data" distributor signal instead of re-implementing its behaviour
							
							
							
							
							
						 | 
						
							2014-08-20 16:06:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								50718825bd
								
							
								
							
						 | 
						
							
							
								
								Fix exception name in _fill_out_join_content() exception
							
							
							
							
							
						 | 
						
							2014-08-20 16:06:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								9c0e570496
								
							
								
							
						 | 
						
							
							
								
								Kill the "_homeserver_" injected messages for room membership changes
							
							
							
							
							
						 | 
						
							2014-08-20 16:06:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5ef0948eaa
								
							
								
							
						 | 
						
							
							
								
								Better handle the edge cases of trying to remote join rooms
							
							
							
							
							
						 | 
						
							2014-08-20 14:42:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								849627b82e
								
							
								
							
						 | 
						
							
							
								
								Don't generate room membership messages. Include previous state of in membership messages.
							
							
							
							
							
						 | 
						
							2014-08-20 11:53:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e2b861cc67
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
						 | 
						
							2014-08-19 16:41:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5c00614aab
								
							
								
							
						 | 
						
							
							
								
								PresenceStreamData was expecting *_key to be ints
							
							
							
							
							
						 | 
						
							2014-08-19 15:51:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								89cabba3e0
								
							
								
							
						 | 
						
							
							
								
								Don't delete OFFLINE users from the presence cache, so we can report on their offline mtime
							
							
							
							
							
						 | 
						
							2014-08-19 14:51:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								347242a5c4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
							
							
							Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py 
							
						 | 
						
							2014-08-19 14:48:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								234128586b
								
							
								
							
						 | 
						
							
							
								
								Print out stacktrace when we failed to persist event.
							
							
							
							
							
						 | 
						
							2014-08-19 14:30:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								75b6d982a0
								
							
								
							
						 | 
						
							
							
								
								Add a 'backfill room' button
							
							
							
							
							
						 | 
						
							2014-08-19 14:20:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								598a1d8ff9
								
							
								
							
						 | 
						
							
							
								
								Change the way pagination works to support out of order events.
							
							
							
							
							
						 | 
						
							2014-08-19 14:19:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								88f7482b92
								
							
								
							
						 | 
						
							
							
								
								Perform the 'REST'-level tests of Presence against the real Presence handler as well, mocking out the datastore beneath it
							
							
							
							
							
						 | 
						
							2014-08-19 11:16:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								83f031207e
								
							
								
							
						 | 
						
							
							
								
								Implement and test presence dropping of remote users
							
							
							
							
							
						 | 
						
							2014-08-19 11:16:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1422a22970
								
							
								
							
						 | 
						
							
							
								
								Fix typos in SQL and where we still had rowid's (which no longer exist)
							
							
							
							
							
						 | 
						
							2014-08-18 16:25:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								4eb8f84aa8
								
							
								
							
						 | 
						
							
							
								
								Make snapshot_all_rooms return results in the correct form, including start and end tokens.
							
							
							
							
							
						 | 
						
							2014-08-18 16:20:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b4a1f2ccb5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
						 | 
						
							2014-08-18 15:53:40 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								faf25e3a83
								
							
								
							
						 | 
						
							
							
								
								Allow room presence visibility between users who share a room
							
							
							
							
							
						 | 
						
							2014-08-18 13:41:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1c2caacd67
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
						 | 
						
							2014-08-18 11:14:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								dccb2f57be
								
							
								
							
						 | 
						
							
							
								
								Disable the ability to GET individualy messages. We need to think about the correct API to do this, as the current one doesn't make much sense.
							
							
							
							
							
						 | 
						
							2014-08-18 10:59:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								98ed3d0222
								
							
								
							
						 | 
						
							
							
								
								improve comment
							
							
							
							
							
						 | 
						
							2014-08-16 01:52:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								fc846aa771
								
							
								
							
						 | 
						
							
							
								
								emergency bodges to turn off presence ACLs in order to make
							
							
							
							
							
							
							
							matrix.org:8080 actually work 
							
						 | 
						
							2014-08-16 01:47:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								7f5c7ddea9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
						 | 
						
							2014-08-15 17:50:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								9c41f635a9
								
							
								
							
						 | 
						
							
							
								
								When starting to poll for presence, also include members of all shared rooms
							
							
							
							
							
						 | 
						
							2014-08-15 17:12:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								6efc688917
								
							
								
							
						 | 
						
							
							
								
								Fix typo of key name
							
							
							
							
							
						 | 
						
							2014-08-15 16:47:26 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								d260a42ca2
								
							
								
							
						 | 
						
							
							
								
								PEP8 cleanups
							
							
							
							
							
						 | 
						
							2014-08-15 16:17:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								8d1f763209
								
							
								
							
						 | 
						
							
							
								
								Fix pagination to work with new db schema
							
							
							
							
							
						 | 
						
							2014-08-15 15:53:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								01f089d9fb
								
							
								
							
						 | 
						
							
							
								
								Correctly return new token when returning events. Serialize events correctly.
							
							
							
							
							
						 | 
						
							2014-08-15 15:28:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								114984a236
								
							
								
							
						 | 
						
							
							
								
								Start chagning the events stream to work with the new DB schema
							
							
							
							
							
						 | 
						
							2014-08-15 13:58:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								d72f897f07
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
							
							
							Conflicts:
	synapse/storage/stream.py 
							
						 | 
						
							2014-08-15 11:50:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5002efa31b
								
							
								
							
						 | 
						
							
							
								
								Reimplement the get public rooms api to work with new DB schema
							
							
							
							
							
						 | 
						
							2014-08-15 10:26:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2c46bb6208
								
							
								
							
						 | 
						
							
							
								
								Fix up typos and correct sql queries
							
							
							
							
							
						 | 
						
							2014-08-14 18:40:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								661c711765
								
							
								
							
						 | 
						
							
							
								
								Start fixing places that use the data store.
							
							
							
							
							
						 | 
						
							2014-08-14 17:34:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								fef3183461
								
							
								
							
						 | 
						
							
							
								
								Pass back the user_id in the response to /login in case it has changed. Store and use that on the webclient rather than the input field.
							
							
							
							
							
						 | 
						
							2014-08-14 16:40:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								ca3747fb2f
								
							
								
							
						 | 
						
							
							
								
								hs: Make /login accept full user IDs or just local parts. webclient: Only enable Register button when both password fields match.
							
							
							
							
							
						 | 
						
							2014-08-14 16:29:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								53147e5ae4
								
							
								
							
						 | 
						
							
							
								
								Reflect user's messages up to themselves before pushing it to federatoin; also release roomlock before touching federation so we don't halt progress on the world
							
							
							
							
							
						 | 
						
							2014-08-14 16:22:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								5a5f37ca17
								
							
								
							
						 | 
						
							
							
								
								Send forbidden codes when doing login attempts.
							
							
							
							
							
						 | 
						
							2014-08-14 14:29:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								0fa05ea331
								
							
								
							
						 | 
						
							
							
								
								Round Presence mtime and mtime_age to nearest msec; avoids floats for msec values over the wire
							
							
							
							
							
						 | 
						
							2014-08-14 14:16:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								c75add6ec8
								
							
								
							
						 | 
						
							
							
								
								Added a urls module for keeping client and federation prefixes.
							
							
							
							
							
						 | 
						
							2014-08-14 11:52:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								d05aa651f8
								
							
								
							
						 | 
						
							
							
								
								An initial hack at storing presence state-change mtimes in database and presenting age durations to clients/federation events
							
							
							
							
							
						 | 
						
							2014-08-13 19:19:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								3a1cfe18cf
								
							
								
							
						 | 
						
							
							
								
								Implement directory service federation by Federation Queries; avoid local_only hack; add unit tests
							
							
							
							
							
						 | 
						
							2014-08-13 18:03:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								80c056c148
								
							
								
							
						 | 
						
							
							
								
								Now that HS->HS Profile lookups use Federation Queries, we don't need the 'local_only' antirecursion hack
							
							
							
							
							
						 | 
						
							2014-08-13 17:23:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								505917cb97
								
							
								
							
						 | 
						
							
							
								
								Use new Federation Query API to implement HS->HS fetching of remote users' profile information instead of (ab)using the client-side REST API
							
							
							
							
							
						 | 
						
							2014-08-13 17:23:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								f98e6380f1
								
							
								
							
						 | 
						
							
							
								
								add in whitespace after copyright statements to improve legibility
							
							
							
							
							
						 | 
						
							2014-08-13 03:14:34 +01:00 | 
						
					
				
					
						
							
							
								 
								matrix.org
							
						 | 
						
							
							
							
							
								
							
								4f475c7697
								
							
								
							
						 | 
						
							
							
								
								Reference Matrix Home Server
							
							
							
							
							
						 | 
						
							2014-08-12 15:10:52 +01:00 |