8386 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	de796f27e6	Add joined_rooms servlet	2016-12-08 11:39:03 +00:00
Erik Johnston	2687af82d4	Comments	2016-12-07 09:58:33 +00:00
Erik Johnston	3727d66a0e	Don't include appservice id	2016-12-06 17:04:26 +00:00
Erik Johnston	0d81e26769	Merge pull request #1672 from williamleuschner/develop ... Add README instructions for OpenBSD installation	2016-12-06 16:39:15 +00:00
William Leuschner	59bc64328f	Fix incorrect numbering on OpenBSD instructions caused by my own incompetence ... Signed-off-by: William Leuschner <wel2138@rit.edu>	2016-12-06 11:31:17 -05:00
Erik Johnston	f32fb65552	Add new API appservice specific public room list	2016-12-06 16:12:27 +00:00
William Leuschner	39a76b9cba	Update incorrect information in README about ksh and source ... Signed-off-by: William Leuschner <wel2138@rit.edu>	2016-12-06 11:09:31 -05:00
Richard van der Hoff	1529c19675	Prevent user tokens being used as guest tokens (#1675) ... Make sure that a user cannot pretend to be a guest by adding 'guest = True' caveats.	2016-12-06 15:31:37 +00:00
Richard van der Hoff	194b6259c5	Travis config (#1674)	2016-12-06 12:51:32 +00:00
Richard van der Hoff	5a2c33c12e	Merge pull request #1673 from matrix-org/rav/fix_tox_tests ... Fix unittests under tox	2016-12-06 11:45:55 +00:00
Richard van der Hoff	7dae7087d3	Fix unittests under tox ... We now need to set PYTHONPATH when running the unit tests; update tox config to do so.	2016-12-06 11:35:14 +00:00
William Leuschner	12aefb9dfc	Add README instructions for OpenBSD installation ... Signed-off-by: William Leuschner <wel2138@rit.edu>	2016-12-05 14:16:39 -05:00
Erik Johnston	9609c91e7d	Merge pull request #653 from matrix-org/erikj/preset_guest_join ... Enable guest access for private rooms by default	2016-12-05 17:47:14 +00:00
Erik Johnston	338df4f409	Merge pull request #1649 from matrix-org/dbkr/log_ui_auth_args ... Log the args that we have on UI auth completion	2016-12-05 16:40:58 +00:00
Erik Johnston	3e90250ea3	Merge pull request #1668 from pik/bug-console-filter ... Logging: Fix console filter breaking when level is DEBUG	2016-12-05 16:38:26 +00:00
Richard van der Hoff	0b1e287e81	Merge pull request #1671 from kyrias/fix-preview-test ... Fix preview test	2016-12-05 15:39:17 +00:00
Johannes Löthberg	6c9a0ba415	test_preview: Fix incorrect wrapping ... The old test expected an incorrect wrapping due to the preview function not using unicode properly, so it got the wrong length. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2016-12-05 16:33:57 +01:00
Johannes Löthberg	0697bb2247	Make test_preview use unicode strings ... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2016-12-05 16:33:57 +01:00
Richard van der Hoff	24081224d1	Merge remote-tracking branch 'origin/master' into develop	2016-12-05 11:12:43 +00:00
pik	c46e7a9c9b	Bugfix: Console logging handler missing default filter	2016-12-03 20:14:58 -03:00
Richard van der Hoff	a2849a18a5	README: fix link	2016-12-03 13:18:27 +00:00
Richard van der Hoff	59984e9f58	Merge remote-tracking branch 'origin/master' into develop	2016-12-03 13:08:53 +00:00
Richard van der Hoff	546ec1a5cf	Merge pull request #1667 from matrix-org/rav/update_readme ... Updates to the README	2016-12-03 13:07:43 +00:00
Matthew Hodgson	7a00178832	Merge pull request #1664 from kyrias/preview-url-resource-encoding ... preview_url_resource: Ellipsis must be in unicode string	2016-12-03 01:34:59 +00:00
Richard van der Hoff	9df84dd22d	README: review comments ... Minor updates post-review	2016-12-02 17:17:15 +00:00
Richard van der Hoff	3f23154088	README: rewrite federation section	2016-12-02 12:02:33 +00:00
Richard van der Hoff	f6270a8fe2	README: add reverse-proxying section	2016-12-02 12:02:33 +00:00
Richard van der Hoff	235407a78e	README: Rewrite "Identity servers" section	2016-12-02 12:02:33 +00:00
Richard van der Hoff	77bf92e3c6	README: rewrite installation instructions	2016-12-02 12:02:33 +00:00
Richard van der Hoff	bb3d0c270d	README: remove refs to demo client ... The demo client isn't really fit for purpose, so stop encouraging people to use it.	2016-12-02 11:54:59 +00:00
Richard van der Hoff	f8c45d428c	README: code quotes ... Add some syntax highlighting	2016-12-02 11:47:55 +00:00
Richard van der Hoff	153535fc56	README: "About matrix" updates ... - remove redundant "where's the spec" section: this would belong in "About matrix", but it's already there. - E2E is in beta rather than dev	2016-12-02 11:46:00 +00:00
Richard van der Hoff	a8d8225ead	README: Fix links ... Fix a couple of broken links	2016-12-02 11:43:10 +00:00
Richard van der Hoff	cc03f4c58b	Rearrange the README ... Move some bits of the README around. No words were changed in the making of this commit.	2016-12-02 11:42:59 +00:00
Johannes Löthberg	32c8b5507c	preview_url_resource: Ellipsis must be in unicode string ... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2016-12-01 13:12:13 +01:00
Richard van der Hoff	971edd04af	rename CAPTCHA_SETUP ... this is rst so name it accordingly	2016-12-01 12:08:03 +00:00
Richard van der Hoff	471200074b	Merge pull request #1654 from matrix-org/rav/no_more_refresh_tokens ... Stop generating refresh_tokens	2016-12-01 11:42:53 +00:00
Richard van der Hoff	6841d8ff55	Fix doc-string ... Remove refresh_token reference	2016-12-01 11:42:17 +00:00
Richard van der Hoff	12f3b9000c	fix imports	2016-11-30 17:45:49 +00:00
Richard van der Hoff	aa09d6b8f0	Rip out more refresh_token code ... We might as well treat all refresh_tokens as invalid. Just return a 403 from /tokenrefresh, so that we don't have a load of dead, untestable code hanging around. Still TODO: removing the table from the schema.	2016-11-30 17:40:18 +00:00
Richard van der Hoff	dc4b23e1a1	Merge branch 'develop' into rav/no_more_refresh_tokens	2016-11-30 17:10:04 +00:00
Richard van der Hoff	8379a741cc	Merge pull request #1660 from matrix-org/rav/better_content_type_validation ... More intelligent Content-Type parsing	2016-11-30 16:54:03 +00:00
Richard van der Hoff	321fe5c44c	Merge pull request #1656 from matrix-org/rav/remove_time_caveat ... Stop putting a time caveat on access tokens	2016-11-30 16:53:20 +00:00
Richard van der Hoff	b5b3a7e867	More intelligent Content-Type parsing ... Content-Type is allowed to contain options (`; charset=utf-8`, for instance). We should allow that.	2016-11-30 15:07:32 +00:00
Richard van der Hoff	4febfe47f0	Comments ... Update comments in verify_macaroon	2016-11-30 07:36:32 +00:00
Richard van der Hoff	77eca2487c	Merge pull request #1653 from matrix-org/rav/guest_e2e ... Implement E2E for guests	2016-11-29 17:41:35 +00:00
Richard van der Hoff	1c4f05db41	Stop putting a time caveat on access tokens ... The 'time' caveat on the access tokens was something of a lie, since we weren't enforcing it; more pertinently its presence stops us ever adding useful time caveats. Let's move in the right direction by not lying in our caveats.	2016-11-29 16:49:41 +00:00
Richard van der Hoff	7d855447ef	Merge pull request #1657 from matrix-org/rav/hurry_up_pip ... Let pip install multiple packages at once	2016-11-29 16:28:29 +00:00
Richard van der Hoff	debbea5b29	Let pip install multiple packages at once ... Pip can install multiple dependencies at the same time, so there is no need to use xargs -n1. It's significantly slower with -n1, so let's not do it with no reason.	2016-11-29 12:59:19 +00:00
Richard van der Hoff	5c4edc83b5	Stop generating refresh tokens ... Since we're not doing refresh tokens any more, we should start killing off the dead code paths. /tokenrefresh itself is a bit of a thornier subject, since there might be apps out there using it, but we can at least not generate refresh tokens on new logins.	2016-11-28 10:13:01 +00:00