| 
							
							
								 David Baker | 5ecc768970 | Add attribute so push gateways can tell if a member event is about the user in question | 2015-03-06 14:41:50 +00:00 |  | 
			
				
					| 
							
							
								 Kegan Dougal | 0fbfe1b08a | Add more tests; fix bugs. | 2015-03-06 14:36:52 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 369449827d | Bump version | 2015-03-06 14:24:53 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | c54773473f | Merge branch 'master' of github.com:matrix-org/synapse into develop | 2015-03-06 14:23:41 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | b102a87348 | Merge pull request #96 from matrix-org/pushrules2 Evolution of push rules | 2015-03-06 14:20:04 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | cf66ddc1b4 | Schema change as delta in v14 | 2015-03-06 14:11:49 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | c06b45129c | Add more server default rules so we have default rules for whether you get notifs for invites / random member events | 2015-03-06 11:50:51 +00:00 |  | 
			
				
					| 
							
							
								 Kegan Dougal | 192e228a98 | Start adding some tests | 2015-03-06 11:50:27 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | b1491dfd7c | Merge pull request #103 from matrix-org/no_tls_private_key Don't look for a TLS private key if we have set --no-tls | 2015-03-06 11:45:22 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | e49d6b1568 | Unused import | 2015-03-06 11:37:24 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 657a0d2568 | Comment typo | 2015-03-06 11:34:30 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 3ce8540484 | Don't look for an TLS private key if we have set --no-tls | 2015-03-06 11:34:06 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | e780492ecf | Merge pull request #102 from matrix-org/randomize_stream_timeout Add some randomness to the user specified timeout on event streams to mi... | 2015-03-06 10:28:19 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 1487bba226 | Suppress notices should trump content/room/sender rules. | 2015-03-06 10:27:32 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 83d31144eb | Add the highlight tweak where messages should be highlighted a different colour in appropriate clients. | 2015-03-06 10:26:08 +00:00 |  | 
			
				
					| 
							
							
								 Kegan Dougal | d516d68b29 | Rejig structure given the appservice_handler already filters the correct ASes to use. | 2015-03-06 10:25:50 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 130df8fb01 | Add some randomness to the user specified timeout on event streams to mitigate against thundering herds problems | 2015-03-06 10:25:36 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | d79d91a4a7 | Appease pep8 | 2015-03-05 20:55:40 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 5eab2549ab | Append a $ on PATH at registration time, meaning each PATH attribute doesn't need it | 2015-03-05 20:36:05 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 7644cb79b2 | Slightly neater(?) arrangement of authentication wrapper for HTTP servlet methods | 2015-03-05 20:33:16 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | ba8ac996f9 | Remove the dead 'rate_limit_origin' method from TransportLayerServer | 2015-03-05 19:43:17 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | a901ed16b5 | Move federation API responding code out of weird mix of lambdas into Servlet-style methods on instances | 2015-03-05 19:10:57 +00:00 |  | 
			
				
					| 
							
							
								 Kegan Dougal | 0c838f9f5e | Minor tweaks | 2015-03-05 17:45:52 +00:00 |  | 
			
				
					| 
							
							
								 Kegan Dougal | 773cb3b688 | Add stub architecture for txn reliability. | 2015-03-05 17:35:07 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 5b5c7a28d6 | Log error message when we fail to fetch remote server keys | 2015-03-05 17:09:13 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 12bcf3d179 | Merge pull request #100 from matrix-org/missing_pdu_compat Handle if get_missing_pdu returns 400 or not all events. | 2015-03-05 16:42:15 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 9708f49abf | Docs | 2015-03-05 16:35:16 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 96fee64421 | Remove unecessary check | 2015-03-05 16:31:47 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 39aa968a76 | Respect min_depth argument | 2015-03-05 16:31:32 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 6dfd8c73fc | Docs. | 2015-03-05 16:31:13 +00:00 |  | 
			
				
					| 
							
							
								 Kegan Dougal | e319071191 | Add stub scheduler module for txn reliability | 2015-03-05 16:30:33 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 9d9d39536b | Slightly reduce the insane amounts of indentation in main http server response path, by 'continue'ing around a non-match or falling through | 2015-03-05 16:24:13 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | ae702d161a | Handle if get_missing_pdu returns 400 or not all events. | 2015-03-05 16:08:02 +00:00 |  | 
			
				
					| 
							
							
								 Kegan Dougal | be09c23ff0 | Add txn_id kwarg to push methods | 2015-03-05 15:40:07 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | dc4b774f1e | Rename rooms_to_listeners to room_to_listeners, for consistency with user_ and appservice_* | 2015-03-05 14:30:20 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 027fd1242c | Give LruCache a __len__, so that  len(cache)  works | 2015-03-04 17:32:28 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 590b544f67 | Add default rule to suppress notices. | 2015-03-04 15:29:02 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | ed72fc3a50 | Merge branch 'develop' into pushrules2 Conflicts:
	synapse/storage/schema/pusher.sql | 2015-03-04 15:24:21 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 1af1c45dc0 | Merge pull request #99 from matrix-org/schema_versioning Schema versioning | 2015-03-04 15:18:30 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | d56c01fff4 | Note that we don't specify execution order | 2015-03-04 15:10:05 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 17d319a20d | s/schema_deltas/applied_schema_deltas/ | 2015-03-04 15:06:22 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 92b3dc3219 | Merge branch 'develop' into pushrules2 | 2015-03-04 14:56:41 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 5681264faa | s/%r/%s/ | 2015-03-04 14:21:53 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | f701197227 | Add example directory structures in doc | 2015-03-04 14:20:14 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 2a45f3d448 | Use if not results rather than len, as per feedback. | 2015-03-04 14:17:59 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 16dd87d848 | Don't assume db conn is a Context Manager. Twisted adbapi wrapped connections aren't context managers. | 2015-03-04 14:03:41 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 5eefd1f618 | Add unique constraint on schema_version.lock schema. Use conflict clause in sql. | 2015-03-04 13:52:18 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | b4c38738f4 | Change to use logger in db upgrade script | 2015-03-04 13:43:35 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 640e53935d | Use context manager with db conn to correctly commit and rollback | 2015-03-04 13:43:17 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 8c8354e85a | Actually add full_schemas dir | 2015-03-04 13:34:38 +00:00 |  |