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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #173 from matrix-org/markjh/twisted-15	Mark Haines	2015-08-12	3	-55/+29
\|\ \| \| \| \|	Update to Twisted-15.2.1.
\| *	Depend on Twisted>=15.1 rather than pining to a particular version	Mark Haines	2015-08-12	2	-2/+2
\| \|
\| *	Merge branch 'develop' into markjh/twisted-15	Mark Haines	2015-08-12	96	-1673/+4524
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/http/matrixfederationclient.py
\| * \|	Bump the version of twisted needed for setup_requires to 15.2.1	Mark Haines	2015-06-15	1	-1/+1
\| \| \|
\| * \|	Merge branch 'develop' into markjh/twisted-15	Mark Haines	2015-06-01	11	-21/+53
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/python_dependencies.py
\| * \| \|	Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵	Mark Haines	2015-06-01	2	-51/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	own Agent
* \| \| \|	Merge pull request #223 from matrix-org/markjh/enable_demo_registration	Erik Johnston	2015-08-12	1	-1/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	enable registration in the demo servers
\| * \| \|	enable registration in the demo servers	Mark Haines	2015-08-12	1	-1/+2
\|/ / /
* \| \|	Merge pull request #220 from matrix-org/markjh/generate_keys	Erik Johnston	2015-08-12	1	-45/+36
\|\ \ \ \| \| \| \| \| \| \| \|	Fix the --generate-keys option.
\| * \| \|	Fix the --generate-keys option. Make it do the same thing as ↵	Mark Haines	2015-08-12	1	-45/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	--generate-config does when the config file exists, but without printing a warning
* \| \| \|	Merge pull request #216 from matrix-org/auth	Daniel Wagner-Hall	2015-08-12	2	-16/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Clean up some docs and redundant fluff
\| * \| \| \|	Add missing space because linter	Daniel Wagner-Hall	2015-08-11	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Minor docs cleanup	Daniel Wagner-Hall	2015-08-11	2	-3/+9
\| \| \| \| \|
\| * \| \| \|	Remove redundant if-guard	Daniel Wagner-Hall	2015-08-11	1	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The startswith("@") does the job
* \| \| \| \|	Merge pull request #182 from ↵	Mark Haines	2015-08-12	2	-10/+13
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/manu/fix_no_rate_limit_in_federation_demo Federation demo start.sh: Fixed --no-rate-limit param in the script
\| * \| \| \|	Fix the cleanup script to use the right $DIR	Mark Haines	2015-08-12	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Federation demo start.sh: Fixed --no-rate-limit param in the script	manuroe	2015-06-04	2	-10/+13
\| \| \| \| \|
* \| \| \| \|	Merge pull request #218 from matrix-org/mockfix	Erik Johnston	2015-08-11	1	-2/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Remove call to "recently" removed function in mock
\| * \| \| \|	Remove call to recently removed function in mock	Daniel Wagner-Hall	2015-08-11	1	-2/+2
\|/ / / /
* \| \| \|	Use TypeError instead of ValueError and give a nicer error mesasge	Mark Haines	2015-08-10	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when someone calls Cache.invalidate with the wrong type.
* \| \| \|	Merge pull request #215 from matrix-org/erikj/cache_varargs_interface	Erik Johnston	2015-08-10	12	-72/+73
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Change Cache to not use *args in its interface
\| * \| \| \|	Rename keyargs to args in CacheDescriptor	Erik Johnston	2015-08-10	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Rename keyargs to args in Cache	Erik Johnston	2015-08-10	1	-9/+9
\| \| \| \| \|
\| * \| \| \|	Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-07	1	-3/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cache_varargs_interface
\| * \ \ \ \	Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-07	1	-3/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cache_varargs_interface
\| * \| \| \| \| \|	Remove unnecessary cache	Erik Johnston	2015-08-07	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Change Cache to not use *args in its interface	Erik Johnston	2015-08-07	11	-67/+69
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #212 from matrix-org/erikj/cache_deferreds	Erik Johnston	2015-08-07	3	-19/+47
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|	Make CacheDescriptor cache deferreds rather than the deferreds' values
\| * \| \| \| \| \|	s/observed/observer/	Erik Johnston	2015-08-07	1	-3/+3
\| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Propogate stale cache errors to calling functions	Erik Johnston	2015-08-07	1	-3/+4
\| \|/ / / /
\| * \| \| \|	Docs	Erik Johnston	2015-08-06	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Remove failed deferreds from cache	Erik Johnston	2015-08-06	1	-1/+7
\| \| \| \| \|
\| * \| \| \|	Re-implement DEBUG_CACHES flag	Erik Johnston	2015-08-06	1	-2/+17
\| \| \| \| \|
\| * \| \| \|	Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds	Erik Johnston	2015-08-06	8	-140/+305
\| \|\ \ \ \
\| * \| \| \| \|	Make @cached cache deferreds rather than the deferreds' values	Erik Johnston	2015-08-06	3	-19/+22
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #213 from matrix-org/paul/SYN-420	Paul Evans	2015-08-07	4	-1/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Three small improvements to help debian package (SYN-420)
\| * \| \| \| \| \|	Don't complain about extra .pyc files we find while hunting for database schemas	Paul "LeoNerd" Evans	2015-08-07	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a --generate-keys option	Paul "LeoNerd" Evans	2015-08-07	1	-0/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Only print the pidfile path on startup if requested by a commandline flag	Paul "LeoNerd" Evans	2015-08-07	2	-1/+9
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #209 from matrix-org/erikj/cached_keyword_args	Erik Johnston	2015-08-06	6	-23/+45
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Add support for using keyword arguments with cached functions
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-06	8	-140/+305
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| / / / / \| \|/ / / /	erikj/cached_keyword_args
* \| \| \| \|	Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'	Erik Johnston	2015-08-05	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Use LRU cache by default	Erik Johnston	2015-08-05	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Don't try & check the username if we don't have one (which we won't if it's ↵	David Baker	2015-08-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	been saved in the auth layer)
* \| \| \| \|	Add vector.im as trusted ID server	David Baker	2015-08-03	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #210 from matrix-org/reg-v2a-password-skip	David Baker	2015-07-29	3	-55/+208
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	v2_alpha /register fixes for Application Services
\| * \| \| \| \|	Use the same reg paths as register v1 for ASes.	Kegan Dougal	2015-07-29	2	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Namely this means using registration_handler.appservice_register.
\| * \| \| \| \|	Fix v2_alpha registration. Add unit tests.	Kegan Dougal	2015-07-28	3	-55/+204
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.
* \| \| \| \| \|	improve OS X instructions and remove all the leading $'s to make it easier ↵	Matthew Hodgson	2015-07-29	1	-45/+47
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to c+p commands
* \| \| \| \|	Merge pull request #207 from ↵	Erik Johnston	2015-07-27	1	-34/+43
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/erikj/generate_local_thumbnails_on_thread Generate local thumbnails on a thread
\| * \| \| \| \|	Generate local thumbnails on a thread	Erik Johnston	2015-07-23	1	-34/+43
\|/ / / / /
\| * / / /	Add support for using keyword arguments with cached functions	Erik Johnston	2015-07-27	6	-23/+45
\|/ / / /
* \| \| \|	Merge pull request #205 from matrix-org/erikj/pick_largest_thumbnail	Mark Haines	2015-07-23	1	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Pick larger than desired thumbnail for 'crop'
\| * \| \| \|	Pick larger than desired thumbnail for 'crop'	Erik Johnston	2015-07-23	1	-1/+2
\|/ / / /
* \| \| \|	Disable receipts for now	Matrix	2015-07-22	1	-0/+2
\| \| \| \|
* \| \| \|	Query for all the ones we were asked about, not just the last...	David Baker	2015-07-21	1	-1/+1
\| \| \| \|
* \| \| \|	Dodesn't seem to make any difference: guess it does work with the object ↵	David Baker	2015-07-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reference
* \| \| \|	I think this was what was intended...	David Baker	2015-07-21	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-07-21	4	-4/+30
\|\ \ \ \
\| * \| \| \|	typo	Matthew Hodgson	2015-07-08	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'release-v0.9.3' of github.com:matrix-org/synapse v0.9.3	Erik Johnston	2015-07-01	25	-481/+787
\| \|\ \ \ \
\| \| * \| \| \|	Bump changelog and version to v0.9.3	Erik Johnston	2015-07-01	2	-2/+7
\| \| \| \| \| \|
\| \| * \| \| \|	Update change log v0.9.3-rc1	Erik Johnston	2015-06-23	1	-0/+18
\| \| \| \| \| \|
\| \| * \| \| \|	Bumb version	Erik Johnston	2015-06-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	clarify readme a bit more	Matthew Hodgson	2015-06-27	1	-1/+4
\| \| \| \| \| \|
* \| \| \| \| \|	s/take/claim/ for end to end key APIs	Mark Haines	2015-07-20	2	-8/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #204 from illicitonion/develop	Erik Johnston	2015-07-20	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve naming
\| * \| \| \| \| \|	Improve naming	Daniel Wagner-Hall	2015-07-20	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Remove semicolon.	Kegan Dougal	2015-07-20	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Parse the ID given to /invite\|ban\|kick to make sure it looks like a user ID.	Kegan Dougal	2015-07-20	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Up default cache size for _RoomStreamChangeCache	Matrix	2015-07-18	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Don't do any database hits in receipt handling if from_key == to_key	Matrix	2015-07-18	1	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #199 from matrix-org/erikj/receipts	Erik Johnston	2015-07-16	19	-48/+724
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement read receipts.
\| * \| \| \| \| \|	Docs	Erik Johnston	2015-07-14	2	-6/+36
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	Erik Johnston	2015-07-13	23	-221/+1329
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Comments	Erik Johnston	2015-07-13	2	-4/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Handle error slightly better	Erik Johnston	2015-07-09	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove spurious comment	Erik Johnston	2015-07-09	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Integer timestamps	Erik Johnston	2015-07-09	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	Erik Johnston	2015-07-09	2	-3/+8
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Change format of receipts to allow inclusion of data	Erik Johnston	2015-07-09	3	-37/+42
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add blist to dependencies	Erik Johnston	2015-07-08	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	Erik Johnston	2015-07-08	7	-18/+62
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add a cache to fetching of receipt streams	Erik Johnston	2015-07-08	2	-27/+96
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Split receipt events up into one per room	Erik Johnston	2015-07-08	1	-30/+21
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Hook up receipts to v1 initialSync	Erik Johnston	2015-07-08	3	-13/+77
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix test.	Erik Johnston	2015-07-07	1	-1/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Wire together receipts and the notifer/federation	Erik Johnston	2015-07-07	4	-33/+126
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix various typos	Erik Johnston	2015-07-07	4	-8/+16
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a ReceiptServlet	Erik Johnston	2015-07-07	2	-1/+59
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add stream_id index	Erik Johnston	2015-07-02	1	-1/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Consolidate duplicate code in notifier	Erik Johnston	2015-07-02	5	-38/+25
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add receipts_key to StreamToken	Erik Johnston	2015-07-02	4	-5/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add basic ReceiptHandler	Erik Johnston	2015-07-01	1	-0/+130
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add basic storage functions for handling of receipts	Erik Johnston	2015-07-01	4	-17/+186
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add tables for receipts	Erik Johnston	2015-06-30	2	-1/+36
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #203 from matrix-org/erikj/room_creation_presets	Erik Johnston	2015-07-16	2	-19/+82
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement presets at room creation
\| * \| \| \| \| \| \| \| \| \|	Implement specifying custom initial state for /createRoom	Erik Johnston	2015-07-16	1	-40/+60
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	s/everyone_ops/original_invitees_have_ops/	Erik Johnston	2015-07-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Capitalize contants	Erik Johnston	2015-07-14	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Implement presets at room creation	Erik Johnston	2015-07-13	2	-22/+65
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #202 from matrix-org/erikj/power_level_sanity	Erik Johnston	2015-07-16	1	-16/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change power level semantics.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-07-13	12	-218/+726
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/power_level_sanity
\| * \| \| \| \| \| \| \| \| \|	Sanitize power level checks	Erik Johnston	2015-07-10	1	-15/+21
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	You shouldn't be able to ban/kick users with higher power levels	Erik Johnston	2015-07-10	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	pep8 + debug line	David Baker	2015-07-15	1	-6/+8
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Add back in support for remembering parameters submitted to a ↵	David Baker	2015-07-15	2	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user-interactive auth call.
* \| \| \| \| \| \| \| \| \| \|	bump up image quality a bit more as it looks crap	Matthew Hodgson	2015-07-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #193 from matrix-org/erikj/bulk_persist_event	Erik Johnston	2015-07-14	7	-376/+503
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bulk insert events API
\| * \| \| \| \| \| \| \| \| \| \|	Remove commented out code	Erik Johnston	2015-07-10	1	-14/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add bulk insert events API	Erik Johnston	2015-06-25	8	-374/+521
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Close, but no cigar.	David Baker	2015-07-14	1	-2/+2
\| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #196 from matrix-org/erikj/room_history	Erik Johnston	2015-07-10	8	-4/+235
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to restrict room history.
\| * \| \| \| \| \| \| \| \| \| \|	Add comment	Erik Johnston	2015-07-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add m.room.history_visibility to newly created rooms' m.room.power_levels	Erik Johnston	2015-07-06	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Rename key and values for m.room.history_visibility. Support 'invited' value	Erik Johnston	2015-07-06	4	-24/+61
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Filter and redact events that the other server doesn't have permission to ↵	Erik Johnston	2015-07-03	1	-0/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see during backfill
\| * \| \| \| \| \| \| \| \| \| \|	Respect m.room.history_visibility in v2_alpha sync API	Erik Johnston	2015-07-03	1	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add m.room.history_visibility to list of auth events	Erik Johnston	2015-07-03	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make v1 initial syncs respect room history ACL	Erik Johnston	2015-07-02	1	-17/+34
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add basic impl for room history ACL on GET /messages client API	Erik Johnston	2015-07-02	3	-3/+95
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs	Erik Johnston	2015-07-10	4	-214/+491
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Implement bulk verify_signed_json API
\| * \| \| \| \| \| \| \| \| \|	Wait for previous attempts at fetching keys for a given server before trying ↵	Erik Johnston	2015-06-26	1	-15/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to fetch more
\| * \| \| \| \| \| \| \| \| \|	Implement bulk verify_signed_json API	Erik Johnston	2015-06-26	4	-217/+441
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Uniquely name unique constraint	Erik Johnston	2015-07-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management	Erik Johnston	2015-07-10	5	-2/+441
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Client end to end key management API
\| * \| \| \| \| \| \| \| \| \|	Assume that each device for a user has only one of each type of key	Mark Haines	2015-07-10	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't bother with a timeout for one time keys on the server.	Mark Haines	2015-07-09	3	-33/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Only remove one time keys when new one time keys are added	Mark Haines	2015-07-08	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'mjark/missing_regex_group' into ↵	Mark Haines	2015-07-06	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	markjh/client-end-to-end-key-management
\| * \| \| \| \| \| \| \| \| \| \|	Add client API for uploading and querying keys for end to end encryption	Mark Haines	2015-07-06	2	-1/+290
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add store for client end to end keys	Mark Haines	2015-07-06	3	-1/+171
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Small tweaks to SAML2 configuration.	Erik Johnston	2015-07-10	2	-22/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled.
* \| \| \| \| \| \| \| \| \| \| \|	Add Muthu Subramanian to AUTHORS	Erik Johnston	2015-07-10	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #201 from EricssonResearch/msba/saml2-develop	Erik Johnston	2015-07-10	5	-3/+149
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Integrate SAML2 basic authentication - uses pysaml2
\| * \| \| \| \| \| \| \| \| \| \|	Make SAML2 optional and add some references/comments	Muthu Subramanian	2015-07-09	2	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	code beautify	Muthu Subramanian	2015-07-09	1	-9/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	code beautify	Muthu Subramanian	2015-07-08	3	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	code beautify	Muthu Subramanian	2015-07-08	1	-10/+23
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Integrate SAML2 basic authentication - uses pysaml2	Muthu Subramanian	2015-07-08	5	-4/+122
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	We don't want semicolons.	Erik Johnston	2015-07-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	remove the tls_certificate_chain_path param and simply support ↵	Matthew Hodgson	2015-07-09	2	-24/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tls_certificate_path pointing to a file containing a chain of certificates
* \| \| \| \| \| \| \| \| \| \|	document tls_certificate_chain_path more clearly	Matthew Hodgson	2015-07-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	oops, context.tls_certificate_chain_file() expects a file, not a certificate.	Matthew Hodgson	2015-07-08	2	-6/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	typo	Matthew Hodgson	2015-07-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	cough	Matthew Hodgson	2015-07-08	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	add new optional config for tls_certificate_chain_path for folks with ↵	Matthew Hodgson	2015-07-08	2	-3/+19
\| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	intermediary SSL certs
* \| \| \| \| \| \| \| \| \|	Merge pull request #197 from matrix-org/mjark/missing_regex_group	Erik Johnston	2015-07-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| / / / / / / / \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Don't 500 if a group is missing from the regex match
\| * \| \| \| \| \| \| \|	Don't 500 if a group is missing from the regex	Mark Haines	2015-07-06	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Don't explode if we don't recognize one of the event_ids in the backfill request	Erik Johnston	2015-07-06	1	-2/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #195 from matrix-org/erikj/content_disposition	Erik Johnston	2015-07-03	5	-15/+57
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Add Content-Disposition headers to media repo downloads
\| * \| \| \| \| \| \|	If user supplies filename in URL when downloading from media repo, use that ↵	Erik Johnston	2015-07-03	3	-9/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	name in Content Disposition
\| * \| \| \| \| \| \|	Enforce ascii filenames for uploads	Erik Johnston	2015-06-30	3	-1/+15
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Content-Disposition headers to media repo v1 downloads	Erik Johnston	2015-06-30	3	-7/+30
\|/ / / / / / /
* / / / / / /	Oops: underride rule had an identifier with override in it.	David Baker	2015-06-23	1	-1/+1
\|/ / / / / /
* \| / / / /	Batch SELECTs in _get_auth_chain_ids_txn	Erik Johnston	2015-06-23	1	-3/+11
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Fix typo	Erik Johnston	2015-06-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #192 from matrix-org/erikj/fix_log_context	Erik Johnston	2015-06-19	3	-52/+68
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix log context when sending requests
\| * \| \| \| \|	Fix log context when sending requests	Erik Johnston	2015-06-19	3	-52/+68
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #190 from matrix-org/erikj/syn-412	Erik Johnston	2015-06-19	3	-73/+78
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix notifier leak
\| * \| \| \| \|	Add comment on cancellation of observers	Erik Johnston	2015-06-19	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	PEP8	Erik Johnston	2015-06-18	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Documentation	Erik Johnston	2015-06-18	1	-4/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Don't bother proxying lookups on _NotificationListener to underlying deferred	Erik Johnston	2015-06-18	1	-10/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Refactor the notifier.wait_for_events code to be clearer. Add ↵	Erik Johnston	2015-06-18	3	-70/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	_NotifierUserStream.new_listener that accpets a token to avoid races.
\| * \| \| \| \|	Fix notifier leak	Erik Johnston	2015-06-18	1	-21/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #189 from matrix-org/erikj/room_init_sync	Erik Johnston	2015-06-19	2	-35/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve room init sync speed.
\| * \| \| \| \| \|	Use another deferred list	Erik Johnston	2015-06-16	1	-18/+27
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use DeferredList	Erik Johnston	2015-06-16	1	-9/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't do unecessary db ops in presence.get_state	Erik Johnston	2015-06-16	2	-14/+15
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #187 from matrix-org/erikj/sanitize_logging	Erik Johnston	2015-06-19	7	-127/+209
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize logging
\| * \| \| \| \| \|	Remove stale debug lines	Erik Johnston	2015-06-19	1	-10/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add site_tag to logger	Erik Johnston	2015-06-19	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add IDs to outbound transactions	Erik Johnston	2015-06-19	1	-53/+71
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove access_token from synapse.rest.client.v1.transactions ↵	Erik Johnston	2015-06-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	{get,store}_response logging
\| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-06-15	3	-5/+11
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/sanitize_logging
\| * \| \| \| \| \|	Disable twisted access logging. Move access logging to SynapseRequest object	Erik Johnston	2015-06-15	2	-75/+79
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Log more when we have processed the request	Erik Johnston	2015-06-15	4	-4/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Create SynapseRequest that overrides __repr__ to not print access_token	Erik Johnston	2015-06-15	2	-17/+46
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'erikj/listeners_config' into erikj/sanitize_logging	Erik Johnston	2015-06-15	6	-210/+329
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Make http.server request logging more verbose, but redact access_tokens	Erik Johnston	2015-06-15	1	-2/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Log requests and responses sent via http.client	Erik Johnston	2015-06-15	1	-3/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add Eric Myhre to AUTHORS	Erik Johnston	2015-06-19	1	-0/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #191 from heavenlyhash/configurable-upload-dir	Erik Johnston	2015-06-19	2	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make upload dir a configurable path.
\| * \| \| \| \| \| \| \|	Make upload dir a configurable path.	Eric Myhre	2015-06-18	2	-2/+6
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes SYN-425. Signed-off-by: Eric Myhre <hash@exultant.us>
* \| \| \| \| \| \| \|	Fix bug where synapse was sending AS user queries incorrectly.	Kegan Dougal	2015-06-17	2	-1/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug introduced in 92b20713d7c6346aeb20dc09963081e472752bb5 which reversed the comparison when checking if a user existed in the users table. Added UTs to prevent this happening again.
* \| \| \| \| \| \| \|	Correct -H SERVER_NAME in config-missing complaint message	Paul "LeoNerd" Evans	2015-06-16	1	-2/+2
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #185 from matrix-org/erikj/listeners_config	Erik Johnston	2015-06-15	6	-210/+329
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Change listener config.
\| * \| \| \| \| \|	Remove redundant newline	Erik Johnston	2015-06-15	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Document listener config. Remove deprecated config options	Erik Johnston	2015-06-15	2	-36/+42
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add backwards compat support for metrics, manhole and webclient config options	Erik Johnston	2015-06-12	3	-16/+27
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix tests	Erik Johnston	2015-06-12	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	PEP8	Erik Johnston	2015-06-12	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Correctly handle x_forwaded listener option	Erik Johnston	2015-06-12	3	-14/+31
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use config.listeners	Erik Johnston	2015-06-12	2	-96/+168
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix up create_resource_tree	Erik Johnston	2015-06-12	1	-104/+100
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Begin changing the config format	Erik Johnston	2015-06-11	1	-8/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-06-15	3	-5/+11
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| / / / / \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #186 from matrix-org/hotfixes-v0.9.2-r2 v0.9.2-r2	Erik Johnston	2015-06-15	3	-1/+7
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hotfixes v0.9.2-r2
\| \| * \| \| \| \|	Changelog	Erik Johnston	2015-06-15	1	-0/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Bump version	Erik Johnston	2015-06-15	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2	Erik Johnston	2015-06-15	3	-5/+6
\| \|/\| \| \| \| \| \|/\|/ / / / /
\| * \| \| \| \|	Merge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 v0.9.2-r1	Erik Johnston	2015-06-13	2	-1/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hotfixes v0.9.2-r1
\| \| * \| \| \| \|	Bump version	Erik Johnston	2015-06-13	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add a dummy.sql into delta/20 as pip isn't packinging the pushers.py	Erik Johnston	2015-06-13	1	-0/+1
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'release-v0.9.2' v0.9.2	Erik Johnston	2015-06-12	33	-281/+547
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Mention config option name	Erik Johnston	2015-06-12	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	s/some/certain	Erik Johnston	2015-06-12	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update change log	Erik Johnston	2015-06-12	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse v0.9.1	Erik Johnston	2015-05-26	64	-1280/+2527
\| \|\ \ \ \ \ \
* \| \ \ \ \ \ \	Merge pull request #183 from intelfx/install-python-schema-deltas	Matthew Hodgson	2015-06-13	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MANIFEST.in: include python schema delta scripts
\| * \| \| \| \| \| \| \|	MANIFEST.in: include python schema delta scripts (we now have one in 20/)	Ivan Shapovalov	2015-06-13	1	-0/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'release-v0.9.2' into develop	Erik Johnston	2015-06-11	3	-2/+25
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| / / / / \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Update change log	Erik Johnston	2015-06-11	1	-0/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump schema version	Erik Johnston	2015-06-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump version	Erik Johnston	2015-06-11	1	-1/+1
\|/ / / / / /
* \| \| / / /	Catch any exceptions in the pusher loop. Use a lower timeout for pushers so ↵	David Baker	2015-06-05	1	-112/+133
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	we can see if they're actually still running.
* \| \| \| \|	pep8	David Baker	2015-06-04	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Add script to (re)convert the pushers table to changing the unique key. Also ↵	David Baker	2015-06-04	3	-2/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	give the python db upgrade scripts the database engine so they can convert parameter strings, and add args *kwargs to the upgrade function so we can add more args in future and previous scripts will ignore them.
* \| \| \| \|	Merge pull request #175 from matrix-org/erikj/thumbnail_thread	Erik Johnston	2015-06-03	1	-45/+53
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Thumbnail images on a seperate thread
\| * \| \| \| \|	Thumbnail images on a seperate thread	Erik Johnston	2015-06-02	1	-45/+53
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #176 from matrix-org/erikj/backfill_auth	Erik Johnston	2015-06-03	2	-8/+50
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve backfill.
\| * \| \| \| \| \|	Rephrase log line	Erik Johnston	2015-06-02	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't about JSON when warning about content tampering	Erik Johnston	2015-06-02	1	-7/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a timeout	Erik Johnston	2015-06-02	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Handle the fact we might be missing auth events	Erik Johnston	2015-06-02	1	-15/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add some logging	Erik Johnston	2015-06-02	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Correctly look up auth_events	Erik Johnston	2015-06-02	1	-9/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't process events we've already processed. Remember to process state events	Erik Johnston	2015-06-02	1	-0/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Correctly pass in auth_events	Erik Johnston	2015-06-01	1	-1/+11
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #180 from matrix-org/erikj/prev_state_context	Erik Johnston	2015-06-03	3	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't needlessly compute prev_state
\| * \| \| \| \| \|	Don't needlessly compute prev_state	Erik Johnston	2015-06-03	3	-5/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #179 from matrix-org/erikj/state_group_outliers	Erik Johnston	2015-06-03	3	-6/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't compute EventContext for outliers.
\| * \| \| \| \| \| \|	Comment	Erik Johnston	2015-06-03	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't needlessly compute context	Erik Johnston	2015-06-03	3	-6/+19
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #178 from matrix-org/erikj/cache_state_groups	Erik Johnston	2015-06-03	4	-58/+93
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cache to get_state_groups.
\| * \| \| \| \| \| \|	Add cache to get_state_groups	Erik Johnston	2015-06-03	1	-8/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Caches should be bound to instances.	Erik Johnston	2015-06-03	3	-50/+81
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before, caches were global and so different instances of the stores would share caches. This caused problems in the unit tests.
* \| \| \| \| \| \|	Merge pull request #177 from matrix-org/erikj/content_repo_http_client	Erik Johnston	2015-06-03	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SYN-403: Make content repository use its own http client.
\| * \| \| \| \| \| \|	SYN-403: Make content repository use its own http client.	Erik Johnston	2015-06-03	1	-1/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #174 from matrix-org/erikj/compress_option	Erik Johnston	2015-06-03	2	-2/+14
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Add config option to disable compression of http responses
\| * \| \| \| \| \|	Add config option to disable compression of http responses	Erik Johnston	2015-06-01	2	-2/+14
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Log where a request came from in federation	Erik Johnston	2015-06-02	1	-0/+2
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Don't explode if we don't have the event	Erik Johnston	2015-06-01	1	-1/+3
\|/ / / /
* \| \| \|	Merge pull request #172 from intelfx/contrib-systemd	Erik Johnston	2015-05-31	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	contrib/systemd: log_config.yaml: do not disable existing loggers
\| * \| \| \|	contrib/systemd: log_config.yaml: do not disable existing loggers	Ivan Shapovalov	2015-05-31	1	-0/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It turned out that merely configuring the root logger is not enough for "catch-all" semantics. The logging subsystem also needs to be told not to disable existing loggers (so that their messages will get propagated to handlers up the logging hierarchy, not just silently discarded). Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
* \| \| \|	Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha	Mark Haines	2015-05-29	2	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Allow endpoint for verifying recaptcha to be configured
\| * \ \ \	Merge branch 'develop' into markjh/SYT-8-recaptcha	Mark Haines	2015-05-29	5	-16/+12
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/handlers/auth.py
\| * \| \| \|	Add config for setting the recaptcha verify api endpoint, so we can test it ↵	Mark Haines	2015-05-29	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in sytest
* \| \| \| \|	Remove log line	Erik Johnston	2015-05-29	1	-1/+0
\| \| \| \| \|