7130 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kent Shikama	1ee2584307	Fix pep8	2016-07-05 19:01:00 +09:00
Kent Shikama	507b8bb091	Add comment to prompt changing of pepper	2016-07-05 18:42:35 +09:00
Mark Haines	d44d11d864	Use true/false for boolean parameter inclusive to avoid potential for sqli, and possibly make the code clearer	2016-07-05 10:39:13 +01:00
Erik Johnston	2d21d43c34	Add purge_history API	2016-07-05 10:28:51 +01:00
Mark Haines	0fb76c71ac	Use different SQL for postgres and sqlite3 for when using multicolumn indexes	2016-07-04 19:44:55 +01:00
Kent Shikama	8bdaf5f7af	Add pepper to password hashing ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-05 02:13:52 +09:00
Erik Johnston	a67bf0b074	Add storage function to purge history for a room	2016-07-04 16:02:50 +01:00
Mark Haines	f18d7546c6	Use a query that postgresql optimises better for get_events_around	2016-07-04 15:48:25 +01:00
Erik Johnston	3de8168343	Merge pull request #905 from KentShikama/add-password-hash ... Optionally include password hash in createUser endpoint	2016-07-04 14:23:04 +01:00
Kent Shikama	bb069079bb	Fix style violations ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-04 22:07:11 +09:00
Kent Shikama	2e5a31f197	Use .get() instead of [] to access password_hash	2016-07-04 22:00:13 +09:00
Kent Shikama	fc8007dbec	Optionally include password hash in createUser endpoint ... Signed-off-by: Kent Shikama <kent@kentshikama.com>	2016-07-03 15:08:15 +09:00
Richard van der Hoff	1238203bc4	code_style.rst: add link to sphinx examples	2016-07-01 09:36:51 +01:00
Richard van der Hoff	41f072fd0e	code_style.rst: *fix* link to google style	2016-07-01 09:09:40 +01:00
Richard van der Hoff	5a6ef20ef6	code_style.rst: add link to google style	2016-07-01 09:08:35 +01:00
David Baker	be8be535f7	requestToken update ... Don't send requestToken request to untrusted ID servers Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now.	2016-06-30 17:51:28 +01:00
Erik Johnston	ab71589c0b	Merge pull request #903 from matrix-org/erikj/deactivate_user ... Feature: Add deactivate account admin API	2016-06-30 15:57:29 +01:00
Erik Johnston	f328d95cef	Feature: Add deactivate account admin API ... Allows server admins to "deactivate" accounts, which: - Revokes all access tokens - Removes all threepids - Removes password The API is a POST to `/admin/deactivate/<user_id>`	2016-06-30 15:40:58 +01:00
Erik Johnston	aac546c978	Merge pull request #902 from matrix-org/erikj/expire_media ... Feature: Implement purge_media_cache admin API	2016-06-29 15:50:57 +01:00
Erik Johnston	f52cb4cd78	Remove race	2016-06-29 15:24:50 +01:00
Mark Haines	6783534a0f	Merge pull request #886 from matrix-org/markjh/async_commit ... Optionally make committing to postgres asynchronous.	2016-06-29 15:21:58 +01:00
Erik Johnston	a70688445d	Implement purge_media_cache admin API	2016-06-29 14:57:59 +01:00
Erik Johnston	314b146b2e	Track approximate last access time for remote media	2016-06-29 11:41:20 +01:00
David Baker	7846ac3125	Merge pull request #900 from RickCogley/RickCogley-coturn-readme-2 ... Rick cogley coturn readme 2	2016-06-28 10:49:02 +01:00
Rick Cogley	56ec5869c9	Update turn-howto.rst to use git clone (2) ... Not logical to use svn checkout against a github repo, so changed to git clone. Signed-off-by: Rick Cogley <rick.cogley@esolia.co.jp>	2016-06-28 18:34:38 +09:00
Rick Cogley	1ea358b28b	Update turn-howto.rst to use git clone ... svn checkout is not logical for a checkout from github, so changed the checkout to "git clone". thanks @dbkr Signed-off-by: Rick Cogley <rick.cogley@esolia.co.jp>	2016-06-28 18:27:54 +09:00
David Baker	db74dcda5b	Merge pull request #894 from matrix-org/dbkr/push_room_naming ... Use similar naming we use in email notifs for push	2016-06-28 10:12:24 +01:00
Rick Cogley	551fe80bed	Remove double spaces ... Reading the RST spec, I was trying to get breaks to appear by entering the double spaces after the lines in the code blocks. It does not work anyway, and, as pointed out, I've removed.	2016-06-28 12:47:55 +09:00
Matthew Hodgson	63bb8f0df9	remove vector.im from default secondary DS list	2016-06-27 13:13:33 +04:00
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