3649 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Haines	2551b6645d	Update the end_token correctly, otherwise the token doesn't advance and the client gets duplicate events	2015-05-12 11:54:18 +01:00
Mark Haines	5e4ba463b7	Merge branch 'develop' into notifier_unify	2015-05-12 11:41:53 +01:00
Mark Haines	51da995806	Merge pull request #148 from matrix-org/bugs/SYN-377 ... SYN-377: Make sure that the event is marked as persisted from the main thread.	2015-05-12 11:36:44 +01:00
Mark Haines	5002056b16	SYN-377: Make sure that the StreamIdGenerator.get_next.__exit__ is called from the main thread after the transaction completes, not from database thread before the transaction completes.	2015-05-12 11:20:40 +01:00
Mark Haines	e269c511f6	Don't bother passing the events to the notifier since it isn't using them	2015-05-11 15:01:51 +01:00
Mark Haines	5e3b254dc8	Use wait_for_events to implement 'get_events'	2015-05-11 14:37:33 +01:00
Erik Johnston	d244fa9741	Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse into develop	2015-05-11 13:34:31 +01:00
Erik Johnston	79b7154454	Merge pull request #146 from matrix-org/erikj/push_rules_fixes ... Fix 500 on push rule updates.	2015-05-11 11:33:47 +01:00
Erik Johnston	4ef556f650	Bump version	2015-05-11 11:31:04 +01:00
Erik Johnston	b036596b75	Prefer to use _simple_*.	2015-05-11 11:24:01 +01:00
Erik Johnston	cd525c0f5a	push_rules table expects an 'id' field	2015-05-11 11:24:01 +01:00
Mark Haines	3c224f4d0e	SYN-376: Add script for converting server keys from v1 to v2	2015-05-11 11:00:17 +01:00
Erik Johnston	d38862a080	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-05-10 10:56:46 +01:00
David Baker	2640d6718d	Merge pull request #145 from matrix-org/hotfixes-v0.9.0-r3 ... Hotfixes v0.9.0 r3	2015-05-10 10:54:44 +01:00
Erik Johnston	de87541862	Bump version	2015-05-10 10:51:08 +01:00
Erik Johnston	22d2f498fa	Fix push rule bug: can't insert bool into small int column	2015-05-10 10:50:51 +01:00
Matthew Hodgson	d79ffa1898	typo	2015-05-09 14:45:37 +01:00
Erik Johnston	37feb4031f	Merge branch 'hotfixes-v0.9.0-r2' of github.com:matrix-org/synapse	2015-05-08 16:13:15 +01:00
Erik Johnston	0cd1401f8d	Bump version	2015-05-08 16:11:51 +01:00
Erik Johnston	724bb1e7d9	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-05-08 16:11:19 +01:00
Mark Haines	1c7912751e	Drop the old table not the new table	2015-05-08 16:04:32 +01:00
Mark Haines	9d36eb4eab	Rename unique constraint	2015-05-08 16:01:55 +01:00
Mark Haines	b0f71db3ff	Remove unsigned	2015-05-08 15:59:51 +01:00
Mark Haines	84e1cacea4	Bump schema version	2015-05-08 15:58:14 +01:00
Mark Haines	6538d445e8	Make the timestamps in server_keys_json bigints	2015-05-08 15:55:17 +01:00
Erik Johnston	52f98f8a5b	Merge branch 'hotfixes-v0.9.0-r1' of github.com:matrix-org/synapse	2015-05-08 14:25:18 +01:00
Erik Johnston	22a7ba8b22	Actually rename all isntances	2015-05-08 13:50:03 +01:00
Erik Johnston	3a42f32134	Reword port script usage	2015-05-08 13:47:48 +01:00
Erik Johnston	4fa0f53521	Support reading directly from a config	2015-05-08 13:45:58 +01:00
Erik Johnston	326121aec4	UPGRADES: s/v0.x.x/v0.9.0	2015-05-08 13:38:29 +01:00
Erik Johnston	9a9386226a	Mention Ivan Shapovalov contrib/systemd	2015-05-08 13:37:54 +01:00
Erik Johnston	126d562576	Bump version	2015-05-08 13:29:37 +01:00
Erik Johnston	f08c33e834	Fix port_from_sqlite_to_postgres after changes to storage layer.	2015-05-08 13:29:00 +01:00
Erik Johnston	db0dca2f6f	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-05-07 19:21:00 +01:00
Erik Johnston	89c0cd4acc	Merge branch 'release-v0.9.0' of github.com:matrix-org/synapse	2015-05-07 19:07:00 +01:00
Erik Johnston	6101ce427a	Slight rewording	2015-05-07 18:58:28 +01:00
Erik Johnston	5fe26a9b5c	Reword docs/application_services.rst	2015-05-07 18:54:53 +01:00
Erik Johnston	35698484a5	Add some information on registering AS's	2015-05-07 18:51:09 +01:00
Erik Johnston	63562f6d5a	Bump date	2015-05-07 18:20:13 +01:00
Erik Johnston	a151693a3b	Bump syweb version	2015-05-07 18:01:46 +01:00
Erik Johnston	ac29318b84	Add link to registration spec	2015-05-07 17:58:50 +01:00
Mark Haines	dfa98f911b	revert accidental bcrypt gensalt round reduction from loadtesting	2015-05-07 17:45:42 +01:00
Erik Johnston	4605953b0f	Add JIRA issue id	2015-05-07 16:53:18 +01:00
Mark Haines	ef8e8ebd91	pynacl-0.3.0 was released so we can finally start using it directly from pypi	2015-05-07 16:46:51 +01:00
Erik Johnston	3188e94ac4	Explain the change in AS /register api	2015-05-07 16:12:02 +01:00
David Baker	97a64f3ebe	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2015-05-07 09:33:42 +01:00
David Baker	b850c9fa04	Typo	2015-05-07 09:33:30 +01:00
Mark Haines	4a7a4a5b6c	Optional profiling using cProfile	2015-05-06 17:08:00 +01:00
Erik Johnston	771fc05d30	Change log: Link to application services spec.	2015-05-06 13:59:32 +01:00
Erik Johnston	938939fd89	Move CAPTCHA_SETUP to docs/	2015-05-06 13:48:06 +01:00