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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-05-11	3	-58/+55
\|\
\| *	Merge pull request #146 from matrix-org/erikj/push_rules_fixes	Erik Johnston	2015-05-11	2	-57/+54
\| \|\ \| \| \| \| \| \|	Fix 500 on push rule updates.
\| \| *	Prefer to use _simple_*.	Erik Johnston	2015-05-11	1	-44/+41
\| \| \|
\| \| *	push_rules table expects an 'id' field	Erik Johnston	2015-05-11	2	-13/+13
\| \| \|
\| * \|	Bump version	Erik Johnston	2015-05-11	1	-1/+1
\| \|/
* \|	SYN-376: Add script for converting server keys from v1 to v2	Mark Haines	2015-05-11	1	-0/+113
\| \|
* \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-05-10	3	-3/+3
\|\\|
\| *	Merge pull request #145 from matrix-org/hotfixes-v0.9.0-r3 v0.9.0-r3	David Baker	2015-05-10	2	-2/+2
\| \|\ \| \| \| \| \| \|	Hotfixes v0.9.0 r3
\| \| *	Bump version	Erik Johnston	2015-05-10	1	-1/+1
\| \| \|
\| \| *	Fix push rule bug: can't insert bool into small int column	Erik Johnston	2015-05-10	1	-1/+1
\| \|/
\| *	typo	Matthew Hodgson	2015-05-09	1	-1/+1
\| \|
\| *	Merge branch 'hotfixes-v0.9.0-r2' of github.com:matrix-org/synapse v0.9.0-r2	Erik Johnston	2015-05-08	7	-19/+67
\| \|\
\| \| *	Bump version	Erik Johnston	2015-05-08	1	-1/+1
\| \|/ \|/\|
* \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-05-08	6	-9/+15
\|\\|
\| *	Merge branch 'hotfixes-v0.9.0-r1' of github.com:matrix-org/synapse v0.9.0-r1	Erik Johnston	2015-05-08	6	-9/+15
\| \|\
\| \| *	Actually rename all isntances	Erik Johnston	2015-05-08	1	-1/+1
\| \| \|
\| \| *	Reword port script usage	Erik Johnston	2015-05-08	1	-2/+2
\| \| \|
\| \| *	Support reading directly from a config	Erik Johnston	2015-05-08	1	-0/+3
\| \| \|
\| \| *	UPGRADES: s/v0.x.x/v0.9.0	Erik Johnston	2015-05-08	1	-1/+1
\| \| \|
\| \| *	Mention Ivan Shapovalov contrib/systemd	Erik Johnston	2015-05-08	2	-0/+5
\| \| \|
\| \| *	Bump version	Erik Johnston	2015-05-08	1	-1/+1
\| \| \|
\| \| *	Fix port_from_sqlite_to_postgres after changes to storage layer.	Erik Johnston	2015-05-08	1	-4/+2
\| \|/
* \|	Drop the old table not the new table	Mark Haines	2015-05-08	1	-1/+1
\| \|
* \|	Rename unique constraint	Mark Haines	2015-05-08	1	-1/+1
\| \|
* \|	Remove unsigned	Mark Haines	2015-05-08	1	-2/+2
\| \|
* \|	Bump schema version	Mark Haines	2015-05-08	1	-1/+1
\| \|
* \|	Make the timestamps in server_keys_json bigints	Mark Haines	2015-05-08	1	-0/+32
\| \|
* \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-05-07	5	-8/+87
\|\\|
\| *	Merge branch 'release-v0.9.0' of github.com:matrix-org/synapse v0.9.0	Erik Johnston	2015-05-07	200	-3086/+9543
\| \|\
\| \| *	Slight rewording	Erik Johnston	2015-05-07	1	-2/+10
\| \| \|
\| \| *	Reword docs/application_services.rst	Erik Johnston	2015-05-07	1	-5/+7
\| \| \|
\| \| *	Add some information on registering AS's	Erik Johnston	2015-05-07	2	-0/+28
\| \| \|
\| \| *	Bump date	Erik Johnston	2015-05-07	1	-1/+1
\| \| \|
\| \| *	Bump syweb version	Erik Johnston	2015-05-07	1	-3/+3
\| \| \|
\| \| *	Add link to registration spec	Erik Johnston	2015-05-07	1	-1/+2
\| \| \|
\| \| *	Add JIRA issue id	Erik Johnston	2015-05-07	1	-2/+2
\| \| \|
\| \| *	Explain the change in AS /register api	Erik Johnston	2015-05-07	1	-1/+4
\| \| \|
\| \| *	Change log: Link to application services spec.	Erik Johnston	2015-05-06	1	-2/+3
\| \| \|
\| \| *	Move CAPTCHA_SETUP to docs/	Erik Johnston	2015-05-06	1	-0/+0
\| \| \|
\| \| *	Linkify docs/postgres.sql	Erik Johnston	2015-05-06	1	-1/+2
\| \| \|
\| \| *	Update change log to be more detailed	Erik Johnston	2015-05-06	1	-3/+14
\| \| \|
\| \| *	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.0	Erik Johnston	2015-05-06	15	-2/+4
\| \| \|\
\| \| * \|	Update change log	Erik Johnston	2015-05-06	1	-4/+28
\| \| \| \|
\| \| * \|	Bump version	Erik Johnston	2015-05-06	1	-1/+1
\| \| \| \|
* \| \| \|	revert accidental bcrypt gensalt round reduction from loadtesting	Mark Haines	2015-05-07	1	-1/+1
\| \| \| \|
* \| \| \|	pynacl-0.3.0 was released so we can finally start using it directly from pypi	Mark Haines	2015-05-07	2	-7/+2
\| \| \| \|
* \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into develop	David Baker	2015-05-07	31	-140/+267
\|\ \ \ \
\| * \| \| \|	Optional profiling using cProfile	Mark Haines	2015-05-06	1	-1/+21
\| \| \| \| \|
\| * \| \| \|	Don't read from the config file before checking it exists	Mark Haines	2015-05-06	1	-9/+10
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge pull request #140 from matrix-org/erikj/scripts_refactor	Mark Haines	2015-05-06	15	-2/+4
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Seperate scripts/ into scripts/ and scripts-dev/
\| \| * \|	Acutally add scripts-dev/	Erik Johnston	2015-05-06	11	-0/+549
\| \| \| \|
\| \| * \|	Re-add scripts/register_new_matrix_user	Erik Johnston	2015-05-06	1	-0/+153
\| \| \| \|
\| \| * \|	Seperate scripts/ into scripts/ and scripts-dev/, where scripts/* are ↵	Erik Johnston	2015-05-06	15	-704/+4
\| \|/ / \| \| \| \| \| \| \| \| \|	automatically added to the package
\| * \|	Merge pull request #138 from matrix-org/erikj/SYN-371	Mark Haines	2015-05-05	1	-22/+0
\| \|\ \ \| \| \| \| \| \| \| \|	SYN-371 - Failed to persist event
\| \| * \	Merge branch 'erikj/executemany' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-05-05	8	-48/+129
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/SYN-371
\| \| * \| \|	Don't insert without deduplication. In this case we never actually use this ↵	Erik Johnston	2015-05-05	1	-22/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	table, so simply remove the insert entirely
\| * \| \| \|	Merge pull request #137 from matrix-org/erikj/executemany	Mark Haines	2015-05-05	7	-55/+100
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|	executemany support
\| \| * \| \|	And use buffer(...) there as well	Erik Johnston	2015-05-05	2	-2/+3
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/executemany	Erik Johnston	2015-05-05	8	-46/+118
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Use buffer(...) when inserting into bytea column	Erik Johnston	2015-05-05	2	-4/+3
\| \| \| \| \|
\| * \| \| \|	Merge pull request #139 from matrix-org/bugs/SYN-369	Mark Haines	2015-05-05	4	-16/+80
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix race with cache invalidation. SYN-369
\| \| * \| \| \|	Add some doc-string	Mark Haines	2015-05-05	1	-0/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Collect the invalidate callbacks on the transaction object rather than ↵	Mark Haines	2015-05-05	7	-51/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	passing around a separate list
\| \| * \| \| \|	SYN-369: Add comments to the sequence number logic in the cache	Mark Haines	2015-05-05	1	-0/+7
\| \| \| \| \| \|
\| \| * \| \| \|	Add debug flag in synapse/storage/_base.py for debugging the cache logic by ↵	Mark Haines	2015-05-05	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	comparing what is in the cache with what was in the database on every access
\| \| * \| \| \|	Invalidate the room_member cache if the current state events updates	Mark Haines	2015-05-05	1	-0/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Missing return for when the event was already persisted	Mark Haines	2015-05-05	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Invalidate the caches from the correct thread	Mark Haines	2015-05-05	6	-29/+46
\| \| \| \| \| \|
\| \| * \| \| \|	Sequence the modifications to the cache so that selects don't race with inserts	Mark Haines	2015-05-05	1	-3/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Fix the --help option for synapse	Mark Haines	2015-05-05	1	-18/+29
\| \| \| \| \| \|
\| * \| \| \| \|	Missed events are not outliers	Erik Johnston	2015-05-05	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Add a comment about the zip(*[zip(sorted(...),...)])	Erik Johnston	2015-05-05	1	-0/+8
\| \| \| \|/ /
\| \| \| * \|	Fix indentation	Erik Johnston	2015-05-05	1	-10/+10
\| \| \| \| \|
\| \| \| * \|	Add support for using executemany	Erik Johnston	2015-05-05	5	-61/+99
\| \| \|/ / \| \|/\| \|
\| * \| \|	Don't call 'encode_parameter' no-op	Erik Johnston	2015-05-05	3	-10/+0
\| \|/ /
\| * \|	Correctly name transaction	Erik Johnston	2015-05-05	1	-1/+1
\| \| \|
\| * \|	Remove some unused indexes	Erik Johnston	2015-05-01	1	-0/+18
\| \| \|
\| * \|	Don't log enqueue_	Erik Johnston	2015-05-01	1	-1/+0
\| \| \|
* \| \|	Typo	David Baker	2015-05-07	1	-1/+1
\|/ /
* \|	user_id now in user_threepids	David Baker	2015-05-01	2	-6/+6
\| \|
* \|	That wasn't a deferred	Erik Johnston	2015-05-01	2	-4/+2
\| \|
* \|	Remove inlineCallbacks from non-generator	Erik Johnston	2015-05-01	1	-2/+0
\| \|
* \|	Typo	Erik Johnston	2015-05-01	1	-1/+1
\| \|
* \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \|