Mark Haines
							
						 | 
						
							
							
							
							
								
							
								9605593d11
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into server2server_signing
							
							
							
							
							
							
							
							Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py 
							
						 | 
						
							2014-09-30 17:55:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								d96cb61f26
								
							
								
							
						 | 
						
							
							
								
								Unbreak tests after changing storage API
							
							
							
							
							
						 | 
						
							2014-09-29 15:35:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								0fdf308874
								
							
								
							
						 | 
						
							
							
								
								Track the IP users connect with. Add an admin column to users table.
							
							
							
							
							
						 | 
						
							2014-09-26 16:36:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								52ca867670
								
							
								
							
						 | 
						
							
							
								
								Sign federation transactions
							
							
							
							
							
						 | 
						
							2014-09-24 17:25:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								cd62ee3f29
								
							
								
							
						 | 
						
							
							
								
								Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY
							
							
							
							
							
						 | 
						
							2014-09-12 18:46:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								8a7c1d6a00
								
							
								
							
						 | 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
							
							
							
							
							
						 | 
						
							2014-09-03 17:31:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								cda31fb755
								
							
								
							
						 | 
						
							
							
								
								Kill the state
							
							
							
							
							
							
							
							... key from all the Presence messages 
							
						 | 
						
							2014-09-03 15:37:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								da31b96b55
								
							
								
							
						 | 
						
							
							
								
								Implement presence state visibilty limiting when polling eventsource for stream
							
							
							
							
							
						 | 
						
							2014-09-03 13:46:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								468d94c920
								
							
								
							
						 | 
						
							
							
								
								Rename API-visible 'mtime' presence field to 'last_active'; slightly different semantics
							
							
							
							
							
						 | 
						
							2014-09-01 15:39:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								02f4e3b3ff
								
							
								
							
						 | 
						
							
							
								
								Rename 'state' presence key to the much more obvious 'presence'; maintain a legacy 'state' copy for now
							
							
							
							
							
						 | 
						
							2014-09-01 14:45:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								8fe912d95c
								
							
								
							
						 | 
						
							
							
								
								change the world: make the default matrix API URL prefix /_matrix rather than /matrix to make it easier for existing websites to mount a HS in their namespace without collisions.
							
							
							
							
							
							
							
							perl -pi -e 's#/matrix#/_matrix#g' ./cmdclient/console.py ./docs/client-server/howto.rst ./docs/client-server/specification.rst ./docs/client-server/swagger_matrix/directory ./docs/client-server/swagger_matrix/events ./docs/client-server/swagger_matrix/login ./docs/client-server/swagger_matrix/presence ./docs/client-server/swagger_matrix/profile ./docs/client-server/swagger_matrix/registration ./docs/client-server/swagger_matrix/rooms ./docs/server-server/specification.rst ./graph/graph.py ./jsfiddles/create_room_send_msg/demo.js ./jsfiddles/event_stream/demo.js ./jsfiddles/example_app/demo.js ./jsfiddles/register_login/demo.js ./jsfiddles/room_memberships/demo.js ./synapse/api/urls.py ./tests/federation/test_federation.py ./tests/handlers/test_presence.py ./tests/handlers/test_typing.py ./tests/rest/test_events.py ./tests/rest/test_presence.py ./tests/rest/test_profile.py ./tests/rest/test_rooms.py ./webclient/components/fileUpload/file-upload-service.js ./webclient/components/matrix/matrix-service.js 
							
						 | 
						
							2014-08-31 14:51:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								56424eca5c
								
							
								
							
						 | 
						
							
							
								
								Bugfix for rest presence test - datastore needs to implement profile methods
							
							
							
							
							
						 | 
						
							2014-08-29 19:12:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								6dd50da54e
								
							
								
							
						 | 
						
							
							
								
								Define a new event stream data source for typing notifications (currently null)
							
							
							
							
							
						 | 
						
							2014-08-29 17:39:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								20d0db6cfb
								
							
								
							
						 | 
						
							
							
								
								Move the *EventSource classes into the handlers they relate to, so it's easier to find the code
							
							
							
							
							
						 | 
						
							2014-08-29 17:10:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								c46c806126
								
							
								
							
						 | 
						
							
							
								
								Re-enable presence, un-skip presence tests
							
							
							
							
							
						 | 
						
							2014-08-28 16:00:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								d027e859cd
								
							
								
							
						 | 
						
							
							
								
								Fix up the various presence-related tests so that if they're not skipped, they still PASS
							
							
							
							
							
						 | 
						
							2014-08-27 18:30:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								135a1aa229
								
							
								
							
						 | 
						
							
							
								
								Final url modifications: renamed /presence_list to /presence/list to keep the top-level namespace clean. Updated tests.
							
							
							
							
							
						 | 
						
							2014-08-27 11:37:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								104808107a
								
							
								
							
						 | 
						
							
							
								
								skip presence tests which broke when presence polling was disabled
							
							
							
							
							
						 | 
						
							2014-08-22 18:40:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								41333452e5
								
							
								
							
						 | 
						
							
							
								
								Update tests
							
							
							
							
							
						 | 
						
							2014-08-19 15:52:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								22dd0b37c4
								
							
								
							
						 | 
						
							
							
								
								Fix typo in merge conflict
							
							
							
							
							
						 | 
						
							2014-08-19 15:02:47 +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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								bb793019a5
								
							
								
							
						 | 
						
							
							
								
								Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server
							
							
							
							
							
						 | 
						
							2014-08-19 11:16:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								709a92cee8
								
							
								
							
						 | 
						
							
							
								
								SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns.
							
							
							
							
							
						 | 
						
							2014-08-18 16:00:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								9a1638ed21
								
							
								
							
						 | 
						
							
							
								
								Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.
							
							
							
							
							
						 | 
						
							2014-08-14 10:18:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								9f863d3466
								
							
								
							
						 | 
						
							
							
								
								Start phasing out HttpServer: we should be using Resources instead. Added resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.
							
							
							
							
							
						 | 
						
							2014-08-14 09:55:16 +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
							
						 | 
						
							
							
							
							
								
							
								55944ccf72
								
							
								
							
						 | 
						
							
							
								
								Use strings instead of opaque magic-number constants for presence states; rename AWAY to UNAVAILABLE
							
							
							
							
							
						 | 
						
							2014-08-13 14:31:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								3e35a9f96e
								
							
								
							
						 | 
						
							
							
								
								add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it
							
							
							
							
							
						 | 
						
							2014-08-13 03:32:18 +01:00 | 
						
					
				
					
						
							
							
								 
								matrix.org
							
						 | 
						
							
							
							
							
								
							
								4f475c7697
								
							
								
							
						 | 
						
							
							
								
								Reference Matrix Home Server
							
							
							
							
							
						 | 
						
							2014-08-12 15:10:52 +01:00 |