3063383547 
								
							
								 
							
						 
						
							
							
								
								Swap out bcrypt for md5 in tests  
							
							... 
							
							
							
							This reduces our ~8 second sequential test time down to ~7 seconds 
							
						 
						
							2015-08-26 15:59:32 +01:00  
				
					
						
							
							
								 
						
							
							
								a9d8bd95e7 
								
							
								 
							
						 
						
							
							
								
								Stop looking up "admin", which we never read  
							
							
							
						 
						
							2015-08-25 16:29:39 +01:00  
				
					
						
							
							
								 
						
							
							
								a0b181bd17 
								
							
								 
							
						 
						
							
							
								
								Remove completely unused concepts from codebase  
							
							... 
							
							
							
							Removes device_id and ClientInfo
device_id is never actually written, and the matrix.org DB has no
non-null entries for it. Right now, it's just cluttering up code.
This doesn't remove the columns from the database, because that's
fiddly. 
							
						 
						
							2015-08-25 16:23:06 +01:00  
				
					
						
							
							
								 
						
							
							
								e8cf77fa49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into refresh  
							
							... 
							
							
							
							Conflicts:
	synapse/rest/client/v1/login.py 
							
						 
						
							2015-08-20 16:25:40 +01:00  
				
					
						
							
							
								 
						
							
							
								cecbd636e9 
								
							
								 
							
						 
						
							
							
								
								/tokenrefresh POST endpoint  
							
							... 
							
							
							
							This allows refresh tokens to be exchanged for (access_token,
refresh_token).
It also starts issuing them on login, though no clients currently
interpret them. 
							
						 
						
							2015-08-20 16:21:35 +01:00  
				
					
						
							
							
								 
						
							
							
								13a6517d89 
								
							
								 
							
						 
						
							
							
								
								s/by_token/by_access_token/g  
							
							... 
							
							
							
							We're about to have two kinds of token, access and refresh 
							
						 
						
							2015-08-20 16:01:29 +01:00  
				
					
						
							
							
								 
						
							
							
								617501dd2a 
								
							
								 
							
						 
						
							
							
								
								Move token generation to auth handler  
							
							... 
							
							
							
							I prefer the auth handler to worry about all auth, and register to call
into it as needed, than to smatter auth logic between the two. 
							
						 
						
							2015-08-20 11:35:56 +01:00  
				
					
						
							
							
								 
						
							
							
								a0b8e5f2fe 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #211  from matrix-org/email_in_use  
							
							... 
							
							
							
							Changes for unique emails 
							
						 
						
							2015-08-20 10:04:04 +01:00  
				
					
						
							
							
								 
						
							
							
								70e265e695 
								
							
								 
							
						 
						
							
							
								
								Re-add whitespace around caveat operators  
							
							
							
						 
						
							2015-08-19 14:30:31 +01:00  
				
					
						
							
							
								 
						
							
							
								ce832c38d4 
								
							
								 
							
						 
						
							
							
								
								Remove padding space around caveat operators  
							
							
							
						 
						
							2015-08-18 17:39:26 +01:00  
				
					
						
							
							
								 
						
							
							
								42e858daeb 
								
							
								 
							
						 
						
							
							
								
								Fix units in test  
							
							... 
							
							
							
							I made the non-test seconds instead of ms, but not the test 
							
						 
						
							2015-08-18 17:38:37 +01:00  
				
					
						
							
							
								 
						
							
							
								3e6fdfda00 
								
							
								 
							
						 
						
							
							
								
								Fix some formatting to use tuples  
							
							
							
						 
						
							2015-08-18 15:18:50 +01:00  
				
					
						
							
							
								 
						
							
							
								1469141023 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into auth  
							
							
							
						 
						
							2015-08-18 14:43:44 +01:00  
				
					
						
							
							
								 
						
							
							
								2d3462714e 
								
							
								 
							
						 
						
							
							
								
								Issue macaroons as opaque auth tokens  
							
							... 
							
							
							
							This just replaces random bytes with macaroons. The macaroons are not
