9442 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	f4f65ef93e	Merge pull request #2557 from matrix-org/erikj/media_tumbnails ... Fix typo in thumbnail generation	2017-10-19 10:38:52 +01:00
Erik Johnston	bd5718d0ad	Fix typo in thumbnail generation	2017-10-19 10:27:18 +01:00
Erik Johnston	161a862ffb	Fix typo	2017-10-19 10:17:43 +01:00
Richard van der Hoff	69994c385a	Merge pull request #2553 from matrix-org/rav/fix_500_on_event_send ... Fix 500 error when we get an error handling a PDU	2017-10-18 11:25:44 +01:00
Richard van der Hoff	b5dbbac308	Merge pull request #2552 from matrix-org/rav/fix_500_on_dodgy_powerlevels ... Fix 500 error when fields missing from power_levels event	2017-10-17 20:53:30 +01:00
Richard van der Hoff	582bd19ee9	Fix 500 error when we get an error handling a PDU ... FederationServer doesn't have a send_failure (and nor does its subclass, ReplicationLayer), so this was failing. I'm not really sure what the idea behind send_failure is, given (a) we don't do anything at the other end with it except log it, and (b) we also send back the failure via the transaction response. I suspect there's a whole lot of dead code around it, but for now I'm just removing the broken bit.	2017-10-17 20:52:40 +01:00
Richard van der Hoff	74f99f227c	Doc some more dynamic Homeserver methods	2017-10-17 20:51:29 +01:00
Richard van der Hoff	c2bd177ea0	Fix 500 error when fields missing from power_levels event ... If the users or events keys were missing from a power_levels event, then we would throw 500s when trying to auth them.	2017-10-17 17:05:42 +01:00
Erik Johnston	fe6e9f580b	Merge pull request #2550 from krombel/fix_thumbnail_2548 ... fix thumbnailing (#2548)	2017-10-17 15:35:18 +01:00
Richard van der Hoff	7216c76654	Improve error handling for missing files (#2551) ... `os.path.exists` doesn't allow us to distinguish between permissions errors and the path actually not existing, which repeatedly confuses people. It also means that we try to overwrite existing key files, which is super-confusing. (cf issues #2455, #2379). Use os.stat instead. Also, don't recomemnd the the use of --generate-config, which screws everything up if you're using debian (cf #2455).	2017-10-17 14:46:17 +01:00
Richard van der Hoff	dbdfd8967d	Merge pull request #2546 from matrix-org/rav/remove_dead_event_injector ... Remove dead class	2017-10-17 13:21:22 +01:00
Richard van der Hoff	b8e40d146f	Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldable ... Add some tests for make_deferred_yieldable	2017-10-17 13:21:09 +01:00
Richard van der Hoff	4cc8bb0767	Merge pull request #2549 from matrix-org/rav/event_persist_logcontexts ... Fix logcontext handling for persist_events	2017-10-17 13:20:35 +01:00
David Baker	4e242b3e20	Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms ... Add config option to auto-join new users to rooms	2017-10-17 11:45:49 +01:00
Krombel	a6245478c8	fix thumbnailing (#2548) ... in commit 0e28281a the code for thumbnailing got refactored and the renaming of this variables was not done correctly. Signed-Off-by: Matthias Kesler <krombel@krombel.de>	2017-10-17 12:45:33 +02:00
Richard van der Hoff	2e9f5ea31a	Fix logcontext handling for persist_events ... * don't use preserve_context_over_deferred, which is known broken. * remove a redundant preserve_fn. * add/improve some comments	2017-10-17 10:59:30 +01:00
Richard van der Hoff	a6ad8148b9	Fix name of test_logcontext ... The file under test is logcontext.py, not log_context.py	2017-10-17 10:53:34 +01:00
Richard van der Hoff	5b5f35ccc0	Add some tests for make_deferred_yieldable	2017-10-17 10:52:31 +01:00
Richard van der Hoff	9b714abf35	Remove dead class ... This isn't used anywhere.	2017-10-17 10:43:36 +01:00
David Baker	33122c5a1b	Fix test	2017-10-17 10:39:50 +01:00
David Baker	a9c2e930ac	pep8	2017-10-17 10:13:13 +01:00
David Baker	c05e6015cc	Add config option to auto-join new users to rooms ... New users who register on the server will be dumped into all rooms in auto_join_rooms in the config.	2017-10-16 17:57:27 +01:00
Luke Barnard	e0a75e0c25	Merge pull request #2544 from matrix-org/luke/groups-invited-users ... Implement GET /groups/$groupId/invited_users	2017-10-16 17:33:33 +02:00
Luke Barnard	85f5674e44	Delint	2017-10-16 15:52:17 +01:00
Luke Barnard	c43e8a9736	Make it work. Warn about lack of user profile	2017-10-16 15:50:39 +01:00
Luke Barnard	a3ac4f6b0a	_create_rererouter for get_invited_users_in_group	2017-10-16 15:41:03 +01:00
Luke Barnard	5dfd0350c7	Merge branch 'develop' into luke/groups-invited-users	2017-10-16 15:34:36 +01:00
Luke Barnard	ca96d609e4	Merge pull request #2543 from matrix-org/luke/fix-on-group-invite-no-profile ... Log a warning when no profile for invited member	2017-10-16 16:33:53 +02:00
Luke Barnard	2c5972f87f	Implement GET /groups/$groupId/invited_users	2017-10-16 15:31:11 +01:00
Luke Barnard	6079d0027a	Log a warning when no profile for invited member ... And return empty profile	2017-10-16 14:20:45 +01:00
David Baker	99a6c9dbf2	Merge pull request #2542 from matrix-org/dbkr/room_notif_no_glob ... Omit the *s for @room notifications	2017-10-16 13:46:17 +01:00
David Baker	9342bcfce0	Omit the *s for @room notifications ... They're just redundant	2017-10-16 13:38:10 +01:00
Erik Johnston	db3d84f46c	Merge pull request #2538 from matrix-org/erikj/media_backup ... Basic implementation of backup media store	2017-10-13 16:11:31 +01:00
Erik Johnston	1b6b0b1e66	Add try/finally block to close t_byte_source	2017-10-13 15:34:08 +01:00
Erik Johnston	6b725cf56a	Remove old comment	2017-10-13 15:23:41 +01:00
Matthew Hodgson	64665b57d0	oops	2017-10-13 14:26:07 +01:00
Erik Johnston	2b24416e90	Don't reuse source but instead copy from primary media store to backup	2017-10-13 14:11:34 +01:00
Erik Johnston	b92a8e6e4a	PEP8	2017-10-13 13:58:57 +01:00
Matthew Hodgson	931fc43cc8	fix copyright to companies which actually exist(ed)	2017-10-13 13:54:31 +01:00
Erik Johnston	31aa7bd8d1	Move type into key	2017-10-13 13:47:38 +01:00
Erik Johnston	ad1911bbf4	Comment	2017-10-13 13:47:05 +01:00
Erik Johnston	c021c39cbd	Remove spurious addition	2017-10-13 13:46:53 +01:00
Erik Johnston	1f43d22397	Don't needlessly rename variable	2017-10-13 11:42:07 +01:00
Erik Johnston	a675bd08bd	Add paths back in...	2017-10-13 11:41:06 +01:00
Erik Johnston	4d7e1dde70	Remove unnecessary diff	2017-10-13 11:36:32 +01:00
Erik Johnston	ae5d18617a	Make things be absolute paths again	2017-10-13 11:35:44 +01:00
Erik Johnston	9732ec6797	s/write_to_file/write_to_file_and_backup/	2017-10-13 11:34:41 +01:00
Erik Johnston	0e28281a02	Fix up	2017-10-13 11:33:49 +01:00
Erik Johnston	505371414f	Fix up thumbnailing function	2017-10-13 11:23:53 +01:00
Erik Johnston	e3428d26ca	Fix typo	2017-10-13 10:39:59 +01:00