7051 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rick Cogley	70d820c875	Update to reflect new location at github. ... Additionally it does not appear there is turnserver.conf.default, but rather, just /etc/turnserver.conf.	2016-06-26 19:07:07 +09:00
David Baker	3f7652c56f	Merge remote-tracking branch 'origin/develop' into dbkr/push_room_naming	2016-06-24 14:03:39 +01:00
Mark Haines	535b6bfacc	Merge pull request #895 from matrix-org/markjh/jenkins_port_range ... Fix the sytests to use a port-range rather than a port base	2016-06-24 14:03:01 +01:00
Mark Haines	f7fe0e5f67	Fix the sytests to use a port-range rather than a port base	2016-06-24 13:53:03 +01:00
David Baker	2455ad8468	Remove room name & alias test ... as get_room_name_and_alias is now gone	2016-06-24 13:34:20 +01:00
David Baker	0b640aa56b	even more pep8	2016-06-24 11:47:11 +01:00
David Baker	aa3a4944d5	more pep8	2016-06-24 11:45:23 +01:00
David Baker	46b7362304	pep8	2016-06-24 11:44:57 +01:00
David Baker	870c45913e	Use similar naming we use in email notifs for push ... Fixes https://github.com/vector-im/vector-web/issues/1654	2016-06-24 11:41:11 +01:00
Mark Haines	05f1a4596a	Merge branch 'master' into develop	2016-06-23 11:17:48 +01:00
David Baker	13517e2914	Merge pull request #892 from matrix-org/dbkr/email_notif_most_recent ... Put most recent 20 messages in notif	2016-06-23 09:25:45 +01:00
David Baker	b5fb7458d5	Actually we need to order these properly ... otherwise we'll end up returning the wrong 20	2016-06-22 18:07:14 +01:00
David Baker	f73fdb04a6	Style	2016-06-22 17:51:40 +01:00
David Baker	3a4120e49a	Put most recent 20 messages in notif ... Fixes https://github.com/vector-im/vector-web/issues/1648	2016-06-22 17:47:18 +01:00
Erik Johnston	9fe894402f	Merge pull request #843 from mweinelt/ldap3-rewrite ... Rewrite LDAP Authentication against ldap3	2016-06-22 17:23:07 +01:00
Martin Weinelt	0a32208e5d	Rework ldap integration with ldap3 ... Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>	2016-06-22 17:51:59 +02:00
Mark Haines	774f3a692c	Merge pull request #889 from matrix-org/markjh/synctl_workers ... Optionally start or stop workers in synctl.	2016-06-21 17:58:19 +01:00
Mark Haines	5cc7564c5c	Optionally start or stop workers in synctl. ... Optionally start or stop an individual worker by passing -w with the path to the worker config. Optionally start or stop every worker and the main synapse by passing -a with a path to a directory containing worker configs. The "-w" is intended to be used to bounce individual workers proceses. THe "-a" is intended for when you want to restart all the workers simultaneuously, for example when performing database upgrades.	2016-06-21 16:38:05 +01:00
Mark Haines	0fe0b0eeb6	Merge pull request #888 from matrix-org/markjh/content_repo ... Remove the legacy v0 content upload API.	2016-06-21 14:01:01 +01:00
David Baker	0126a5d60a	Merge pull request #887 from matrix-org/dbkr/notif_template_subs_fail ... Fix substitution failure in mail template	2016-06-21 13:48:54 +01:00
Mark Haines	13e334506c	Remove the legacy v0 content upload API. ... The existing content can still be downloaded. The last upload to the matrix.org server was in January 2015, so it is probably safe to remove the upload API.	2016-06-21 11:47:39 +01:00
David Baker	6b40e4f52a	Fix substitution failure in mail template	2016-06-21 11:37:56 +01:00
Mark Haines	d5fb561709	Optionally make committing to postgres asynchronous. ... Useful when running tests when you don't care whether the server will lose data that it claims that it has committed.	2016-06-20 17:53:38 +01:00
Erik Johnston	d8ec81cc31	Merge pull request #879 from matrix-org/erikj/linearize_fed_server ... Linearize some federation endpoints based on (origin, room_id)	2016-06-20 17:34:29 +01:00
Erik Johnston	bc72d381b2	Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse	2016-06-20 14:18:04 +01:00
Erik Johnston	4d362a61ea	Bump version and changelog	2016-06-20 14:17:42 +01:00
Erik Johnston	00c281f6a4	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1	2016-06-20 14:13:54 +01:00
Mark Haines	c8cd41cdd8	Merge pull request #880 from matrix-org/markjh/registered_user ... Remove registered_users from the distributor.	2016-06-17 19:45:06 +01:00
Mark Haines	41e4b2efea	Add the create_profile method back since the tests use it	2016-06-17 19:20:47 +01:00
Mark Haines	0c13d45522	Add a comment on why we don't create a profile for upgrading users	2016-06-17 19:18:53 +01:00
Mark Haines	9f1800fba8	Remove registered_users from the distributor. ... The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed.	2016-06-17 19:14:16 +01:00
Erik Johnston	8f4a9bbc16	Linearize some federation endpoints based on (origin, room_id)	2016-06-17 16:43:45 +01:00
Erik Johnston	9ba2bf1570	Merge pull request #878 from matrix-org/erikj/ujson ... Disable responding with canonical json for federation	2016-06-17 16:22:12 +01:00
Erik Johnston	120c238705	Disable responding with canonical json for federation	2016-06-17 16:10:37 +01:00
Erik Johnston	1c1f633b13	Merge pull request #877 from matrix-org/erikj/frozen_default ... Turn use_frozen_events off by default	2016-06-17 15:33:55 +01:00
Erik Johnston	6660f37558	Merge pull request #876 from matrix-org/erikj/sign_own ... Only re-sign our own events	2016-06-17 15:23:20 +01:00
Mark Haines	20e5b46b20	Merge pull request #875 from matrix-org/markjh/email_formatting ... Fix ``KeyError: 'msgtype'``. Use ``.get``	2016-06-17 15:14:58 +01:00
Erik Johnston	0113ad36ee	Enable use_frozen_events in tests	2016-06-17 15:13:13 +01:00
Erik Johnston	3e41de05cc	Turn use_frozen_events off by default	2016-06-17 15:11:22 +01:00
Erik Johnston	2884712ca7	Only re-sign our own events	2016-06-17 14:47:33 +01:00
Mark Haines	ded01c3bf6	Fix `KeyError: 'msgtype'. Use .get` ... Fixes a key error where the mailer tried to get the ``msgtype`` of an event that was missing a ``msgtype``. ``` File "synapse/push/mailer.py", line 264, in get_notif_vars File "synapse/push/mailer.py", line 285, in get_message_vars File ".../frozendict/__init__.py", line 10, in __getitem__ return self.__dict[key] KeyError: 'msgtype' ```	2016-06-17 13:49:16 +01:00
Mark Haines	8c75040c25	Fix setting gc thresholds in the workers	2016-06-17 11:48:12 +01:00
Mark Haines	f1073ad43d	Merge pull request #874 from matrix-org/markjh/worker_config ... Inline the synchrotron and pusher configs into the main config	2016-06-17 10:58:52 +01:00
Mark Haines	a352b68acf	Use worker_ prefixes for worker config, use existing support for multiple config files	2016-06-16 17:29:50 +01:00
Mark Haines	364d616792	Access the event_cache_size directly from the server object. ... This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config.	2016-06-16 12:53:15 +01:00
Mark Haines	bde13833cb	Access replication_url from the worker config directly	2016-06-16 12:44:40 +01:00
Mark Haines	80a1bc7db5	Comment on what's going on in clobber_with_worker_config	2016-06-16 11:29:45 +01:00
Mark Haines	f1f70bf4b5	Merge remote-tracking branch 'origin/develop' into markjh/worker_config	2016-06-16 11:20:17 +01:00
Mark Haines	dbb5a39b64	Add worker config module	2016-06-16 11:09:15 +01:00
Mark Haines	885ee861f7	Inline the synchrotron and pusher configs into the main config	2016-06-16 11:06:12 +01:00