6743 Commits (46b7362304c0ea056c65323a80a84e231c544e86)

 

All Branches   

Search

Author	SHA1	Message	Date
David Baker	46b7362304	pep8	9 years ago
David Baker	870c45913e	Use similar naming we use in email notifs for push ... Fixes https://github.com/vector-im/vector-web/issues/1654	9 years ago
Mark Haines	05f1a4596a	Merge branch 'master' into develop	9 years ago
David Baker	13517e2914	Merge pull request #892 from matrix-org/dbkr/email_notif_most_recent ... Put most recent 20 messages in notif	9 years ago
David Baker	b5fb7458d5	Actually we need to order these properly ... otherwise we'll end up returning the wrong 20	9 years ago
David Baker	f73fdb04a6	Style	9 years ago
David Baker	3a4120e49a	Put most recent 20 messages in notif ... Fixes https://github.com/vector-im/vector-web/issues/1648	9 years ago
Erik Johnston	9fe894402f	Merge pull request #843 from mweinelt/ldap3-rewrite ... Rewrite LDAP Authentication against ldap3	9 years ago
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>	9 years ago
Mark Haines	774f3a692c	Merge pull request #889 from matrix-org/markjh/synctl_workers ... Optionally start or stop workers in synctl.	9 years ago
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.	9 years ago
Mark Haines	0fe0b0eeb6	Merge pull request #888 from matrix-org/markjh/content_repo ... Remove the legacy v0 content upload API.	9 years ago
David Baker	0126a5d60a	Merge pull request #887 from matrix-org/dbkr/notif_template_subs_fail ... Fix substitution failure in mail template	9 years ago
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.	9 years ago
David Baker	6b40e4f52a	Fix substitution failure in mail template	9 years ago
Erik Johnston	d8ec81cc31	Merge pull request #879 from matrix-org/erikj/linearize_fed_server ... Linearize some federation endpoints based on (origin, room_id)	9 years ago
Erik Johnston	bc72d381b2	Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse	9 years ago
Erik Johnston	4d362a61ea	Bump version and changelog	9 years ago
Erik Johnston	00c281f6a4	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1	9 years ago
Mark Haines	c8cd41cdd8	Merge pull request #880 from matrix-org/markjh/registered_user ... Remove registered_users from the distributor.	9 years ago
Mark Haines	41e4b2efea	Add the create_profile method back since the tests use it	9 years ago
Mark Haines	0c13d45522	Add a comment on why we don't create a profile for upgrading users	9 years ago
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.	9 years ago
Erik Johnston	8f4a9bbc16	Linearize some federation endpoints based on (origin, room_id)	9 years ago
Erik Johnston	9ba2bf1570	Merge pull request #878 from matrix-org/erikj/ujson ... Disable responding with canonical json for federation	9 years ago
Erik Johnston	120c238705	Disable responding with canonical json for federation	9 years ago
Erik Johnston	1c1f633b13	Merge pull request #877 from matrix-org/erikj/frozen_default ... Turn use_frozen_events off by default	9 years ago
Erik Johnston	6660f37558	Merge pull request #876 from matrix-org/erikj/sign_own ... Only re-sign our own events	9 years ago
Mark Haines	20e5b46b20	Merge pull request #875 from matrix-org/markjh/email_formatting ... Fix ``KeyError: 'msgtype'``. Use ``.get``	9 years ago
Erik Johnston	0113ad36ee	Enable use_frozen_events in tests	9 years ago
Erik Johnston	3e41de05cc	Turn use_frozen_events off by default	9 years ago
Erik Johnston	2884712ca7	Only re-sign our own events	9 years ago
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' ```	9 years ago
Mark Haines	8c75040c25	Fix setting gc thresholds in the workers	9 years ago
Mark Haines	f1073ad43d	Merge pull request #874 from matrix-org/markjh/worker_config ... Inline the synchrotron and pusher configs into the main config	9 years ago
Mark Haines	a352b68acf	Use worker_ prefixes for worker config, use existing support for multiple config files	9 years ago
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.	9 years ago
Mark Haines	bde13833cb	Access replication_url from the worker config directly	9 years ago
Mark Haines	80a1bc7db5	Comment on what's going on in clobber_with_worker_config	9 years ago
Mark Haines	f1f70bf4b5	Merge remote-tracking branch 'origin/develop' into markjh/worker_config	9 years ago
Mark Haines	dbb5a39b64	Add worker config module	9 years ago
Mark Haines	885ee861f7	Inline the synchrotron and pusher configs into the main config	9 years ago
Erik Johnston	486b9a6a2d	Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode ... Fix TypeError in call to bcrypt.hashpw	9 years ago
Erik Johnston	1f31381611	Merge pull request #872 from matrix-org/erikj/preview_url_fixes ... Fix some `/preview_url` explosions	9 years ago
Salvatore LaMendola	ed5f43a55a	Fix TypeError in call to bcrypt.hashpw ... - At the very least, this TypeError caused logins to fail on my own running instance of Synapse, and the simple (explicit) UTF-8 conversion resolved login errors for me. Signed-off-by: Salvatore LaMendola <salvatore.lamendola@gmail.com>	9 years ago
Erik Johnston	09a17f965c	Line lengths	9 years ago
Erik Johnston	1e9026e484	Handle floats as img widths	9 years ago
Erik Johnston	a60169ea09	Handle og props with not content	9 years ago
Mark Haines	78a16d395c	Merge pull request #867 from matrix-org/markjh/enable_jenkins_synchrotron ... Enable testing the synchrotron on jenkins	9 years ago
Erik Johnston	5436848955	Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse into develop	9 years ago