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 |
|
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 |
|
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 |
|
Erik Johnston
|
35332298ef
|
Fix up comments
|
2017-10-13 10:39:32 +01:00 |
|
Erik Johnston
|
64db043a71
|
Move makedirs to thread
|
2017-10-13 10:25:01 +01:00 |
|
Erik Johnston
|
b60859d6cc
|
Use make_deferred_yieldable
|
2017-10-13 10:24:19 +01:00 |
|
Erik Johnston
|
d76621a47b
|
Fix comments
|
2017-10-12 18:16:25 +01:00 |
|
Erik Johnston
|
4ae85ae121
|
Don't close prematurely..
|
2017-10-12 17:57:31 +01:00 |
|
Erik Johnston
|
cc505b4b5e
|
getvalue closes buffer
|
2017-10-12 17:52:30 +01:00 |
|
Erik Johnston
|
1259a76047
|
Get len before close
|
2017-10-12 17:39:23 +01:00 |
|
Erik Johnston
|
802ca12d05
|
Don't close file prematurely
|
2017-10-12 17:37:21 +01:00 |
|
Erik Johnston
|
e283b555b1
|
Copy everything to backup
|
2017-10-12 17:31:24 +01:00 |
|
Erik Johnston
|
b77a13812c
|
Typo
|
2017-10-12 15:32:32 +01:00 |
|
Erik Johnston
|
6dfde6d485
|
Remove dead code
|
2017-10-12 15:30:26 +01:00 |
|
Erik Johnston
|
c8eeef6947
|
Fix typos
|
2017-10-12 15:28:24 +01:00 |
|
Erik Johnston
|
67cb89fbdf
|
Fix typo
|
2017-10-12 15:23:41 +01:00 |
|
Erik Johnston
|
bf4fb1fb40
|
Basic implementation of backup media store
|
2017-10-12 15:20:59 +01:00 |
|
hera
|
f807f7f804
|
log when we get an exception handling replication updates
|
2017-10-12 11:51:24 +01:00 |
|
David Baker
|
b8d8ed1ba9
|
Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages
Allow error strings from spam checker
|
2017-10-12 10:31:03 +01:00 |