Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5dea4d37d1 
								
							
								 
							
						 
						
							
							
								
								Update some comments  
							
							 
							
							... 
							
							
							
							Add a couple of type annotations, docstrings, and other comments, in the
interest of keeping track of what types I have.
Merged from pull request #370 . 
							
						 
						
							2015-11-13 10:31:15 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								78f6010207 
								
							
								 
							
						 
						
							
							
								
								Fix an issue with ignoring power_level changes on divergent graphs  
							
							 
							
							... 
							
							
							
							Changes to m.room.power_levels events are supposed to be handled at a high
priority; however a typo meant that the relevant bit of code was never
executed, so they were handled just like any other state change - which meant
that a bad person could cause room state changes by forking the graph from a
point in history when they were allowed to do so. 
							
						 
						
							2015-11-12 15:24:59 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								82b8d4b86a 
								
							
								 
							
						 
						
							
							
								
								synapse/state.py:_get_state_key_from_event was unused  
							
							 
							
							
							
						 
						
							2015-09-23 10:27:47 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b105996fc1 
								
							
								 
							
						 
						
							
							
								
								Remove run_on_reactor  
							
							 
							
							
							
						 
						
							2015-09-17 10:28:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2df8dd9b37 
								
							
								 
							
						 
						
							
							
								
								Move all the caches into their own package, synapse.util.caches  
							
							 
							
							
							
						 
						
							2015-08-11 18:00:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07507643cb 
								
							
								 
							
						 
						
							
							
								
								Use dictionary cache to do group -> state fetching  
							
							 
							
							
							
						 
						
							2015-08-05 15:11:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3bbd0d0e09 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #180  from matrix-org/erikj/prev_state_context  
							
							 
							
							... 
							
							
							
							Don't needlessly compute prev_state 
							
						 
						
							2015-06-03 17:20:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								55bf90b9e4 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute prev_state  
							
							 
							
							
							
						 
						
							2015-06-03 16:44:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								53f0bf85d7 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2015-06-03 16:43:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1c3d844e73 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute context  
							
							 
							
							
							
						 
						
							2015-06-03 16:41:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								23c639ff32 
								
							
								 
							
						 
						
							
							
								
								Split a storage function in two so that we don't have to do extra work.  
							
							 
							
							
							
						 
						
							2015-05-01 10:17:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b2e6ee5b43 
								
							
								 
							
						 
						
							
							
								
								Remove concept of context.auth_events, instead use context.current_state  
							
							 
							
							
							
						 
						
							2015-03-16 13:06:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ea8590cf66 
								
							
								 
							
						 
						
							
							
								
								Make context.auth_events grap auth events from current state. Otherwise auth is wrong.  
							
							 
							
							
							
						 
						
							2015-03-16 00:18:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2674aeb96a 
								
							
								 
							
						 
						
							
							
								
								Factor out ExpiringCache from StateHandler  
							
							 
							
							
							
						 
						
							2015-02-16 16:16:47 +00:00  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d84f5b30b8 
								
							
								 
							
						 
						
							
							
								
								old_state_events should be a dict not list  
							
							 
							
							
							
						 
						
							2014-10-31 10:47:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								12ce441e67 
								
							
								 
							
						 
						
							
							
								
								Convert event ids to be of the form :example.com  
							
							 
							
							
							
						 
						
							2014-10-30 17:00:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								da511334d2 
								
							
								 
							
						 
						
							
							
								
								Make federation return the old current state, so that we can use it to do auth  
							
							 
							
							
							
						 
						
							2014-10-30 11:53:35 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e7858b6d7e 
								
							
								 
							
						 
						
							
							
								
								Start filling out and using new events tables  
							
							 
							
							
							
						 
						
							2014-10-29 16:59:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c372929ab6 
								
							
								 
							
						 
						
							
							
								
								Remove duplicate import  
							
							 
							
							
							
						 
						
							2014-10-27 16:31:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ad9226eeec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/storage/__init__.py 
							
						 
						
							2014-10-27 11:58:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b3b1961496 
								
							
								 
							
						 
						
							
							
								
								Fix bug where people could join private rooms  
							
							 
							
							
							
						 
						
							2014-10-17 19:37:41 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5ffe5ab43f 
								
							
								 
							
						 
						
							
							
								
								Use state groups to get current state. Make join dance actually work.  
							
							 
							
							
							
						 
						
							2014-10-17 18:56:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f71627567b 
								
							
								 
							
						 
						
							
							
								
								Finish implementing the new join dance.  
							
							 
							
							
							
						 
						
							2014-10-17 15:04:17 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								bb04447c44 
								
							
								 
							
						 
						
							
							
								
								Include hashes of previous pdus when referencing them  
							
							 
							
							
							
						 
						
							2014-10-16 23:25:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e7bc1291a0 
								
							
								 
							
						 
						
							
							
								
								Begin making auth use event.old_state_events  
							
							 
							
							
							
						 
						
							2014-10-15 16:06:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5fefc12d1e 
								
							
								 
							
						 
						
							
							
								
								Begin implementing state groups.  
							
							 
							
							
							
						 
						
							2014-10-14 16:59:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								39e3fc69e5 
								
							
								 
							
						 
						
							
							
								
								Make the state resolution use actual power levels rather than taking them from a Pdu key.  
							
							 
							
							
							
						 
						
							2014-09-12 17:11:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								942d8412c4 
								
							
								 
							
						 
						
							
							
								
								Handle the case where we don't have a common ancestor  
							
							 
							
							
							
						 
						
							2014-09-08 20:13:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								83ce57302d 
								
							
								 
							
						 
						
							
							
								
								Fix bug in state handling where we incorrectly identified a missing pdu. Update tests to catch this case.  
							
							 
							
							
							
						 
						
							2014-09-08 19:50:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2205aba3ed 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we used an event_id as a pdu_id  
							
							 
							
							
							
						 
						
							2014-09-06 07:41:51 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8a7c1d6a00 
								
							
								 
							
						 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.  
							
							 
							
							
							
						 
						
							2014-09-03 17:31:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b5f9d47c89 
								
							
								 
							
						 
						
							
							
								
								Handle new state events which don't have a common ancestor  
							
							 
							
							
							
						 
						
							2014-09-03 15:50:05 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a0d1f5a014 
								
							
								 
							
						 
						
							
							
								
								Start updating state handling to use snapshots  
							
							 
							
							
							
						 
						
							2014-08-27 15:11:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0e938b1ff7 
								
							
								 
							
						 
						
							
							
								
								Rename method name to not clash with other ones in storage.  
							
							 
							
							
							
						 
						
							2014-08-15 16:47:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c5f2da5875 
								
							
								 
							
						 
						
							
							
								
								Add a check to make sure that during state conflict res we only request a PDU we don't have.  
							
							 
							
							
							
						 
						
							2014-08-15 11:47:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1a26905cc9 
								
							
								 
							
						 
						
							
							
								
								Fix pontenial bug in state resolution handler that compared dicts rather than their id's  
							
							 
							
							
							
						 
						
							2014-08-15 11:41:20 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f98e6380f1 
								
							
								 
							
						 
						
							
							
								
								add in whitespace after copyright statements to improve legibility  
							
							 
							
							
							
						 
						
							2014-08-13 03:14:34 +01:00  
						
					 
				
					
						
							
							
								 
								matrix.org
							
						 
						
							 
							
							
							
								
							
								4f475c7697 
								
							
								 
							
						 
						
							
							
								
								Reference Matrix Home Server  
							
							 
							
							
							
						 
						
							2014-08-12 15:10:52 +01:00