|  Daniel Wagner-Hall | f38df51e8d | Merge branch 'develop' into daniel/3pidinvites | 2015-10-15 11:51:55 +01:00 | 
				
					
						|  Erik Johnston | 858634e1d0 | Remove unused room_id arg | 2015-10-14 09:31:20 +01:00 | 
				
					
						|  Daniel Wagner-Hall | 0c38e8637f | Remove unnecessary class-wrapping | 2015-10-13 18:00:38 +01:00 | 
				
					
						|  Daniel Wagner-Hall | bb407cd624 | Re-add accidentally removed code | 2015-10-13 17:19:26 +01:00 | 
				
					
						|  Daniel Wagner-Hall | 17dffef5ec | Move event contents into third_party_layout field | 2015-10-13 15:48:12 +01:00 | 
				
					
						|  Daniel Wagner-Hall | d4bb28c59b | Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"" This reverts commit 34d26d3687. | 2015-10-06 09:58:21 -05:00 | 
				
					
						|  Daniel Wagner-Hall | c05b5ef7b0 | Merge branch 'develop' into daniel/3pidinvites | 2015-10-06 08:10:34 -05:00 | 
				
					
						|  Daniel Wagner-Hall | 34d26d3687 | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" This reverts commit 5879edbb09, reversing
changes made tob43930d4c9. | 2015-10-05 19:10:47 -05:00 | 
				
					
						|  Daniel Wagner-Hall | 58e6a58eb7 | Merge branch 'develop' into daniel/3pidinvites | 2015-10-05 10:33:41 -05:00 | 
				
					
						|  Erik Johnston | 49ebd472fa | Explicitly add Create event as auth event | 2015-10-02 13:22:36 +01:00 | 
				
					
						|  Erik Johnston | 5879edbb09 | Merge pull request #283 from matrix-org/erikj/atomic_join_federation Atomically persist events when joining a room over federation/ | 2015-10-02 09:18:44 +01:00 | 
				
					
						|  Daniel Wagner-Hall | 5b3e9713dd | Implement third party identifier invites | 2015-10-01 17:49:52 +01:00 | 
				
					
						|  Erik Johnston | 83892d0d30 | Comment | 2015-09-30 16:41:48 +01:00 | 
				
					
						|  Erik Johnston | 9d39615b7d | Rename var | 2015-09-30 16:37:59 +01:00 | 
				
					
						|  Mark Haines | 60728c8c9e | synapse/handlers/federation.py:_handle_auth_events was unused | 2015-09-23 10:25:26 +01:00 | 
				
					
						|  Erik Johnston | c34ffd2736 | Fix getting an event for a room the server forgot it was in | 2015-09-17 10:26:03 +01:00 | 
				
					
						|  Erik Johnston | 54e688277a | Also persist state | 2015-09-17 10:26:03 +01:00 | 
				
					
						|  Erik Johnston | 3a01901d6c | Capture err | 2015-09-17 10:26:03 +01:00 | 
				
					
						|  Erik Johnston | 744e7d2790 | Also handle state | 2015-09-17 10:26:03 +01:00 | 
				
					
						|  Erik Johnston | a3e332af19 | Don't bail out of joining if we encounter a rejected event | 2015-09-17 10:26:03 +01:00 | 
				
					
						|  Erik Johnston | 4678055173 | Refactor do_invite_join | 2015-09-17 10:24:51 +01:00 | 
				
					
						|  Erik Johnston | 3e9ee62db0 | Add missing param in store.get_state_groups invocation | 2015-08-21 09:15:13 +01:00 | 
				
					
						|  Erik Johnston | 9f7f228ec2 | Remove pointless map | 2015-08-13 17:20:59 +01:00 | 
				
					
						|  Erik Johnston | 1b994a97dd | Fix application of ACLs | 2015-08-11 10:41:40 +01:00 | 
				
					
						|  Erik Johnston | 07507643cb | Use dictionary cache to do group -> state fetching | 2015-08-05 15:11:42 +01:00 | 
				
					
						|  Erik Johnston | 4d6cb8814e | Speed up event filtering (for ACL) logic | 2015-08-04 09:32:23 +01:00 | 
				
					
						|  Erik Johnston | baa55fb69e | Merge pull request #193 from matrix-org/erikj/bulk_persist_event Add bulk insert events API | 2015-07-14 10:49:24 +01:00 | 
				
					
						|  Erik Johnston | b5f0d73ea3 | Add comment | 2015-07-09 17:09:26 +01:00 | 
				
					
						|  Erik Johnston | fb47c3cfbe | Rename key and values for m.room.history_visibility. Support 'invited' value | 2015-07-06 13:05:52 +01:00 | 
				
					
						|  Erik Johnston | c3e2600c67 | Filter and redact events that the other server doesn't have permission to see during backfill | 2015-07-03 17:52:57 +01:00 | 
				
					
						|  Erik Johnston | 5130d80d79 | Add bulk insert events API | 2015-06-25 17:29:34 +01:00 | 
				
					
						|  Erik Johnston | 8047fd2434 | Merge pull request #176 from matrix-org/erikj/backfill_auth Improve backfill. | 2015-06-03 17:25:37 +01:00 | 
				
					
						|  Erik Johnston | 1c3d844e73 | Don't needlessly compute context | 2015-06-03 16:41:51 +01:00 | 
				
					
						|  Erik Johnston | 09e23334de | Add a timeout | 2015-06-02 11:00:37 +01:00 | 
				
					
						|  Erik Johnston | 02410e9239 | Handle the fact we might be missing auth events | 2015-06-02 10:58:35 +01:00 | 
				
					
						|  Erik Johnston | e552b78d50 | Add some logging | 2015-06-02 10:28:14 +01:00 | 
				
					
						|  Erik Johnston | fde0da6f19 | Correctly look up auth_events | 2015-06-02 10:19:38 +01:00 | 
				
					
						|  Erik Johnston | 3f04a08a0c | Don't process events we've already processed. Remember to process state events | 2015-06-02 10:11:32 +01:00 | 
				
					
						|  Erik Johnston | 4bbfbf898e | Correctly pass in auth_events | 2015-06-01 17:02:23 +01:00 | 
				
					
						|  Erik Johnston | 20814fabdd | Actually fetch state for new backwards extremeties when backfilling. | 2015-05-20 11:59:02 +01:00 | 
				
					
						|  Erik Johnston | 7223129916 | Don't apply new room join hack if depth > 5 | 2015-05-19 14:16:08 +01:00 | 
				
					
						|  Erik Johnston | 5e7883ec19 | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | 2015-05-19 10:50:43 +01:00 | 
				
					
						|  Erik Johnston | ef910a0358 | Do work in parellel when joining a room | 2015-05-18 17:17:04 +01:00 | 
				
					
						|  Mark Haines | 899d4675dd | Merge branch 'notifier_unify' into notifier_performance | 2015-05-14 11:36:44 +01:00 | 
				
					
						|  Mark Haines | 63878c0379 | Don't bother checking for updates if the stream token hasn't advanced for a user | 2015-05-13 13:42:21 +01:00 | 
				
					
						|  Erik Johnston | 80fd2b574c | Don't talk to yourself when backfilling | 2015-05-12 16:19:46 +01:00 | 
				
					
						|  Mark Haines | a6fb2aa2a5 | Merge pull request #144 from matrix-org/erikj/logging_context Preserving logging contexts | 2015-05-12 15:23:50 +01:00 | 
				
					
						|  Erik Johnston | 07a1223156 | s/backfil/backfill/ | 2015-05-12 14:09:54 +01:00 | 
				
					
						|  Erik Johnston | 0d31ad5101 | Typos everywhere | 2015-05-12 14:02:01 +01:00 | 
				
					
						|  Erik Johnston | a0dfffb33c | And another typo. | 2015-05-12 14:00:31 +01:00 |