| 
							
							
								 Mark Haines | e0bf18addf | Add RestServlet base class in synapse/http/servlet.py | 2015-01-23 14:16:28 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 4be637cb12 | Extract the client v1 base RestServlet to a separate class | 2015-01-23 14:09:51 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | f7cb604211 | Merge pull request #32 from matrix-org/remove_parse_id_from_hs Remove parse id from hs | 2015-01-23 13:41:55 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | fc7a05c443 | more pep8 suggestions | 2015-01-23 13:36:01 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | b3f66ea6fb | more pep8 | 2015-01-23 13:28:00 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | d3e72b4d87 | Make string format tuple an actual tuple | 2015-01-23 13:25:58 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 98e1080555 | redundant parens | 2015-01-23 13:25:36 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 54c689c819 | stray space | 2015-01-23 13:25:14 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | c4652d7772 | Remove hs.parse_eventid | 2015-01-23 13:25:07 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 6188c4f69c | make per-device rules work | 2015-01-23 13:23:10 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | ada711504e | Replace hs.parse_roomalias with RoomAlias.from_string | 2015-01-23 13:21:58 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 1c06c48ce2 | Replace hs.parse_roomid with RoomID.from_string | 2015-01-23 11:55:12 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 5759bec43c | Replace hs.parse_userid with UserID.from_string | 2015-01-23 11:47:15 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 49fe31792b | Add slightly pedantic trailing slash error. | 2015-01-23 11:19:02 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 7dfd99f163 | Merge pull request #31 from matrix-org/client_api_resource Merge rest servlets into the client json resource object | 2015-01-23 10:55:18 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 7256def8e4 | Merge rest servlets into the client json resource object | 2015-01-23 10:37:38 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | f87586e661 | right super() param | 2015-01-23 10:32:40 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | bcd48b9636 | Fix adding rules without before/after & add the rule that we couldn't find to the error | 2015-01-23 10:28:25 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 6927b6b197 | This really serves me right for ever making a map called 'map'. | 2015-01-23 10:21:47 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 0c4b696727 | Merge branch 'develop' into pushers | 2015-01-23 10:12:38 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 3a243c53f4 | Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is still presence-specific | 2015-01-22 20:06:28 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | cbb10879cb | Much merging of test case setUp() methods to make them much more shareable | 2015-01-22 20:06:28 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 8a850573c9 | As yet fairly untested GET API for push rules | 2015-01-22 19:32:17 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 673773b217 | oops, this is not its own schema file | 2015-01-22 18:27:07 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 7ecb49ef25 | Insufficient newlines | 2015-01-22 17:53:30 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 5c6189ea3e | Merge branch 'develop' into pushers Conflicts:
	synapse/rest/__init__.py | 2015-01-22 17:46:16 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | ede491b4e0 | Oops: second part of commit dc938606 | 2015-01-22 17:38:53 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | dc93860619 | Add rest API & store for creating push rules Also make unrecognised request error look more like synapse errors
because it makes it easier to throw them from within rest classes. | 2015-01-22 17:37:12 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 22f00a09dd | Merge pull request #30 from matrix-org/client_api_restructure Move client v1 api rest servlets into a "client/v1" directory | 2015-01-22 16:40:14 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | ca65a9d03e | Split out TransactionQueue from replication layer | 2015-01-22 16:37:08 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 53584420a5 | Move client rest tests back under rest | 2015-01-22 16:13:27 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 97c68c508d | Move rest APIs back under the rest directory | 2015-01-22 16:10:07 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | c2f9768740 | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections | 2015-01-22 15:57:26 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 73dd81ca62 | fix pyflakes | 2015-01-22 15:57:08 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | b1b85753d7 | Add support for storing rejected events in EventContext and data stores | 2015-01-22 15:50:17 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 1d2016b4a8 | Move client v1 api rest servlets into a "client/v1" directory | 2015-01-22 14:59:08 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 16bfabb9c5 | Fix manifest. Ignore contrib and docs directories when checking manifest against source control. | 2015-01-22 14:32:51 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | d00cca11b9 | Add demo and scripts to python manifest | 2015-01-22 14:28:07 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 58691680b8 | update .gitignore, set media-store-path in demo | 2015-01-22 14:20:53 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 7f058c5ff7 | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf Conflicts:
	synapse/app/homeserver.py | 2015-01-22 13:35:34 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | d3d0713de5 | Move experiments, graph and cmdclient into contrib | 2015-01-22 11:57:54 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | 8907e143c1 | Remove jsfiddles | 2015-01-22 11:15:03 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | f4ce61ed36 | Move scripts into scripts | 2015-01-22 11:14:14 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | 73315ce9de | Abstract out the room ID from presence tests, so it's stored in self | 2015-01-21 20:01:57 +00:00 |  | 
			
				
					| 
							
							
								 Paul "LeoNerd" Evans | dbe71e670c | Use common base class for two Presence unit-tests, avoiding boilerplate copypasta | 2015-01-21 16:58:16 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | b390bf39f2 | Remove unused function. Add comment. | 2015-01-21 16:44:04 +00:00 |  | 
			
				
					| 
							
							
								 Erik Johnston | 6dcade97be | Implement new state resolution algorithm | 2015-01-21 16:27:04 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | 5d5932d493 | use underscores everywhere, not camelcase. | 2015-01-20 11:52:08 +00:00 |  | 
			
				
					| 
							
							
								 David Baker | afb714f7be | add instance_handles to pushers so we have a way to refer to them even if the push token changes. | 2015-01-20 11:49:48 +00:00 |  | 
			
				
					| 
							
							
								 Mark Haines | dc70d1fef8 | Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have | 2015-01-19 16:24:54 +00:00 |  |