|  Erik Johnston | 8c652a2b5f | When we see a difference in current state, actually use state conflict resolution algorithm | 2015-02-13 14:20:05 +00:00 | 
				
					
						|  Erik Johnston | f8abbae99f | Remove unnecessary logging | 2015-02-10 15:45:50 +00:00 | 
				
					
						|  Erik Johnston | c86ebe7673 | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache Conflicts:
	synapse/app/homeserver.py
	synapse/state.py | 2015-02-10 11:04:37 +00:00 | 
				
					
						|  Erik Johnston | 2b042ad67f | Oops, we do want to defer.return regardless of whether we are caching or not | 2015-02-10 11:03:16 +00:00 | 
				
					
						|  Erik Johnston | d19e2ed02f | Move construction of object within if block | 2015-02-10 11:01:15 +00:00 | 
				
					
						|  Erik Johnston | d94f682a4c | During room intial sync, only calculate current state once. | 2015-02-09 17:41:29 +00:00 | 
				
					
						|  Erik Johnston | 5bf318e9a6 | Bug fixes. | 2015-02-06 16:52:22 +00:00 | 
				
					
						|  Erik Johnston | b4886264a3 | Bugfix cache layer | 2015-02-06 16:17:05 +00:00 | 
				
					
						|  Erik Johnston | c4e3029d55 | Add cache layer to state group resolution | 2015-02-06 16:08:13 +00:00 | 
				
					
						|  Erik Johnston | 650e32d455 | Change context.auth_events to what the auth_events would be bases on context.current_state, rather than based on the auth_events from the event. | 2015-02-04 14:06:46 +00:00 | 
				
					
						|  Erik Johnston | f275ba49bb | Fix state resolution to remember join_rules is a type of auth event. | 2015-02-04 10:36:28 +00:00 | 
				
					
						|  Erik Johnston | 7a1e881665 | Remove debug logging | 2015-01-30 15:56:32 +00:00 | 
				
					
						|  Erik Johnston | 1bd540ef79 | Merge branch 'develop' of github.com:matrix-org/synapse into rejections Conflicts:
	synapse/storage/schema/im.sql | 2015-01-30 15:16:38 +00:00 | 
				
					
						|  Erik Johnston | 3d7026e709 | Add a slightly more helpful comment | 2015-01-30 14:37:31 +00:00 | 
				
					
						|  Erik Johnston | c515d37797 | Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections Conflicts:
	synapse/storage/schema/delta/v12.sql | 2015-01-30 14:19:49 +00:00 | 
				
					
						|  Erik Johnston | 7a9f6f083e | Remove commented line | 2015-01-30 13:55:46 +00:00 | 
				
					
						|  Erik Johnston | 76d7fd39cd | Style changes. | 2015-01-30 13:52:02 +00:00 | 
				
					
						|  Erik Johnston | a70a801184 | Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response. | 2015-01-30 13:34:01 +00:00 | 
				
					
						|  Erik Johnston | 73dd81ca62 | fix pyflakes | 2015-01-22 15:57:08 +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 | 
				
					
						|  Mark Haines | adb04b1e57 | Update copyright notices | 2015-01-06 13:21:39 +00:00 | 
				
					
						|  Mark Haines | 56db465047 | Merge branch 'release-v0.6.0' into develop | 2014-12-16 17:29:49 +00:00 | 
				
					
						|  Erik Johnston | 23da4a4051 | Fix typo where we thought a list was a dict | 2014-12-16 15:59:40 +00:00 | 
				
					
						|  Mark Haines | c3eae8a88c | Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state | 2014-12-16 15:59:17 +00:00 | 
				
					
						|  Mark Haines | 8b8beba194 | Remove annotate_event_with_state as nothing was using it. Update state tests to call annotate_context_with_state | 2014-12-16 15:08:37 +00:00 | 
				
					
						|  Erik Johnston | 8133cdcc88 | Better english in docstrings are helpful. | 2014-12-16 13:32:06 +00:00 | 
				
					
						|  Erik Johnston | 4afac88390 | Add basic docstring to annotate_context_with_state | 2014-12-16 13:09:44 +00:00 | 
				
					
						|  Erik Johnston | 3c77d13aa5 | Kill off synapse.api.events.* | 2014-12-16 11:29:05 +00:00 | 
				
					
						|  Erik Johnston | 0b04369238 | Fix public room joining by making sure replaces_state never points to itself. | 2014-12-11 15:56:06 +00:00 | 
				
					
						|  Erik Johnston | 8cdebce470 | Fix redactions. Fix 'age' key | 2014-12-11 13:25:19 +00:00 | 
				
					
						|  Erik Johnston | 95aa903ffa | Try and figure out how and why signatures are being changed. | 2014-12-10 11:37:47 +00:00 | 
				
					
						|  Erik Johnston | 5eca288d28 | Fix joining from an invite | 2014-12-09 14:47:27 +00:00 | 
				
					
						|  Erik Johnston | 609c31e8df | More bug fixes | 2014-12-08 17:50:56 +00:00 | 
				
					
						|  Erik Johnston | ee3df06183 | More bug fixes | 2014-12-08 14:50:48 +00:00 | 
				
					
						|  Erik Johnston | d044121168 | Various typos and bug fixes. | 2014-12-08 09:08:26 +00:00 | 
				
					
						|  Erik Johnston | 6630e1b579 | Start making more things use EventContext rather than event.* | 2014-12-05 16:20:48 +00:00 | 
				
					
						|  Erik Johnston | 5d7c9ab789 | Begin converting things to use the new Event structure | 2014-12-04 11:27:59 +00:00 | 
				
					
						|  Erik Johnston | 3598c11c8d | Correctly handle the case where we get an event for an unknown room, which turns out we are actually in | 2014-11-26 10:41:08 +00:00 | 
				
					
						|  Erik Johnston | 997ed151db | synapse.state docs. | 2014-11-11 17:45:46 +00:00 | 
				
					
						|  Erik Johnston | 3db2c0d43e | Rename annotate_state_groups to annotate_event_with_state | 2014-11-11 16:58:53 +00:00 | 
				
					
						|  Erik Johnston | 092979b8cc | Fix bugs which broke federation due to changes in function signatures. | 2014-11-11 14:19:13 +00:00 | 
				
					
						|  Erik Johnston | 5ff0bfb81d | Fix bug where we /always/ created a new state group | 2014-11-11 14:16:41 +00:00 | 
				
					
						|  Erik Johnston | 46de65cab9 | Don't query the DB for user power levels | 2014-11-07 10:53:38 +00:00 | 
				
					
						|  Erik Johnston | 4317c8e583 | Implement new replace_state and changed prev_state `prev_state` is now a list of previous state ids, similiar to
prev_events. `replace_state` now points to what we think was replaced. | 2014-11-06 15:10:55 +00:00 | 
				
					
						|  Erik Johnston | 96c001e668 | Fix auth checks to all use the given old_event_state | 2014-11-05 11:07:54 +00:00 | 
				
					
						|  Erik Johnston | aa76bf39ab | Remove unused imports | 2014-11-04 14:14:02 +00:00 | 
				
					
						|  Erik Johnston | 9024a19658 | Remove dead code. | 2014-11-03 11:31:47 +00:00 | 
				
					
						|  Erik Johnston | 2f39dc19a2 | Remove more references to dead PDU tables | 2014-10-31 14:27:14 +00:00 | 
				
					
						|  Erik Johnston | 946d02536b | Remove unused functions. | 2014-10-31 11:45:08 +00:00 |