inspected by the client or server.
In particular, they claim to have an expiry time, but nothing verifies
that they have not expired.
Follow-up commits will actually enforce the expiration, and allow for
token refresh.
See https://bit.ly/matrix-auth  for more information 
							
						 
						
							2015-08-18 14:22:02 +01:00  
				
					
						
							
							
								 
						
							
							
								d7451e0f22 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache  
							
							
							
						 
						
							2015-08-12 10:30:30 +01:00  
				
					
						
							
							
								 
						
							
							
								2df8dd9b37 
								
							
								 
							
						 
						
							
							
								
								Move all the caches into their own package, synapse.util.caches  
							
							
							
						 
						
							2015-08-11 18:00:59 +01:00  
				
					
						
							
							
								 
						
							
							
								4ff0228c25 
								
							
								 
							
						 
						
							
							
								
								Remove call to recently removed function in mock  
							
							
							
						 
						
							2015-08-11 16:56:30 +01:00  
				
					
						
							
							
								 
						
							
							
								dcd5983fe4 
								
							
								 
							
						 
						
							
							
								
								Remove call to recently removed function in mock  
							
							
							
						 
						
							2015-08-11 16:54:06 +01:00  
				
					
						
							
							
								 
						
							
							
								20addfa358 
								
							
								 
							
						 
						
							
							
								
								Change Cache to not use *args in its interface  
							
							
							
						 
						
							2015-08-07 18:32:47 +01:00  
				
					
						
							
							
								 
						
							
							
								b8e386db59 
								
							
								 
							
						 
						
							
							
								
								Change Cache to not use *args in its interface  
							
							
							
						 
						
							2015-08-07 11:52:21 +01:00  
				
					
						
							
							
								 
						
							
							
								f596ff402e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache  
							
							
							
						 
						
							2015-08-06 13:37:56 +01:00  
				
					
						
							
							
								 
						
							
							
								2efb93af52 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds  
							
							
							
						 
						
							2015-08-06 13:35:28 +01:00  
				
					
						
							
							
								 
						
							
							
								7eea3e356f 
								
							
								 
							
						 
						
							
							
								
								Make @cached cache deferreds rather than the deferreds' values  
							
							
							
						 
						
							2015-08-06 13:33:34 +01:00  
				
					
						
							
							
								 
						
							
							
								07507643cb 
								
							
								 
							
						 
						
							
							
								
								Use dictionary cache to do group -> state fetching  
							
							
							
						 
						
							2015-08-05 15:11:42 +01:00  
				
					
						
							
							
								 
						
							
							
								c67ba143fa 
								
							
								 
							
						 
						
							
							
								
								Move DictionaryCache  
							
							
							
						 
						
							2015-08-04 15:58:28 +01:00  
				
					
						
							
							
								 
						
							
							
								e7768e77f5 
								
							
								 
							
						 
						
							
							
								
								Add basic dictionary cache  
							
							
							
						 
						
							2015-08-04 15:56:56 +01:00  
				
					
						
							
							
								 
						
							
							
								07ad03d5df 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2015-08-04 15:18:40 +01:00  
				
					
						
							
							
								 
						
							
							
								11b0a34074 
								
							
								 
							
						 
						
							
							
								
								Use the same reg paths as register v1 for ASes.  
							
							... 
							
							
							
							Namely this means using registration_handler.appservice_register. 
							
						 
						
							2015-07-29 10:00:54 +01:00  
				
					
						
							
							
								 
						
							
							
								a4d62ba36a 
								
							
								 
							
						 
						
							
							
								
								Fix v2_alpha registration. Add unit tests.  
							
							... 
							
							
							
							V2 Registration forced everyone (including ASes) to create a password for a
