8045 Commits (95a22ae194a9926bbe82350d947adbed918f6f21)

 

All Branches   

Search

Author	SHA1	Message	Date
Erik Johnston	fbaf868f62	Correctly handle timeout errors	8 years ago
Richard van der Hoff	4a9c38bfa3	Fix broken README merge ... When 546ec1a was merged into develop, I accidentally overwrote the change introduced in debbea5 (pr #1657). Reintroduce it.	8 years ago
Erik Johnston	be14c24cea	Fix rare notifier bug where listeners dont timeout ... There was a race condition that caused the notifier to 'miss' the timeout notification, since there were no other checks for the timeout this caused listeners to get stuck in a loop until something happened.	8 years ago
Erik Johnston	1697f6a323	Merge pull request #1680 from matrix-org/erikj/joined_rooms ... Add new room membership APIs	8 years ago
Erik Johnston	52d12ca782	Add /room/<room_id>/joined_members API ... This returns the currently joined members in the room with their display names and avatar urls. This is more efficient than /members for large rooms where you don't need the full events.	8 years ago
Erik Johnston	c45d8e9ba2	Add profile data to the room_membership table for joins	8 years ago
Richard van der Hoff	da13b4aa86	Merge pull request #1678 from matrix-org/rav/fix_receipt_notifications ... Read-receipt fixes	8 years ago
Richard van der Hoff	b08f76bd23	Fix ignored read-receipts ... Don't ignore read-receipts which arrive in the same EDU as a read-receipt for an old event.	8 years ago
Richard van der Hoff	bd07a35c29	Fix result of insert_receipt ... This should fix the absence of notifications when new receipts arrive.	8 years ago
Erik Johnston	de796f27e6	Add joined_rooms servlet	8 years ago
Erik Johnston	2687af82d4	Comments	8 years ago
Erik Johnston	3727d66a0e	Don't include appservice id	8 years ago
Erik Johnston	0d81e26769	Merge pull request #1672 from williamleuschner/develop ... Add README instructions for OpenBSD installation	8 years ago
William Leuschner	59bc64328f	Fix incorrect numbering on OpenBSD instructions caused by my own incompetence ... Signed-off-by: William Leuschner <wel2138@rit.edu>	8 years ago
Erik Johnston	f32fb65552	Add new API appservice specific public room list	8 years ago
William Leuschner	39a76b9cba	Update incorrect information in README about ksh and source ... Signed-off-by: William Leuschner <wel2138@rit.edu>	8 years ago
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.	8 years ago
Richard van der Hoff	194b6259c5	Travis config (#1674)	8 years ago
Richard van der Hoff	5a2c33c12e	Merge pull request #1673 from matrix-org/rav/fix_tox_tests ... Fix unittests under tox	8 years ago
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.	8 years ago
William Leuschner	12aefb9dfc	Add README instructions for OpenBSD installation ... Signed-off-by: William Leuschner <wel2138@rit.edu>	8 years ago
Erik Johnston	9609c91e7d	Merge pull request #653 from matrix-org/erikj/preset_guest_join ... Enable guest access for private rooms by default	8 years ago
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	8 years ago
Erik Johnston	3e90250ea3	Merge pull request #1668 from pik/bug-console-filter ... Logging: Fix console filter breaking when level is DEBUG	8 years ago
Richard van der Hoff	0b1e287e81	Merge pull request #1671 from kyrias/fix-preview-test ... Fix preview test	8 years ago
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>	8 years ago
Johannes Löthberg	0697bb2247	Make test_preview use unicode strings ... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	8 years ago
Richard van der Hoff	24081224d1	Merge remote-tracking branch 'origin/master' into develop	8 years ago
pik	c46e7a9c9b	Bugfix: Console logging handler missing default filter	8 years ago
Richard van der Hoff	a2849a18a5	README: fix link	8 years ago
Richard van der Hoff	59984e9f58	Merge remote-tracking branch 'origin/master' into develop	8 years ago
Richard van der Hoff	546ec1a5cf	Merge pull request #1667 from matrix-org/rav/update_readme ... Updates to the README	8 years ago
Matthew Hodgson	7a00178832	Merge pull request #1664 from kyrias/preview-url-resource-encoding ... preview_url_resource: Ellipsis must be in unicode string	8 years ago
Richard van der Hoff	9df84dd22d	README: review comments ... Minor updates post-review	8 years ago
Richard van der Hoff	3f23154088	README: rewrite federation section	8 years ago
Richard van der Hoff	f6270a8fe2	README: add reverse-proxying section	8 years ago
Richard van der Hoff	235407a78e	README: Rewrite "Identity servers" section	8 years ago
Richard van der Hoff	77bf92e3c6	README: rewrite installation instructions	8 years ago
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.	8 years ago
Richard van der Hoff	f8c45d428c	README: code quotes ... Add some syntax highlighting	8 years ago
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	8 years ago
Richard van der Hoff	a8d8225ead	README: Fix links ... Fix a couple of broken links	8 years ago
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.	8 years ago
Johannes Löthberg	32c8b5507c	preview_url_resource: Ellipsis must be in unicode string ... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	8 years ago
Richard van der Hoff	971edd04af	rename CAPTCHA_SETUP ... this is rst so name it accordingly	8 years ago
Richard van der Hoff	471200074b	Merge pull request #1654 from matrix-org/rav/no_more_refresh_tokens ... Stop generating refresh_tokens	8 years ago
Richard van der Hoff	6841d8ff55	Fix doc-string ... Remove refresh_token reference	8 years ago
Richard van der Hoff	12f3b9000c	fix imports	8 years ago
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.	8 years ago
Richard van der Hoff	dc4b23e1a1	Merge branch 'develop' into rav/no_more_refresh_tokens	8 years ago