| 
							
							
								 David Baker | f96ab9d18d | make add3pid servlet work | 2015-04-17 16:44:49 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 865398b4a9 | Revert needless change to rest.profile | 2015-04-17 16:14:51 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | e3417bbbe0 | Revert needless change to storage.profile | 2015-04-17 16:13:14 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 2492efb162 | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | 2015-04-17 16:08:42 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 4a5990ff8f | Merge branch 'master' of github.com:matrix-org/synapse into develop | 2015-04-17 16:08:28 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 5e7a90316d | Update --database-path metavar to SQLITE_DATABASE_PATH | 2015-04-17 16:08:18 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 231498ac45 | Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 Hotfixes v0.8.1-r4v0.8.1-r4 | 2015-04-17 15:16:27 +01:00 |  | 
			
				
					| 
							
							
								 Mark Haines | fd4fa9097f | The new parameter to urlopen is "context" not "ctx" | 2015-04-17 14:44:31 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | 0b1a8500a2 | just the once would probably be fine | 2015-04-17 13:53:54 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | cb03fafdf1 | Merge branch 'develop' into csauth | 2015-04-17 13:51:10 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | bf5e54f255 | Register the 3pid servlet | 2015-04-17 13:44:55 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | 94e1e58b4d | password -> account servlet and add start of an 'add 3pid' endpoint | 2015-04-17 13:44:12 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | ced39d019f | Bump version | 2015-04-17 13:25:16 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 16dcdedc8a | As of version 2.7.9, urllib2 now checks SSL certs | 2015-04-17 13:24:55 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | 83b554437e | Need to yield the username check, otherwise very very weird things happen. | 2015-04-17 12:57:25 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | dfc46c6220 | PEP8 | 2015-04-17 12:46:29 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 6ba2e3df4e | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | 2015-04-17 11:22:31 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 427bcb7608 | Fix port script after storage changes. Add very simple (off by default) curses UI to see progress. | 2015-04-17 11:13:05 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 0ec346d942 | Add unique index to room_aliases, remove duplicates on upgrade. Convert some columns back to TEXT from bytea | 2015-04-17 11:10:20 +01:00 |  | 
			
				
					| 
							
							
								 Kegan Dougal | 1352ae2c07 | Add kick users script | 2015-04-17 10:38:23 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | 4cd5fb13a3 | Oops, left debugging in. | 2015-04-16 20:03:13 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | ea1776f556 | Return user ID in use error straight away | 2015-04-16 19:56:44 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | e1c0970c11 | PEP8 | 2015-04-16 11:18:45 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | b8092fbc82 | Go back to storing JSON in TEXT | 2015-04-16 11:17:52 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | bc9e69e160 | Move encoding and decoding of JSON into storage layer | 2015-04-16 11:01:09 +01:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | f2cf37518b | Filter typing nofication events to only those rooms the requesting user is a member of (SYN-328) | 2015-04-15 23:34:16 +01:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 04c7f3576e | Various minor fixes to unit-test structure around typing notifications | 2015-04-15 23:32:11 +01:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 0268d40281 | Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility | 2015-04-15 23:09:35 +01:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 399b5add58 | Neater implementation of membership change auth checks, ensuring we can't forget to check if the calling user is a member of the room | 2015-04-15 18:40:23 +01:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | e6e130b9ba | Ensure that non-room-members cannot ban others, even if they do have enough powerlevel (SYN-343) | 2015-04-15 18:07:33 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | 766bd8e880 | Dummy login so we can do the first POST request to get login flows without it just succeeding | 2015-04-15 17:14:25 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | ffad75bd62 | Remove mysql/maria support | 2015-04-15 17:00:50 +01:00 |  | 
			
				
					| 
							
							
								 Mark Haines | a429515bdd | Add methods for storing and retrieving the raw key json | 2015-04-15 16:58:35 +01:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 8d761134c2 | Fail quicker for 4xx responses in the key client, optional hit a different API path | 2015-04-15 16:57:58 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | cf04cedf21 | Change full_schemas/11 to work with postgres | 2015-04-15 16:53:47 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 5b31afcbd1 | Remove debug logging | 2015-04-15 16:27:04 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 6e91f14d09 | Add missing yield | 2015-04-15 16:25:07 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | ed26e4012b | pushers table requires a unique id. | 2015-04-15 16:24:14 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 806f380a8b | Make LruCache thread safe, as its used for event cache | 2015-04-15 16:07:59 +01:00 |  | 
			
				
					| 
							
							
								 David Baker | a19b739909 | Regstration with email in v2 | 2015-04-15 15:50:38 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | a5c72780e6 | Don't pass in removed flag | 2015-04-15 15:13:22 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | e19f794fee | Change from exception to warn | 2015-04-15 15:12:57 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | d5ff9effcf | Don't wait on federation_handler.handle_new_event | 2015-04-15 15:05:57 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | e845434028 | Remove run_on_reactor()s | 2015-04-15 15:05:45 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 4af32a2817 | Postgres does not allow you to continue using a cursor after a DB exception has been raised, so move _simple_insert or_ignore flag out of transaction | 2015-04-15 14:51:21 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | bc6cef823f | Do more parellelization for initialSync | 2015-04-15 14:21:59 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 1ec6fa98c9 | Parellelize initial sync | 2015-04-15 14:17:16 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 25d2914fba | Turn off persistance of sent_transactions.response_json | 2015-04-15 14:09:35 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | cce5d057d3 | Add index on events (topological_ordering, stream_ordering) to help with ORDER BY clauses | 2015-04-15 11:43:25 +01:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 6606f7c659 | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | 2015-04-15 10:27:20 +01:00 |  |