user, when ASes should be able to omit passwords. Also unbreak AS registration
in general which checked too early if the given username was claimed by an AS;
it was checked before knowing if the AS was the one doing the registration! Add
unit tests for AS reg, user reg and disabled_registration flag. 
							
						 
						
							2015-07-28 17:34:12 +01:00  
				
					
						
							
							
								 
						
							
							
								f0dd6d4cbd 
								
							
								 
							
						 
						
							
							
								
								Fix test.  
							
							
							
						 
						
							2015-07-07 16:18:36 +01:00  
				
					
						
							
							
								 
						
							
							
								bd1236c0ee 
								
							
								 
							
						 
						
							
							
								
								Consolidate duplicate code in notifier  
							
							
							
						 
						
							2015-07-02 11:46:05 +01:00  
				
					
						
							
							
								 
						
							
							
								ddf7979531 
								
							
								 
							
						 
						
							
							
								
								Add receipts_key to StreamToken  
							
							
							
						 
						
							2015-07-02 11:45:44 +01:00  
				
					
						
							
							
								 
						
							
							
								d88e20cdb9 
								
							
								 
							
						 
						
							
							
								
								Fix bug where synapse was sending AS user queries incorrectly.  
							
							... 
							
							
							
							Bug introduced in 92b20713d7 
							
						 
						
							2015-06-17 17:26:03 +01:00  
				
					
						
							
							
								 
						
							
							
								261ccd7f5f 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2015-06-12 17:17:29 +01:00  
				
					
						
							
							
								 
						
							
							
								3bbd0d0e09 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #180  from matrix-org/erikj/prev_state_context  
							
							... 
							
							
							
							Don't needlessly compute prev_state 
							
						 
						
							2015-06-03 17:20:56 +01:00  
				
					
						
							
							
								 
						
							
							
								9dda396baa 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #179  from matrix-org/erikj/state_group_outliers  
							
							... 
							
							
							
							Don't compute EventContext for outliers. 
							
						 
						
							2015-06-03 17:20:40 +01:00  
				
					
						
							
							
								 
						
							
							
								55bf90b9e4 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute prev_state  
							
							
							
						 
						
							2015-06-03 16:44:24 +01:00  
				
					
						
							
							
								 
						
							
							
								1c3d844e73 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute context  
							
							
							
						 
						
							2015-06-03 16:41:51 +01:00  
				
					
						
							
							
								 
						
							
							
								d8866d7277 
								
							
								 
							
						 
						
							
							
								
								Caches should be bound to instances.  
							
							... 
							
							
							
							Before, caches were global and so different instances of the stores
would share caches. This caused problems in the unit tests. 
							
						 
						
							2015-06-03 14:45:17 +01:00  
				
					
						
							
							
								 
						
							
							
								17167898c8 
								
							
								 
							
						 
						
							
							
								
								Fix the presence tests  
							
							
							
						 
						
							2015-05-22 16:22:54 +01:00  
				
					
						
							
							
								 
						
							
							
								49a2c10279 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #157  from matrix-org/markjh/presence_performance  
							
							... 
							
							
							
							Improve presence performance in loadtest 
							
						 
						
							2015-05-22 16:04:40 +01:00  
				
					
						
							
							
								 
						
							
							
								f43544eecc 
								
							
								 
							
						 
						
							
							
								
								Make the appservice use 'users_in_room' rather than get_room_members since it is cached  
							
							
							
						 
						
							2015-05-22 11:01:28 +01:00  
				
					
						
							
							
								 
						
							
							
								88f1ea36ce 
								
							
								 
							
						 
						
							
							
								
								Oops, get_rooms_for_user returns a namedtuple, not a room_id  
							
							
							
						 
						
							2015-05-21 15:23:58 +01:00  
				
					
						
							
							
								 
						
							
							
								a551c5dad7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #155  from matrix-org/erikj/perf  
							
							... 
							
							
							
							Bulk and batch retrieval of events. 
							
						 
						
							2015-05-21 14:54:40 +01:00  
				
					
						
							
							
								 
						
							
							
								8eca5bd50a 
								
							
								 
							
						 
						
							
							
								
								Fix the presence tests  
							
							
							
						 
						
							2015-05-20 13:22:18 +01:00  
				
					
						
							
							
								 
						
							
							
								0b0033c40b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into notifier_performance  
							
							
							
						 
						
							2015-05-18 13:50:01 +01:00  
				
					
						
							
							
								 
						
							
							
								131bdf9bb1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/perf  
							
							
							
						 
						
							2015-05-18 10:23:37 +01:00  
				
					
						
							
							
								 
						
							
							
								a2c4f3f150 
								
							
								 
							
						 
						
							
							
								
								Fix daedlock  
							
							
							
						 
						
							2015-05-15 10:54:04 +01:00  
				
					
						
							
							
								 
						
							
							
								c5d1b4986b 
								
							
								 
							
						 
						
							
							
								
								Remove unused arguments and doc PresenceHandler.push_update_to_clients  
							
							
							
						 
						
							2015-05-14 14:59:31 +01:00  
				
					
						
							
							
								 
						
							
							
								f1b83d88a3 
								
							
								 
							
						 
						
							
							
								
								Discard unused NotifierUserStreams  
							
							
							
						 
						
							2015-05-13 16:54:02 +01:00