2563 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	ddb816cf60	Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict	2015-02-11 15:44:28 +00:00
Erik Johnston	4ebbaf0d43	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
Erik Johnston	d4abeb8354	Mention new libs in CHANGES	2015-02-11 14:20:09 +00:00
Mark Haines	f42e29cf95	Merge pull request #63 from matrix-org/homeserver_test_setup ... Factor out some of the common homeserver setup code	2015-02-11 11:46:08 +00:00
Mark Haines	896253e085	Factor out some of the common homeserver setup code into a ... setup_test_homeserver function in utils.	2015-02-11 11:37:30 +00:00
Erik Johnston	6370cffbbf	Fix bug where variable was not always defined	2015-02-11 10:34:41 +00:00
Erik Johnston	8c83cc471b	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-02-11 10:20:43 +00:00
Mark Haines	ba63b4be5d	Merge pull request #60 from matrix-org/single_source_version_and_dependencies ... Single source version and dependencies	2015-02-10 18:27:01 +00:00
Mark Haines	eab141ee67	Rename path to path_segments to make it clearer that it is a list	2015-02-10 18:25:54 +00:00
Mark Haines	5e54365234	Merge branch 'develop' into single_source_version_and_dependencies	2015-02-10 18:13:25 +00:00
Mark Haines	84a769cdb7	Fix code-style	2015-02-10 17:58:36 +00:00
Mark Haines	a9684730ac	Add the 'setup_requires' and allow easy_install since jenkins uses them	2015-02-10 17:48:16 +00:00
Mark Haines	7ed971d9b2	Single source version and python dependencies, prevent people accidentally installing with easy_install, use scripts rather than entry_points to install synctl	2015-02-10 17:42:36 +00:00
Erik Johnston	c8e1da930d	Log all the exits from _attempt_new_transaction	2015-02-10 17:30:46 +00:00
Erik Johnston	771892b314	Merge pull request #59 from matrix-org/hotfixes-v0.6.1f ... Hotfixes v0.6.1f	2015-02-10 16:39:05 +00:00
Erik Johnston	b61a308b27	Bump version	2015-02-10 16:37:12 +00:00
Erik Johnston	e8d4a31475	Fix prune_events to work with nested dicts	2015-02-10 16:36:51 +00:00
Mark Haines	b085fac735	Code-style fixes	2015-02-10 16:30:48 +00:00
Erik Johnston	697ab75a34	Sign auth_chains when returned by /state/ requests	2015-02-10 15:46:24 +00:00
Mark Haines	f88d3ee8ae	Merge pull request #58 from matrix-org/get_event_counters ... Add performance counters for different stages of loading events	2015-02-10 15:15:20 +00:00
Mark Haines	fda4422bc9	Fix pyflakes	2015-02-10 14:54:07 +00:00
Mark Haines	d7c7efb691	Add performance counters for different stages of loading events	2015-02-10 14:50:53 +00:00
Erik Johnston	f91345bdb5	yaml.load expects strings to be a yaml rather than file	2015-02-10 13:57:31 +00:00
Erik Johnston	30595b466f	Use yaml logging config format because it is much nicer	2015-02-10 13:50:33 +00:00
Erik Johnston	b90d377af4	Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop	2015-02-10 10:33:35 +00:00
Mark Haines	8ce100c7b4	Convert directory paths to absolute paths before daemonizing	2015-02-09 18:30:00 +00:00
Mark Haines	5c5f5c1f0e	Merge pull request #56 from matrix-org/room_initial_sync_perf ... During room intial sync, only calculate current state once.	2015-02-09 18:09:30 +00:00
Erik Johnston	375eba6a18	Merge pull request #57 from matrix-org/transaction_counters ... Transaction counters	2015-02-09 18:08:08 +00:00
Mark Haines	0c4536da8f	Use the transaction 'desc' rather than 'name', increment the txn_ids in ... txn names	2015-02-09 18:06:31 +00:00
Mark Haines	347b497db0	Formatting	2015-02-09 17:57:09 +00:00
Mark Haines	3a5ad7dbd5	Performance counters for database transaction names	2015-02-09 17:55:56 +00:00
Erik Johnston	d94f682a4c	During room intial sync, only calculate current state once.	2015-02-09 17:41:29 +00:00
David Baker	8f616684a3	Need to use re.search if looking for matches not at the start of the string. Also comparisons with None should be 'is'.	2015-02-09 17:01:40 +00:00
Matthew Hodgson	0b725f5c4f	oops	2015-02-09 16:48:31 +00:00
Matthew Hodgson	bd2373277d	oops	2015-02-09 16:48:09 +00:00
Matthew Hodgson	a578251b48	only do word-boundary patches on bodies for now	2015-02-09 16:44:47 +00:00
Erik Johnston	76c5a5c2f6	Merge pull request #55 from matrix-org/profiling ... Profiling	2015-02-09 15:01:26 +00:00
Erik Johnston	c4ee4ce93e	Fix typo	2015-02-09 15:00:37 +00:00
Erik Johnston	ef995e6946	Add looping_call to Clock	2015-02-09 14:47:59 +00:00
Erik Johnston	66fde49f07	Log database time every 10s and log as percentage	2015-02-09 14:45:15 +00:00
Erik Johnston	75656712e3	Time how long we're spending on the database thread	2015-02-09 14:22:52 +00:00
David Baker	784d714a3f	Fix server default rule injection (downwards, not upwards!)	2015-02-09 14:17:52 +00:00
Erik Johnston	24cc6979fb	Log when we receive a request, when we send a response and how long it took to process it.	2015-02-09 13:46:22 +00:00
Matthew Hodgson	ecb0f78063	glob *s should probably be non-greedy	2015-02-08 02:37:35 +00:00
Matthew Hodgson	c2afc2ad90	oops	2015-02-08 00:37:03 +00:00
Matthew Hodgson	8be07e0db4	kill off fnmatch in favour of word-boundary based push alerts (untested)	2015-02-08 00:34:34 +00:00
Matthew Hodgson	b2b29efb75	Merge pull request #53 from matrix-org/default_avatar_identicons ... create identicons for new users by default as default avatars	2015-02-07 23:18:24 +00:00
Matthew Hodgson	37b6b880ef	don't give up if we can't create default avatars during tests	2015-02-07 21:24:08 +00:00
Matthew Hodgson	adc4310a73	add some options and doc	2015-02-07 21:13:57 +00:00
Matthew Hodgson	0c0ae2e886	clean up TurnedToDust's ArchLinux notes a bit	2015-02-07 20:24:46 +00:00