5640 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mark Haines	b19b9535f6	Merge pull request #310 from matrix-org/markjh/bcrypt_rounds ... Add config for how many bcrypt rounds to use for password hashes	2015-10-16 17:05:21 +01:00
Erik Johnston	46d39343d9	Explicitly check for Sqlite3Engine	2015-10-16 16:58:00 +01:00
Erik Johnston	f2d698cb52	Typing	2015-10-16 16:46:48 +01:00
Erik Johnston	33646eb000	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-16 15:35:35 +01:00
Erik Johnston	524b708f98	Merge pull request #311 from matrix-org/markjh/postgres_fixes ... Fix FilteringStore.get_user_filter to work with postgres	2015-10-16 15:35:26 +01:00
Erik Johnston	380f148db7	Remove unused import	2015-10-16 15:32:56 +01:00
Mark Haines	fc012aa8dc	Fix FilteringStore.get_user_filter to work with postgres	2015-10-16 15:28:43 +01:00
Daniel Wagner-Hall	e5acc8a47b	Merge pull request #302 from matrix-org/daniel/3pidinvites ... Implement third party identifier invites	2015-10-16 15:23:30 +01:00
Erik Johnston	d4b5621e0a	Remove duplicate _filter_events_for_client	2015-10-16 15:19:52 +01:00
Erik Johnston	23ed7dc0e7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-16 15:18:42 +01:00
Erik Johnston	315b03b58d	Merge pull request #309 from matrix-org/erikj/_filter_events_for_client ... Amalgamate _filter_events_for_client	2015-10-16 15:18:32 +01:00
Daniel Wagner-Hall	c225d63e9e	Add signing host and keyname to signatures	2015-10-16 15:07:56 +01:00
Daniel Wagner-Hall	b8dd5b1a2d	Verify third party ID server certificates	2015-10-16 14:54:54 +01:00
Erik Johnston	366af6b73a	Amalgamate _filter_events_for_client	2015-10-16 14:52:48 +01:00
Mark Haines	f2f031fd57	Add config for how many bcrypt rounds to use for password hashes ... By default we leave it at the default value of 12. But now we can reduce it for preparing users for loadtests or running integration tests.	2015-10-16 14:52:08 +01:00
Erik Johnston	12122bfc36	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-16 14:46:32 +01:00
Erik Johnston	edb998ba23	Explicitly check for Sqlite3Engine	2015-10-16 14:37:14 +01:00
Mark Haines	5df54de801	Merge pull request #308 from matrix-org/markjh/v2_filter_encoding ... Encode the filter JSON as UTF-8 before storing in the database.	2015-10-16 13:41:31 +01:00
Erik Johnston	b62da463e1	docstring	2015-10-16 11:52:16 +01:00
Erik Johnston	3cf9948b8d	Add docstring	2015-10-16 11:28:12 +01:00
Erik Johnston	73260ad01f	Comment on the LIMIT 500	2015-10-16 11:24:02 +01:00
Erik Johnston	22a8c91448	Split up run_upgrade	2015-10-16 11:19:44 +01:00
Erik Johnston	a8945d24d1	Reorder changelog	2015-10-16 11:07:37 +01:00
Mark Haines	6296590bf7	Encode the filter JSON as UTF-8 before storing in the database. ... Because we are using a binary column type to store the filter JSON.	2015-10-16 10:50:32 +01:00
Erik Johnston	bcfb653816	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-15 16:37:32 +01:00
Erik Johnston	e46cdc08cc	Update change log	2015-10-15 15:29:00 +01:00
Erik Johnston	8189c4e3fd	Bump version	2015-10-15 15:29:00 +01:00
Daniel Wagner-Hall	6ffbcf45c6	Use non-placeholder name for endpoint	2015-10-15 13:12:52 +01:00
Daniel Wagner-Hall	643b5fcdc8	Look for keys on the right objects	2015-10-15 13:10:30 +01:00
Daniel Wagner-Hall	f38df51e8d	Merge branch 'develop' into daniel/3pidinvites	2015-10-15 11:51:55 +01:00
Mark Haines	1a934e8bfd	synapse.client.v1.login.LoginFallbackRestServlet and synapse.client.v1.login.PasswordResetRestServlet are unused	2015-10-15 11:09:57 +01:00
Mark Haines	5338220d3a	synapse.util.emailutils was unused	2015-10-15 10:39:33 +01:00
Mark Haines	a059760954	Merge pull request #305 from matrix-org/markjh/v2_sync_api ... Update the v2 sync API to work as specified in the current spec.	2015-10-14 13:56:23 +01:00
Erik Johnston	d7c70d09f0	Merge pull request #304 from matrix-org/erikj/remove_unused_arg ... Remove unused room_id arg	2015-10-14 13:39:33 +01:00
Mark Haines	c185c1c413	Fix v2 sync polling	2015-10-14 13:16:53 +01:00
Mark Haines	f50c43464c	Merge branch 'develop' into markjh/v2_sync_api	2015-10-14 11:40:45 +01:00
Erik Johnston	f45aaf0e35	Remove unused constatns	2015-10-14 10:36:55 +01:00
Erik Johnston	8c9df8774e	Make 'keys' optional	2015-10-14 10:35:50 +01:00
Erik Johnston	99c7fbfef7	Fix to work with SQLite	2015-10-14 09:52:40 +01:00
Erik Johnston	1d9e109820	More TODO markers	2015-10-14 09:49:00 +01:00
Erik Johnston	d25b0f65ea	Add TODO markers	2015-10-14 09:46:31 +01:00
Erik Johnston	858634e1d0	Remove unused room_id arg	2015-10-14 09:31:20 +01:00
Mark Haines	474274583f	Merge pull request #303 from matrix-org/markjh/twisted_debugging ... Bounce all deferreds through the reactor to make debugging easier.	2015-10-13 18:40:57 +01:00
Daniel Wagner-Hall	d82c5f7b5c	Use more descriptive error code	2015-10-13 18:02:00 +01:00
Daniel Wagner-Hall	0c38e8637f	Remove unnecessary class-wrapping	2015-10-13 18:00:38 +01:00
Mark Haines	1941eb315d	Enable stack traces for the demo scripts	2015-10-13 18:00:02 +01:00
Mark Haines	9020860479	Only turn on the twisted deferred debugging if full_twisted_stacktraces is set in the config	2015-10-13 17:50:44 +01:00
Daniel Wagner-Hall	14edea1aff	Move logic into handler	2015-10-13 17:47:58 +01:00
Daniel Wagner-Hall	b68db61222	Add logging	2015-10-13 17:22:50 +01:00
Daniel Wagner-Hall	bb407cd624	Re-add accidentally removed code	2015-10-13 17:19:26 +01:00