matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove some run_on_reactors	Erik Johnston	2015-05-01	3	-10/+0
\|
*	Don't log all auth events every time we call auth.check	Erik Johnston	2015-05-01	1	-1/+4
\|
*	Use the daemonize key from the config if it exists	Mark Haines	2015-05-01	1	-1/+4
\|
*	Don't use self.execute: it's designed for fetching stuff	David Baker	2015-05-01	1	-3/+8
\|
*	database config is not kept in separate config file anymore	Mark Haines	2015-05-01	1	-13/+9
\|
*	Merge pull request #136 from matrix-org/markjh/config_cleanup	Mark Haines	2015-05-01	19	-496/+572
\|\ \| \| \| \|	Config restructuring.
\| *	Allow generate-config to run against an existing config file to generate ↵	Mark Haines	2015-05-01	3	-14/+26
\| \| \| \| \| \| \| \|	default keys
\| *	Allow "manhole" to be ommited from the config	Mark Haines	2015-04-30	1	-1/+1
\| \|
\| *	Remove the ~, comment the lines instead	Mark Haines	2015-04-30	2	-2/+2
\| \|
\| *	Update key.py	Mark Haines	2015-04-30	1	-1/+2
\| \|
\| *	Update metrics.py	Mark Haines	2015-04-30	1	-2/+2
\| \|
\| *	Update README.rst	Mark Haines	2015-04-30	1	-1/+1
\| \|
\| *	missing import	Mark Haines	2015-04-30	1	-0/+2
\| \|
\| *	read the pid_file from the config file in synctl	Mark Haines	2015-04-30	2	-3/+4
\| \|
\| *	Can't specify bind-port on the cmdline anymore	Mark Haines	2015-04-30	1	-2/+1
\| \|
\| *	Merge branch 'develop' into markjh/config_cleanup	Mark Haines	2015-04-30	16	-88/+176
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/config/captcha.py
\| * \|	Write a default log_config when generating config	Mark Haines	2015-04-30	5	-6/+59
\| \| \|
\| * \|	Don't break when sizes or durations are given as integers	Mark Haines	2015-04-30	2	-12/+15
\| \| \|
\| * \|	Add a random string to the auto generated key id	Mark Haines	2015-04-30	1	-1/+3
\| \| \|
\| * \|	Allow --enable-registration to be passed on the commandline	Mark Haines	2015-04-30	1	-3/+16
\| \| \|
\| * \|	Use disable_registration keys if they are present	Mark Haines	2015-04-30	1	-0/+5
\| \| \|
\| * \|	Allow multiple config files, set up a default config before applying the ↵	Mark Haines	2015-04-30	3	-23/+40
\| \| \| \| \| \| \| \| \| \| \| \|	config files
\| * \|	remove duplicate parse_size method	Mark Haines	2015-04-30	2	-10/+0
\| \| \|
\| * \|	Manually generate the default config yaml, remove most of the commandline ↵	Mark Haines	2015-04-30	17	-478/+457
\| \| \| \| \| \| \| \| \| \| \| \|	arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class
* \| \|	No id field on user	David Baker	2015-05-01	1	-5/+1
\| \| \|
* \| \|	More missed get_user_by_id API changes	David Baker	2015-05-01	2	-4/+4
\| \| \|
* \| \|	One too many lens	Erik Johnston	2015-05-01	1	-1/+1
\| \| \|
* \| \|	Change public room list to use defer.gatherResults	Erik Johnston	2015-05-01	1	-5/+13
\| \| \|
* \| \|	This api now no longer returns an array	David Baker	2015-05-01	1	-1/+1
\| \| \|
* \| \|	Don't wait for storage of access_token	Erik Johnston	2015-05-01	1	-1/+1
\| \| \|
* \| \|	Cache latest_event_ids_in_room	Erik Johnston	2015-05-01	1	-1/+4
\| \| \|
* \| \|	Don't lock user_ips table for upsert.	Erik Johnston	2015-05-01	2	-4/+10
\| \| \|
* \| \|	Fix bug where we reconnected to the database on every query.	Erik Johnston	2015-05-01	2	-1/+2
\| \| \|
* \| \|	Split a storage function in two so that we don't have to do extra work.	Erik Johnston	2015-05-01	3	-8/+14
\| \| \|
* \| \|	Remove pointless join	Erik Johnston	2015-04-30	1	-5/+4
\| \| \|
* \| \|	Fix broken SQL	Erik Johnston	2015-04-30	1	-1/+1
\| \| \|
* \| \|	Need more yield	Erik Johnston	2015-04-30	1	-1/+1
\| \| \|
* \| \|	Add missing param	Erik Johnston	2015-04-30	1	-1/+1
\| \| \|
* \| \|	More join conditions	Erik Johnston	2015-04-30	1	-2/+6
\| \| \|
* \| \|	Add more conditions on JOINs to make postgres go a little faster.	Erik Johnston	2015-04-30	2	-4/+6
\| \| \|
* \| \|	Fix up get_current_state and get_room_name_and_aliases queries to parse ↵	Erik Johnston	2015-04-30	2	-32/+30
\| \|/ \|/\| \| \| \| \|	events in transaction
* \|	Add get_rooms_for_user cache	Erik Johnston	2015-04-30	1	-0/+2
\| \|
* \|	Undo changes to logger config, ie. remove the access_log_file option: ↵	David Baker	2015-04-30	1	-16/+0
\| \| \| \| \| \| \| \|	decision is to support this through log_config rather tan adding an option.
* \|	Do access log using python's logging stuff, just under a separate logger name	David Baker	2015-04-30	2	-14/+39
\| \|
* \|	Don't use sub queries, it makes postgres sad	Erik Johnston	2015-04-30	1	-11/+5
\| \|
* \|	SYN-367: Use upsert rather than insert_or_replace	Mark Haines	2015-04-30	1	-2/+6
\| \|
* \|	Don't needlessly join on state_events	Erik Johnston	2015-04-30	2	-6/+4
\| \|
* \|	Add an access_log	David Baker	2015-04-30	3	-3/+29
\| \| \| \| \| \| \| \|	SYN-161 #resolve
* \|	Unused import	David Baker	2015-04-30	1	-1/+1
\| \|
* \|	Doesn't look like this is used anymore	David Baker	2015-04-30	1	-13/+0
\| \|
* \|	Make simple query rather than long one and then throw away half the results	Erik Johnston	2015-04-30	2	-2/+11
\| \|
* \|	Correctly decode, for sqlite and postgres, rows from pushers table	Erik Johnston	2015-04-29	1	-19/+24
\| \|
* \|	pushkey' are also bytes.	Erik Johnston	2015-04-29	1	-8/+17
\| \|
* \|	Typo	Erik Johnston	2015-04-29	1	-1/+1
\| \|
* \|	Also remove yield from within lock in the other generator	Erik Johnston	2015-04-29	1	-8/+6
\| \|
* \|	Fix deadlock in id_generators. No idea why this was an actual deadlock.	Erik Johnston	2015-04-29	1	-14/+16
\| \|
* \|	Also log when we've started pushers	Erik Johnston	2015-04-29	1	-0/+2
\| \|
* \|	Revert previous	Erik Johnston	2015-04-29	1	-5/+1
\| \|
* \|	Only start pushers when synapse has fully started	Erik Johnston	2015-04-29	2	-4/+5
\| \|
* \|	Start pushers on reactor thread	Erik Johnston	2015-04-29	1	-0/+3
\| \|
* \|	Actually return rows	Erik Johnston	2015-04-29	1	-0/+2
\| \|
* \|	Typo, args wrong way round	Erik Johnston	2015-04-29	1	-4/+1
\| \|
* \|	Decode buffers in same thread	Erik Johnston	2015-04-29	1	-13/+19
\| \|
* \|	We store pusher data as bytes	Erik Johnston	2015-04-29	1	-2/+2
\| \|
* \|	Fix off by one in presence token handling	Erik Johnston	2015-04-29	1	-1/+1
\| \|
* \|	Decode the data json in the storage layer (was moved but this part was missed)	David Baker	2015-04-29	2	-1/+14
\| \|
* \|	Oops, update the contraint too	David Baker	2015-04-29	1	-1/+1
\| \|
* \|	Be more postgressive	David Baker	2015-04-29	2	-4/+4
\| \|
* \|	Be postgressive	David Baker	2015-04-29	1	-4/+3
\| \|
* \|	Oops, forgot the schema delta file	David Baker	2015-04-29	1	-0/+10
\| \|
* \|	txn.execute doesn't return cursors	Erik Johnston	2015-04-29	1	-4/+4
\| \|
* \|	txn.execute doesn't return cursors	Erik Johnston	2015-04-29	1	-2/+2
\| \|
* \|	Fix invalid SQL to work in postgres land	Erik Johnston	2015-04-29	1	-4/+6
\| \|
* \|	Accept camelcase + underscores in binding too	David Baker	2015-04-29	1	-2/+17
\|/
*	Fix includes	David Baker	2015-04-29	1	-1/+2
\|
*	Accept both camelcase and underscore threepid creds for transition	David Baker	2015-04-29	1	-4/+19
\|
*	pushers table requires an access_token	Erik Johnston	2015-04-29	1	-0/+1
\|
*	Fix whitespace	Mark Haines	2015-04-29	1	-1/+1
\|
*	Check requirements before doing anything else when running the homeserver	Mark Haines	2015-04-29	1	-1/+4
\|
*	bump syutil to 0.0.6	Mark Haines	2015-04-29	1	-3/+3
\|
*	We can't use REPLACE when upgrading databases now we have postgres	Erik Johnston	2015-04-29	1	-1/+2
\|
*	Merge pull request #129 from matrix-org/key_distribution	Erik Johnston	2015-04-29	15	-76/+966
\|\ \| \| \| \|	Key distribution v2
\| *	bump database schema version	Mark Haines	2015-04-29	2	-1/+1
\| \|
\| *	Use a defer.gatherResults to collect results from the perspective servers	Mark Haines	2015-04-29	1	-11/+21
\| \|
\| *	Use bytea rather than BLOB	Mark Haines	2015-04-29	1	-1/+1
\| \|
\| *	Merge branch 'develop' into key_distribution	Mark Haines	2015-04-29	115	-1134/+4442
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/config/homeserver.py
\| * \|	Update the query format used by keyring to match current key v2 spec	Mark Haines	2015-04-29	1	-1/+12
\| \| \|
\| * \|	Implement minimum_valid_until_ts in the remote key resource	Mark Haines	2015-04-29	2	-4/+56
\| \| \|
\| * \|	And don't bump the schema version unnecessarily	Mark Haines	2015-04-28	1	-1/+1
\| \| \|
\| * \|	Add server_keys.sql to the current delta rather than creating a new delta	Mark Haines	2015-04-28	1	-0/+0
\| \| \|
\| * \|	Merge branch 'develop' into key_distribution	Mark Haines	2015-04-27	5	-28/+74
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/crypto/keyring.py
\| * \| \|	Add config for setting the perspective servers	Mark Haines	2015-04-24	3	-5/+27
\| \| \| \|
\| * \| \|	Merge branch 'develop' into key_distribution	Mark Haines	2015-04-24	1	-1/+1
\| \|\ \ \
\| * \ \ \	Merge branch 'develop' into key_distribution	Mark Haines	2015-04-24	1	-0/+1
\| \|\ \ \ \
\| * \| \| \| \|	Add a config file for perspective servers	Mark Haines	2015-04-24	2	-0/+30
\| \| \| \| \| \|
\| * \| \| \| \|	Copyright notice	Mark Haines	2015-04-24	1	-0/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into key_distribution	Mark Haines	2015-04-24	12	-67/+309
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Move the key related config parser into a separate file	Mark Haines	2015-04-24	3	-85/+113
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Better help for the old-signing-key option	Mark Haines	2015-04-24	1	-1/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update to match the specification for key/v2	Mark Haines	2015-04-23	3	-21/+26
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Implement remote key lookup api	Mark Haines	2015-04-22	7	-61/+252
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' into key_distribution	Mark Haines	2015-04-21	9	-296/+258
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'develop' into key_distribution	Mark Haines	2015-04-20	8	-28/+151
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Implement v2 key lookup	Mark Haines	2015-04-20	2	-18/+254
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add methods for storing and retrieving the raw key json	Mark Haines	2015-04-15	2	-3/+59
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fail quicker for 4xx responses in the key client, optional hit a different ↵	Mark Haines	2015-04-15	1	-6/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API path
\| * \| \| \| \| \| \| \|	Return a sha256 fingerprint rather than the entire tls certificate	Mark Haines	2015-04-14	3	-3/+33
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add a version 2 of the key server api	Mark Haines	2015-04-14	6	-2/+179
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #135 from matrix-org/erikj/postgres_charset_check	Mark Haines	2015-04-29	6	-8/+61
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check that postgres database has correct charset set
\| * \| \| \| \| \| \| \| \|	Make postgres database error slightly more helpful	Erik Johnston	2015-04-29	2	-13/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use __all__ instead of assert to stop pyflakes from warning about unused ↵	Erik Johnston	2015-04-29	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	import in __init__
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into erikj/postgres_charset_check	Mark Haines	2015-04-29	2	-1/+17
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Appease PEP8	Erik Johnston	2015-04-29	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Check that postgres database has correct charset set	Erik Johnston	2015-04-29	6	-1/+47
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	minimal doc	Matthew Hodgson	2015-04-29	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #134 from intelfx/contrib-systemd	Matthew Hodgson	2015-04-29	2	-0/+35
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	contrib/systemd: add a sample systemd unit file and a logger configuration
\| * \| \| \| \| \| \| \| \|	contrib/systemd: add a sample systemd unit file and a logger configuration	Ivan Shapovalov	2015-04-29	2	-0/+35
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The added logger configuration (--log-config or log_config:) uses systemd's python bindings to pass messages directly to the journal. Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
* \| \| \| \| \| \| \| \|	Mention that postgres databases must have the correct charset encoding	Erik Johnston	2015-04-29	1	-0/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Delete ugly commented out log line.	Mark Haines	2015-04-29	1	-1/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	improve postgres blurb a bit	Matthew Hodgson	2015-04-29	1	-7/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	comment out ugly test logline	Matthew Hodgson	2015-04-29	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	mention silviof's dockerfile	Matthew Hodgson	2015-04-29	1	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	general clean up. s/alpha/beta/g. add intelfx's AUR package for Arch. s/the ↵	Matthew Hodgson	2015-04-29	1	-46/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	homeserver/Synapse/g. move installation & running sections closer together.
* \| \| \| \| \| \| \|	Fix rst	Erik Johnston	2015-04-28	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update docs/postgres.rst to explain port script usage	Erik Johnston	2015-04-28	1	-0/+51
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add better help to scripts/port_from_sqlite_to_postgres.py	Erik Johnston	2015-04-28	1	-5/+27
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Ensure we never miss any presence updates	Erik Johnston	2015-04-28	1	-1/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix typo	Erik Johnston	2015-04-28	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Ensure the serial returned by presence is always an integer	Erik Johnston	2015-04-28	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #123 from matrix-org/postgres	Erik Johnston	2015-04-28	82	-822/+2905
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgres
\| * \| \| \| \| \| \| \|	Remove unused imports	Erik Johnston	2015-04-28	1	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	Erik Johnston	2015-04-28	37	-304/+1361
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #126 from matrix-org/csauth	Mark Haines	2015-04-28	34	-287/+1323
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Client / Server Auth Refactor
\| * \| \| \| \| \| \| \| \|	Add commentage.	David Baker	2015-04-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	pep8	David Baker	2015-04-27	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	logging args	David Baker	2015-04-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change to https for ID server communication	David Baker	2015-04-24	1	-3/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	More underscores	David Baker	2015-04-24	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use underscores instead of camelcase for id server stuff	David Baker	2015-04-24	3	-14/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	pep8	David Baker	2015-04-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into csauth	David Baker	2015-04-24	18	-368/+585
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/http/server.py
\| * \| \| \| \| \| \| \| \| \|	Dedicated error code for failed 3pid auth verification	David Baker	2015-04-23	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove ultimately unused feature of saving params from the first call in the ↵	David Baker	2015-04-23	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	session: it's probably too open to abuse.
\| * \| \| \| \| \| \| \| \| \|	Add an error code to 'missing token' response.	David Baker	2015-04-23	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove now-redundant email config	David Baker	2015-04-23	2	-44/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	pep8	David Baker	2015-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Password reset, finally.	David Baker	2015-04-17	3	-7/+38
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add endpoint to get threepids from server	David Baker	2015-04-17	2	-0/+23
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	pep8	David Baker	2015-04-17	4	-9/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	make add3pid servlet work	David Baker	2015-04-17	4	-12/+82
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	just the once would probably be fine	David Baker	2015-04-17	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into csauth	David Baker	2015-04-17	45	-537/+1817
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Register the 3pid servlet	David Baker	2015-04-17	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	password -> account servlet and add start of an 'add 3pid' endpoint	David Baker	2015-04-17	2	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Need to yield the username check, otherwise very very weird things happen.	David Baker	2015-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Oops, left debugging in.	David Baker	2015-04-16	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Return user ID in use error straight away	David Baker	2015-04-16	4	-66/+88
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Dummy login so we can do the first POST request to get login flows without ↵	David Baker	2015-04-15	4	-7/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it just succeeding
\| * \| \| \| \| \| \| \| \| \| \|	Regstration with email in v2	David Baker	2015-04-15	6	-29/+123
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add app service auth back in to v2 register	David Baker	2015-04-02	2	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Throw sensible errors on not-json when allowing empty body	David Baker	2015-04-02	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2015-04-02	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add shared secret auth into register v2 and switch the script over.	David Baker	2015-04-02	3	-15/+63
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Explain how I justified to myself making JsonResource not always send JSON.	David Baker	2015-04-01	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Completely replace fallback auth for C/S V2:	David Baker	2015-04-01	6	-26/+280
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Now only the auth part goes to fallback, not the whole operation * Auth fallback is a normal API endpoint, not a static page * Params like the recaptcha pubkey can just live in the config Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now.
\| * \| \| \| \| \| \| \| \| \| \|	Make docs a bit more true	David Baker	2015-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Grammar and deduplication	David Baker	2015-03-31	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2015-03-31	3	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Update CAPTCHA_SETUP (it continues to ignore fallback, but I guess I should ↵	David Baker	2015-03-30	1	-21/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix it so that doesn't need the key in two different places)
\| * \| \| \| \| \| \| \| \| \| \|	Add original, unmodified CAPTCHA-SETUP from the webclient repo before ↵	David Baker	2015-03-30	1	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	modifying (captcha setup is now purely on the HS).
\| * \| \| \| \| \| \| \| \| \| \|	New registration for C/S API v2. Only ReCAPTCHA working currently.	David Baker	2015-03-30	8	-16/+192
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2015-03-26	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Delete pushers when changing password	David Baker	2015-03-26	3	-37/+31
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	pep8 blank lines	David Baker	2015-03-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ↵	David Baker	2015-03-25	5	-28/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	flag in the API.
\| * \| \| \| \| \| \| \| \| \| \|	Fix tests	David Baker	2015-03-24	5	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Don't test exact equality of the list: as long as it has the fields we ↵	David Baker	2015-03-24	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	expect, that's just fine. I added the user_id (as in database pkey) and it broke: no point testing what that comes out as: it's determined by the db.
\| * \| \| \| \| \| \| \| \| \| \|	unused import	David Baker	2015-03-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	1) Pushers are now associated with an access token	David Baker	2015-03-24	8	-26/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it.
\| * \| \| \| \| \| \| \| \| \| \|	Make deleting other access tokens when you change your password actually work	David Baker	2015-03-24	2	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	pep8 / pyflakes	David Baker	2015-03-23	2	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Implement password changing (finally) along with a start on making ↵	David Baker	2015-03-23	7	-49/+236
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	client/server auth more general.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #133 from matrix-org/invite_power_level	Mark Haines	2015-04-28	2	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Invite power level
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' into invite_power_level	Paul "LeoNerd" Evans	2015-04-27	17	-73/+366
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Also remember to check 'invite' level for changes	Paul "LeoNerd" Evans	2015-04-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Create an 'invite' powerlevel when making new rooms	Paul "LeoNerd" Evans	2015-04-21	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Initial implementation of an 'invite' power_level	Paul "LeoNerd" Evans	2015-04-21	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #130 from matrix-org/server_rename_check	Mark Haines	2015-04-28	2	-1/+28
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for SYN-266
\| * \| \| \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2015-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2015-04-27	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Run database check before daemonizing, at the cost of database hygiene.	David Baker	2015-04-27	3	-27/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	rename db method to be more informative	David Baker	2015-04-27	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2015-04-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Check users in our table aren't on a different domain to the one we're ↵	David Baker	2015-04-24	2	-0/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configured with to try & fix SYN-266
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Output vim style mode markers into the yaml config file	Mark Haines	2015-04-28	1	-3/+4
\| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Quickly fix dodgy est. time remaining	Erik Johnston	2015-04-28	1	-7/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except ↵	Erik Johnston	2015-04-28	32	-289/+289
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for a limit
\| \| \| \| \| \| * \| \| \| \| \| \|	Correctly handle total/remaining counts in the presence of ↵	Erik Johnston	2015-04-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sent_transasctions table
\| \| \| \| \| \| * \| \| \| \| \| \|	Correctly handle total/remaining counts in the presence of ↵	Erik Johnston	2015-04-28	1	-123/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sent_transasctions table
\| \| \| \| \| \| * \| \| \| \| \| \|	Remove accidentally committed debug hardcode hack	Erik Johnston	2015-04-28	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Typo in port script	Erik Johnston	2015-04-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Split setuping up and processing of tables	Erik Johnston	2015-04-27	1	-8/+23
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Shuffle progress stuff	Erik Johnston	2015-04-27	1	-201/+174
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Don't port over all of the sent_transactions table	Erik Johnston	2015-04-27	1	-38/+120
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Remove unused import	Erik Johnston	2015-04-27	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Move database configuration into config module	Erik Johnston	2015-04-27	2	-33/+25
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Ensure check_same_thread is enabled for sqlite3	Erik Johnston	2015-04-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Make get_max_token into inlineCallbacks so that the lock works.	Erik Johnston	2015-04-27	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Add docs on how to use synapse with psycopg2	Erik Johnston	2015-04-27	1	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	Erik Johnston	2015-04-27	24	-391/+642
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #132 from matrix-org/observer_and_locks	Erik Johnston	2015-04-27	3	-1/+42
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Observer and locks
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix newlines	Erik Johnston	2015-04-27	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Pull inner function out.	Erik Johnston	2015-04-27	1	-76/+77
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Implement locks using create_observer for fetching media and server keys	Erik Johnston	2015-04-27	2	-60/+82
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Implement create_observer.	Erik Johnston	2015-04-27	1	-0/+19
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`create_observer` takes a deferred and create a new deferred that observers the original deferred. Any callbacks added to the observing deferred will not affect the origin deferred.
* \| \| \| \| \| \| \| \| \| \| \|	Add note about updating your signing keys (ie. "the auto thing")	David Baker	2015-04-24	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Matrix ID server is now HTTPS	David Baker	2015-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Remove ancient history	David Baker	2015-04-24	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Pedant: OS X has a space	David Baker	2015-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Make one-to-one rule an underride otherwise bings don't work in one-to-one ↵	David Baker	2015-04-24	1	-21/+21
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrooms. Likewise a couple of other rules.
* \| \| \| \| \| \| \| \| \| \|	Fix spelling	Mark Haines	2015-04-24	1	-1/+1
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Call the super classes when generating config	Mark Haines	2015-04-24	1	-0/+1
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Copyright notices	Mark Haines	2015-04-24	6	-0/+84
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	No commas here, otherwise our error string constants become tuples.	David Baker	2015-04-24	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove users from the remote_offline_serials list (and clean up empty ↵	Paul "LeoNerd" Evans	2015-04-23	2	-1/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	elements) when they go online again
* \| \| \| \| \| \| \|	Don't let the remote offline serial list grow arbitrarily large	Paul "LeoNerd" Evans	2015-04-23	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Store a list of the presence serial number at which remote users went ↵	Paul "LeoNerd" Evans	2015-04-23	2	-0/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)
* \| \| \| \| \| \| \|	Generate presence event-stream JSON structures directly	Paul "LeoNerd" Evans	2015-04-23	1	-8/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Mumble ReST mumble ``fixed-width`` mumble	Paul "LeoNerd" Evans	2015-04-23	1	-5/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Formatting / wording fixes to metrics doc	Paul "LeoNerd" Evans	2015-04-23	1	-12/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	prometheus/metrics howto from Leo	Matthew Hodgson	2015-04-23	1	-0/+49
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Neater fetching of user's auth level in a room - squash to int() at access ↵	Paul "LeoNerd" Evans	2015-04-22	1	-35/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	time (SYN-353)
* \| \| \| \| \| \| \|	Appease pep8	Paul "LeoNerd" Evans	2015-04-22	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add info on breaking AS API changes	Kegsay	2015-04-22	1	-0/+34
\|/ / / / / / /
* \| \| \| \| \| \|	Much neater fetching of defined powerlevels from m.room.power_levels state event	Paul "LeoNerd" Evans	2015-04-21	1	-31/+21
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove debugging print statement accidentally committed	Paul "LeoNerd" Evans	2015-04-21	1	-1/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Sanitise a user's powerlevel to an int() before numerical comparison, ↵	Paul "LeoNerd" Evans	2015-04-21	1	-0/+7
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	because otherwise Python is "helpful" with it (SYN-351)
* \| \| \| \| \|	Bump syutil version to 0.0.5	Mark Haines	2015-04-21	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #128 from matrix-org/unify_http_wrappers	Mark Haines	2015-04-21	7	-289/+251
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify http wrappers
\| * \| \| \| \| \|	Set a version_string in BaseMediaResource so that the request_handler ↵	Mark Haines	2015-04-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrapper works
\| * \| \| \| \| \|	Combine the request wrappers in rest/media/v1 and http/server into a single ↵	Mark Haines	2015-04-21	7	-198/+140
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrapper decorator
\| * \| \| \| \| \|	Split out the JsonResource request logging and error handling into a ↵	Mark Haines	2015-04-21	1	-94/+113
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	separate wrapper function
* \| \| \| \| \|	Merge pull request #127 from matrix-org/bugs/SYN-350	Mark Haines	2015-04-21	1	-4/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	SYN-350: Don't ratelimit the events generated during create room
\| * \| \| \| \|	SYN-350: Don't ratelimit the individual events generated during room creation	Mark Haines	2015-04-21	1	-4/+4
\|/ / / / /
\| \| \| * \|	Shuffle operations so that locking upsert happens last in the txn. This ↵	Erik Johnston	2015-04-27	5	-56/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ensures the lock is held for the least amount of time possible.
\| \| \| * \|	Handle the fact that postgres databases can be restarted from under us	Erik Johnston	2015-04-27	3	-1/+33
\| \| \| \| \|
\| \| \| * \|	Revert needless change to rest.profile	Erik Johnston	2015-04-17	1	-6/+1
\| \| \| \| \|
\| \| \| * \|	Revert needless change to storage.profile	Erik Johnston	2015-04-17	1	-6/+1
\| \| \| \| \|
\| \| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	Erik Johnston	2015-04-17	2	-2/+7
\| \| \| \|\ \ \| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-04-17	2	-2/+7
\|\ \ \ \ \