| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow = in mxids and groupids | Richard van der Hoff | 2017-10-20 | 3 | -5/+4 |
| | | | | | ... because the spec says we should. | ||||
| * | Disallow capital letters in userids | Richard van der Hoff | 2017-10-20 | 3 | -16/+25 |
| | | | | | | Factor out a common function for checking user ids and group ids, which forbids capitals. | ||||
| * | Merge pull request #2559 from matrix-org/erikj/group_id_validation | Erik Johnston | 2017-10-19 | 3 | -3/+46 |
| |\ | | | | | Add config to enable group creation | ||||
| | * | Flake8 | Erik Johnston | 2017-10-19 | 2 | -6/+4 |
| | | | |||||
| | * | Add missing file... | Erik Johnston | 2017-10-19 | 1 | -0/+36 |
| | | | |||||
| | * | Add config to enable group creation | Erik Johnston | 2017-10-19 | 2 | -3/+12 |
| | | | |||||
| * | | Merge pull request #2558 from matrix-org/erikj/group_id_validation | Erik Johnston | 2017-10-19 | 1 | -1/+19 |
| |\| | | | | | Enforce sensible group IDs | ||||
| | * | Enforce sensible group IDs | Erik Johnston | 2017-10-19 | 1 | -1/+19 |
| |/ | |||||
| * | Fix typo | Erik Johnston | 2017-10-19 | 1 | -1/+1 |
| | | |||||
| * | Fix typo in group attestation handling | Erik Johnston | 2017-10-19 | 2 | -2/+3 |
| | | |||||
| * | Merge pull request #2557 from matrix-org/erikj/media_tumbnails | Erik Johnston | 2017-10-19 | 1 | -2/+5 |
| |\ | | | | | Fix typo in thumbnail generation | ||||
| | * | Fix typo in thumbnail generation | Erik Johnston | 2017-10-19 | 1 | -2/+5 |
| |/ | |||||
| * | Fix typo | Erik Johnston | 2017-10-19 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #2553 from matrix-org/rav/fix_500_on_event_send | Richard van der Hoff | 2017-10-18 | 1 | -1/+0 |
| |\ | | | | | Fix 500 error when we get an error handling a PDU | ||||
| | * | Fix 500 error when we get an error handling a PDU | Richard van der Hoff | 2017-10-17 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Merge pull request #2552 from matrix-org/rav/fix_500_on_dodgy_powerlevels | Richard van der Hoff | 2017-10-17 | 1 | -3/+3 |
| |\ \ | |/ |/| | Fix 500 error when fields missing from power_levels event | ||||
| | * | Fix 500 error when fields missing from power_levels event | Richard van der Hoff | 2017-10-17 | 1 | -3/+3 |
| | | | | | | | | | | | If the users or events keys were missing from a power_levels event, then we would throw 500s when trying to auth them. | ||||
| * | | Doc some more dynamic Homeserver methods | Richard van der Hoff | 2017-10-17 | 1 | -0/+8 |
| | | | |||||
| * | | Merge pull request #2550 from krombel/fix_thumbnail_2548 | Erik Johnston | 2017-10-17 | 1 | -2/+2 |
| |\ \ | |/ |/| | fix thumbnailing (#2548) | ||||
| | * | fix thumbnailing (#2548) | Krombel | 2017-10-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | 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> | ||||
| * | | Improve error handling for missing files (#2551) | Richard van der Hoff | 2017-10-17 | 3 | -17/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | `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). | ||||
| * | | Merge pull request #2546 from matrix-org/rav/remove_dead_event_injector | Richard van der Hoff | 2017-10-17 | 1 | -76/+0 |
| |\ \ | | | | | | | Remove dead class | ||||
| | * | | Remove dead class | Richard van der Hoff | 2017-10-17 | 1 | -76/+0 |
| | |/ | | | | | | | This isn't used anywhere. | ||||
| * | | Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldable | Richard van der Hoff | 2017-10-17 | 1 | -0/+38 |
| |\ \ | | | | | | | Add some tests for make_deferred_yieldable | ||||
| | * | | Fix name of test_logcontext | Richard van der Hoff | 2017-10-17 | 1 | -0/+0 |
| | | | | | | | | | | | | | The file under test is logcontext.py, not log_context.py | ||||
| | * | | Add some tests for make_deferred_yieldable | Richard van der Hoff | 2017-10-17 | 1 | -0/+38 |
| | |/ | |||||
| * | | Merge pull request #2549 from matrix-org/rav/event_persist_logcontexts | Richard van der Hoff | 2017-10-17 | 2 | -7/+22 |
| |\ \ | | | | | | | Fix logcontext handling for persist_events | ||||
| | * | | Fix logcontext handling for persist_events | Richard van der Hoff | 2017-10-17 | 2 | -7/+22 |
| | |/ | | | | | | | | | | | | | | | * don't use preserve_context_over_deferred, which is known broken. * remove a redundant preserve_fn. * add/improve some comments | ||||
| * | | Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms | David Baker | 2017-10-17 | 3 | -0/+42 |
| |\ \ | |/ |/| | Add config option to auto-join new users to rooms | ||||
| | * | Fix test | David Baker | 2017-10-17 | 1 | -0/+1 |
| | | | |||||
| | * | pep8 | David Baker | 2017-10-17 | 1 | -1/+2 |
| | | | |||||
| | * | Add config option to auto-join new users to rooms | David Baker | 2017-10-16 | 2 | -0/+40 |
| | | | | | | | | | | | New users who register on the server will be dumped into all rooms in auto_join_rooms in the config. | ||||
| * | | Merge pull request #2544 from matrix-org/luke/groups-invited-users | Luke Barnard | 2017-10-16 | 6 | -1/+102 |
| |\ \ | | | | | | | Implement GET /groups/$groupId/invited_users | ||||
| | * | | Delint | Luke Barnard | 2017-10-16 | 3 | -1/+3 |
| | | | | |||||
| | * | | Make it work. Warn about lack of user profile | Luke Barnard | 2017-10-16 | 1 | -2/+2 |
| | | | | |||||
| | * | | _create_rererouter for get_invited_users_in_group | Luke Barnard | 2017-10-16 | 1 | -17/+2 |
| | | | | |||||
| | * | | Merge branch 'develop' into luke/groups-invited-users | Luke Barnard | 2017-10-16 | 1 | -1/+1 |
| | |\ \ | |/ / |/| | | |||||
| * | | | Merge pull request #2543 from matrix-org/luke/fix-on-group-invite-no-profile | Luke Barnard | 2017-10-16 | 1 | -2/+5 |
| |\ \ \ | |_|/ |/| | | Log a warning when no profile for invited member | ||||
| * | | | Merge pull request #2542 from matrix-org/dbkr/room_notif_no_glob | David Baker | 2017-10-16 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Omit the *s for @room notifications | ||||
| | * | | | Omit the *s for @room notifications | David Baker | 2017-10-16 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | They're just redundant | ||||
| | | * | Implement GET /groups/$groupId/invited_users | Luke Barnard | 2017-10-16 | 6 | -1/+115 |
| | |/ | |||||
| | * | Log a warning when no profile for invited member | Luke Barnard | 2017-10-16 | 1 | -2/+5 |
| |/ | | | | And return empty profile | ||||
| * | Merge pull request #2538 from matrix-org/erikj/media_backup | Erik Johnston | 2017-10-13 | 6 | -200/+309 |
| |\ | | | | | Basic implementation of backup media store | ||||
| | * | Add try/finally block to close t_byte_source | Erik Johnston | 2017-10-13 | 1 | -24/+41 |
| | | | |||||
| | * | Remove old comment | Erik Johnston | 2017-10-13 | 1 | -1/+0 |
| | | | |||||
| | * | Don't reuse source but instead copy from primary media store to backup | Erik Johnston | 2017-10-13 | 2 | -22/+9 |
| | | | |||||
| | * | PEP8 | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
| | | | |||||
| | * | Move type into key | Erik Johnston | 2017-10-13 | 1 | -3/+3 |
| | | | |||||
| | * | Comment | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
| | | | |||||
| | * | Remove spurious addition | Erik Johnston | 2017-10-13 | 1 | -4/+0 |
| | | | |||||
| | * | Don't needlessly rename variable | Erik Johnston | 2017-10-13 | 1 | -13/+13 |
| | | | |||||
| | * | Add paths back in... | Erik Johnston | 2017-10-13 | 1 | -4/+4 |
| | | | |||||
| | * | Remove unnecessary diff | Erik Johnston | 2017-10-13 | 1 | -3/+1 |
| | | | |||||
| | * | Make things be absolute paths again | Erik Johnston | 2017-10-13 | 1 | -7/+7 |
| | | | |||||
| | * | s/write_to_file/write_to_file_and_backup/ | Erik Johnston | 2017-10-13 | 1 | -5/+5 |
| | | | |||||
| | * | Fix up | Erik Johnston | 2017-10-13 | 2 | -43/+32 |
| | | | |||||
| | * | Fix up thumbnailing function | Erik Johnston | 2017-10-13 | 3 | -75/+73 |
| | | | |||||
| | * | Fix typo | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
| | | | |||||
| | * | Fix up comments | Erik Johnston | 2017-10-13 | 1 | -2/+26 |
| | | | |||||
| | * | Move makedirs to thread | Erik Johnston | 2017-10-13 | 1 | -2/+1 |
| | | | |||||
| | * | Use make_deferred_yieldable | Erik Johnston | 2017-10-13 | 1 | -7/+7 |
| | | | |||||
| | * | Fix comments | Erik Johnston | 2017-10-12 | 2 | -1/+4 |
| | | | |||||
| | * | Don't close prematurely.. | Erik Johnston | 2017-10-12 | 1 | -2/+5 |
| | | | |||||
| | * | getvalue closes buffer | Erik Johnston | 2017-10-12 | 1 | -11/+10 |
| | | | |||||
| | * | Get len before close | Erik Johnston | 2017-10-12 | 1 | -6/+11 |
| | | | |||||
| | * | Don't close file prematurely | Erik Johnston | 2017-10-12 | 2 | -8/+18 |
| | | | |||||
| | * | Copy everything to backup | Erik Johnston | 2017-10-12 | 5 | -77/+151 |
| | | | |||||
| | * | Typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 |
| | | | |||||
| | * | Remove dead code | Erik Johnston | 2017-10-12 | 1 | -3/+0 |
| | | | |||||
| | * | Fix typos | Erik Johnston | 2017-10-12 | 1 | -20/+26 |
| | | | |||||
| | * | Fix typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 |
| | | | |||||
| | * | Basic implementation of backup media store | Erik Johnston | 2017-10-12 | 4 | -126/+131 |
| | | | |||||
| * | | oops | Matthew Hodgson | 2017-10-13 | 1 | -1/+1 |
| | | | |||||
| * | | fix copyright to companies which actually exist(ed) | Matthew Hodgson | 2017-10-13 | 1 | -1/+1 |
| |/ | |||||
| * | log when we get an exception handling replication updates | hera | 2017-10-12 | 1 | -1/+5 |
| | | |||||
| * | Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages | David Baker | 2017-10-12 | 1 | -2/+6 |
| |\ | | | | | Allow error strings from spam checker | ||||
| | * | fix isinstance | David Baker | 2017-10-11 | 1 | -1/+1 |
| | | | |||||
| | * | Allow error strings from spam checker | David Baker | 2017-10-11 | 1 | -2/+6 |
| | | | |||||
| * | | Merge pull request #2532 from matrix-org/rav/fix_linearizer | Richard van der Hoff | 2017-10-11 | 2 | -6/+46 |
| |\ \ | | | | | | | Fix stackoverflow and logcontexts from linearizer | ||||
| | * | | Fix stackoverflow and logcontexts from linearizer | Richard van der Hoff | 2017-10-11 | 2 | -6/+46 |
| | | | | | | | | | | | | | | | | | | | | | | 1. make it not blow out the stack when there are more than 50 things waiting for a lock. Fixes https://github.com/matrix-org/synapse/issues/2505. 2. Make it not mess up the log contexts. | ||||
| * | | | Merge pull request #2529 from matrix-org/rav/fix_transaction_failure_handling | Richard van der Hoff | 2017-10-11 | 1 | -2/+3 |
| |\ \ \ | | | | | | | | | log pdu_failures from incoming transactions | ||||
| | * | | | log pdu_failures from incoming transactions | Richard van der Hoff | 2017-10-11 | 1 | -2/+3 |
| | |/ / | | | | | | | | | | | | | | | | | | | ... even if we have no EDUs. This appears to have been introduced in 476899295f5fd6cff64799bcbc84cd4bf9005e33. | ||||
| * | | | Merge pull request #2515 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+51 |
| |\ \ \ | | | | | | | | | | | | | | | | | A logformatter which includes the stack when the exception was caught when logging exceptions. | ||||
| | * | | | logformatter: fix AttributeError | Richard van der Hoff | 2017-10-11 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | make sure we have the relevant fields before we try to log them. | ||||
| | * | | | Fancy logformatter to format exceptions better | Richard van der Hoff | 2017-10-09 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit of an experimental change at this point; the idea is to see if it helps us track down where our stack overflows are coming from by logging the stack when the exception was caught and turned into a Failure. (We'll also need https://github.com/richvdh/twisted/commit/edf27044200e74680ea67c525768e36dc9d9af2b). If we deploy this, we'll be able to enable it via the log config yaml. | ||||
| * | | | | Fix fetching remote summaries | Erik Johnston | 2017-10-11 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #2533 from matrix-org/erikj/fix_group_repl | Erik Johnston | 2017-10-11 | 1 | -7/+7 |
| |\ \ \ \ | | | | | | | | | | | Fix group stream replication | ||||
| | * | | | | peeeeeeeeep8888888888888888888888888888 | Erik Johnston | 2017-10-11 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix group stream replication | Erik Johnston | 2017-10-11 | 1 | -7/+7 |
| |/ / / / | | | | | | | | | | | | | | | | | The stream update functions expect the storage function to return a list of tuples. | ||||
| * | | | | Merge pull request #2530 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
| |\ \ \ \ | | | | | | | | | | | fix a logcontext leak in read receipt handling | ||||
| | * | | | | fix a logcontext leak in read receipt handling | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
| | | |/ / | |/| | | |||||
| * | | | | Fix typo in invite to group | Erik Johnston | 2017-10-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix typo | Erik Johnston | 2017-10-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix attestations to check correct server name | Erik Johnston | 2017-10-11 | 1 | -10/+20 |
| | |_|/ |/| | | |||||
| * | | | Fix schema delta versions | Erik Johnston | 2017-10-11 | 3 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 35 | -66/+4793 |
| |\ \ \ | | | | | | | | | Initial Group Implementation | ||||
| | * | | | Validate room ids | Erik Johnston | 2017-10-11 | 1 | -1/+5 |
| | | | | | |||||
| | * | | | Don't corrupt cache | Erik Johnston | 2017-10-05 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 31 | -299/+1177 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge pull request #2472 from matrix-org/erikj/groups_rooms | Erik Johnston | 2017-09-26 | 7 | -4/+73 |
| | |\ \ \ \ | | | | | | | | | | | | | Add remove room from group API | ||||
| | | * | | | | Add remove room API | Erik Johnston | 2017-09-26 | 6 | -1/+72 |
| | | | | | | | |||||
| | | * | | | | Add unique index to group_rooms table | Erik Johnston | 2017-09-26 | 2 | -3/+1 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #2471 from matrix-org/erikj/group_summary_publicised | Erik Johnston | 2017-09-26 | 1 | -25/+31 |
| | |\ \ \ \ | | | | | | | | | | | | | Add is_publicised to group summary | ||||
| | | * | | | | Add is_publicised to group summary | Erik Johnston | 2017-09-26 | 1 | -25/+31 |
| | |/ / / / | |||||
| | * | | | | Remove user from group summary when the leave the group | Erik Johnston | 2017-09-21 | 1 | -0/+8 |
| | | | | | | |||||
| | * | | | | Revert: Keep room_id's in group summary | Erik Johnston | 2017-09-21 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Keep room_id's in group summary | Erik Johnston | 2017-09-21 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Correctly return next token | Erik Johnston | 2017-09-20 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Fix initial sync | Erik Johnston | 2017-09-20 | 1 | -1/+9 |
| | | | | | | |||||
| | * | | | | Merge pull request #2454 from matrix-org/erikj/groups_sync_creator | Erik Johnston | 2017-09-19 | 2 | -4/+31 |
| | |\ \ \ \ | | | | | | | | | | | | | Ensure that creator of group sees group down /sync | ||||
| | | * | | | | Ensure that creator of group sees group down /sync | Erik Johnston | 2017-09-19 | 2 | -4/+31 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 39 | -592/+1313 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #2430 from matrix-org/erikj/groups_profile_cache | Erik Johnston | 2017-08-25 | 3 | -2/+30 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add user profiles to summary from group server | ||||
| | | * | | | | | Add user profiles to summary from group server | Erik Johnston | 2017-08-25 | 3 | -2/+30 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #2429 from matrix-org/erikj/groups_profile_cache | Erik Johnston | 2017-08-25 | 15 | -47/+292 |
| | |\| | | | | | | | | | | | | | | | | | | | Add a remote user profile cache | ||||
| | | * | | | | | Fix typos and reinherit | Erik Johnston | 2017-08-25 | 1 | -12/+6 |
| | | | | | | | | |||||
| | | * | | | | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 11 | -29/+35 |
| | | | | | | | | |||||
| | | * | | | | | Add remote profile cache | Erik Johnston | 2017-08-25 | 5 | -5/+237 |
| | | | | | | | | |||||
| | | * | | | | | Add _simple_update | Erik Johnston | 2017-08-25 | 1 | -19/+32 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #2410 from matrix-org/erikj/groups_publicise | Erik Johnston | 2017-08-21 | 6 | -0/+197 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add ability to publicise group membership | ||||
| | | * | | | | | Use BOOLEAN rather than TEXT type | Erik Johnston | 2017-08-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Fixup | Erik Johnston | 2017-08-11 | 2 | -9/+14 |
| | | | | | | | | |||||
| | | * | | | | | Add bulk group publicised lookup API | Erik Johnston | 2017-08-09 | 5 | -0/+142 |
| | | | | | | | | |||||
| | | * | | | | | Allow update group publicity | Erik Johnston | 2017-08-08 | 2 | -0/+43 |
| | | | | | | | | |||||
| | | * | | | | | Store whether the user wants to publicise their membership of a group | Erik Johnston | 2017-08-08 | 3 | -0/+7 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #2426 from matrix-org/erikj/groups_fix_sync | Erik Johnston | 2017-08-21 | 1 | -1/+7 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Groups: Fix mising json.load in initial sync | ||||
| | | * | | | | | Groups: Fix mising json.load in initial sync | Erik Johnston | 2017-08-21 | 1 | -1/+7 |
| | |/ / / / / | |||||
| | * | | | | | Remove stale TODO comments | Erik Johnston | 2017-08-04 | 1 | -10/+0 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #2382 from matrix-org/erikj/group_privilege | Erik Johnston | 2017-07-24 | 2 | -1/+85 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Include users membership in group in summary API | ||||
| | | * | | | | | Update comment | Erik Johnston | 2017-07-24 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Use join rather than joined, etc. | Erik Johnston | 2017-07-24 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Fix all the typos | Erik Johnston | 2017-07-24 | 1 | -8/+7 |
| | | | | | | | | |||||
| | | * | | | | | Include users membership in group in summary API | Erik Johnston | 2017-07-24 | 2 | -0/+60 |
| | | | | | | | | |||||
| | | * | | | | | Check users/rooms are in group before adding to summary | Erik Johnston | 2017-07-24 | 1 | -0/+25 |
| | |/ / / / / | |||||
| | * | | | | | Correctly add joins to correct segment | Erik Johnston | 2017-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #2378 from matrix-org/erikj/group_sync_support | Erik Johnston | 2017-07-21 | 12 | -12/+283 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add groups to sync stream | ||||
| | | * | | | | | Add notifier | Erik Johnston | 2017-07-20 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | * | | | | | Fix replication. And notify | Erik Johnston | 2017-07-20 | 5 | -4/+119 |
| | | | | | | | | |||||
| | | * | | | | | Remember to cast to bool | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Fix bug in generating current token | Erik Johnston | 2017-07-20 | 1 | -0/+2 |
| | | | | | | | | |||||
| | | * | | | | | Add groups to sync stream | Erik Johnston | 2017-07-20 | 8 | -8/+161 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #2377 from matrix-org/erikj/group_profile_update | Erik Johnston | 2017-07-20 | 5 | -0/+55 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Add update group profile API | ||||
| | | * | | | | | Remove spurious content param | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Check values are strings | Erik Johnston | 2017-07-20 | 1 | -1/+4 |
| | | | | | | | | |||||
| | | * | | | | | Fix a storage desc | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Add update group profile API | Erik Johnston | 2017-07-20 | 5 | -0/+52 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #2374 from matrix-org/erikj/group_server_local | Erik Johnston | 2017-07-20 | 11 | -34/+1457 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add local group server support | ||||
| | | * | | | | | | Fix typo | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | |/ / / / / | |||||
| | | * | | | | | Comments | Erik Johnston | 2017-07-18 | 4 | -13/+24 |
| | | | | | | | | |||||
| | | * | | | | | Comments | Erik Johnston | 2017-07-18 | 2 | -103/+88 |
| | | | | | | | | |||||
| | | * | | | | | Fix permissions | Erik Johnston | 2017-07-18 | 1 | -2/+6 |
| | | | | | | | | |||||
| | | * | | | | | Add DELETE | Erik Johnston | 2017-07-18 | 1 | -0/+46 |
| | | | | | | | | |||||
| | | * | | | | | Add 'args' param to post_json | Erik Johnston | 2017-07-18 | 1 | -9/+15 |
| | | | | | | | | |||||
| | | * | | | | | Fix typos | Erik Johnston | 2017-07-18 | 3 | -12/+22 |
| | | | | | | | | |||||
| | | * | | | | | Correctly parse query params | Erik Johnston | 2017-07-18 | 1 | -19/+19 |
| | | | | | | | | |||||
| | | * | | | | | Update federation client pokes | Erik Johnston | 2017-07-18 | 1 | -13/+22 |
| | | | | | | | | |||||
| | | * | | | | | Add client apis | Erik Johnston | 2017-07-18 | 2 | -10/+188 |
| | | | | | | | | |||||
| | | * | | | | | Comments | Erik Johnston | 2017-07-18 | 2 | -15/+22 |
| | | | | | | | | |||||
| | | * | | | | | Use transport client directly | Erik Johnston | 2017-07-18 | 1 | -18/+25 |
| | | | | | | | | |||||
| | | * | | | | | Comment | Erik Johnston | 2017-07-18 | 1 | -0/+14 |
| | | | | | | | | |||||
| | | * | | | | | Remove sync stuff | Erik Johnston | 2017-07-18 | 2 | -29/+1 |
| | | | | | | | | |||||
| | | * | | | | | Add GroupID type | Erik Johnston | 2017-07-18 | 1 | -0/+5 |
| | | | | | | | | |||||
| | | * | | | | | Remove unused tables | Erik Johnston | 2017-07-18 | 1 | -7/+0 |
| | | | | | | | | |||||
| | | * | | | | | Remove sync stuff | Erik Johnston | 2017-07-18 | 2 | -70/+0 |
| | | | | | | | | |||||
| | | * | | | | | Add local group server support | Erik Johnston | 2017-07-17 | 10 | -2/+1248 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #2363 from matrix-org/erikj/group_server_summary | Erik Johnston | 2017-07-17 | 4 | -22/+1131 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add group summary APIs | ||||
| | | * | | | | | Ensure category and role ids are non-null | Erik Johnston | 2017-07-14 | 1 | -0/+24 |
| | | | | | | | | |||||
| | | * | | | | | Add DEFAULT_ROLE_ID | Erik Johnston | 2017-07-14 | 1 | -4/+5 |
| | | | | | | | | |||||
| | | * | | | | | Correctly increment orders | Erik Johnston | 2017-07-14 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Remove unused functions | Erik Johnston | 2017-07-13 | 1 | -152/+0 |
| | | | | | | | | |||||
| | | * | | | | | Comments | Erik Johnston | 2017-07-13 | 2 | -12/+32 |
| | | | | | | | | |||||
| | | * | | | | | Remove TODO | Erik Johnston | 2017-07-13 | 1 | -1/+0 |
| | | | | | | | | |||||
| | | * | | | | | Add summary APIs to federation | Erik Johnston | 2017-07-13 | 1 | -11/+223 |
| | | | | | | | | |||||
| | | * | | | | | raise NotImplementedError | Erik Johnston | 2017-07-13 | 1 | -5/+2 |
| | | | | | | | | |||||
| | | * | | | | | Comments | Erik Johnston | 2017-07-12 | 3 | -5/+79 |
| | | | | | | | | |||||
| | | * | | | | | Simplify checking if admin | Erik Johnston | 2017-07-12 | 1 | -53/+19 |
| | | | | | | | | |||||
| | | * | | | | | Add group summary APIs | Erik Johnston | 2017-07-12 | 4 | -2/+970 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #2352 from matrix-org/erikj/group_server_split | Erik Johnston | 2017-07-12 | 11 | -11/+1206 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Initial Group Server | ||||
| | | * | | | | | Comment | Erik Johnston | 2017-07-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Move comment | Erik Johnston | 2017-07-11 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Add federation API for adding room to group | Erik Johnston | 2017-07-11 | 1 | -0/+18 |
| | | | | | | | | |||||
| | | * | | | | | Comment | Erik Johnston | 2017-07-11 | 1 | -5/+8 |
| | | | | | | | | |||||
| | | * | | | | | Typo | Erik Johnston | 2017-07-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Rename column to attestation_json | Erik Johnston | 2017-07-11 | 2 | -5/+5 |
| | | | | | | | | |||||
| | | * | | | | | Comments | Erik Johnston | 2017-07-11 | 3 | -5/+9 |
| | | | | | | | | |||||
| | | * | | | | | Comment | Erik Johnston | 2017-07-11 | 2 | -0/+26 |
| | | | | | | | | |||||
| | | * | | | | | Remove u/ requirement | Erik Johnston | 2017-07-11 | 1 | -2/+3 |
| | | | | | | | | |||||
| | | * | | | | | Lift out visibility parsing | Erik Johnston | 2017-07-11 | 1 | -20/+21 |
| | | | | | | | | |||||
| | | * | | | | | Comments | Erik Johnston | 2017-07-11 | 4 | -43/+132 |
| | | | | | | | | |||||
| | | * | | | | | Initial group server implementation | Erik Johnston | 2017-07-10 | 11 | -11/+1064 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2501 from matrix-org/dbkr/channel_notifications | Erik Johnston | 2017-10-11 | 3 | -7/+85 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Support for channel notifications | ||||
| | * | | | | | | | pep8 | David Baker | 2017-10-10 | 2 | -3/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Don't KeyError if no power_levels event | David Baker | 2017-10-10 | 1 | -1/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Use notification levels in power_levels | David Baker | 2017-10-10 | 3 | -12/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than making the condition directly require a specific power level. This way the level require to notify a room can be configured per room. | ||||
| | * | | | | | | | There was already a constant for this | David Baker | 2017-10-10 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also update copyright | ||||
| | * | | | | | | | More optimisation | David Baker | 2017-10-10 | 1 | -6/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | What year is it!? Who's the president!? | David Baker | 2017-10-10 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' into dbkr/channel_notifications | David Baker | 2017-10-10 | 7 | -107/+183 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Make be faster | David Baker | 2017-10-05 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add fastpath optimisation | David Baker | 2017-10-05 | 1 | -3/+9 |
| | | | | | | | | | | |||||
| | * | | | | | | | | pep8 | David Baker | 2017-10-05 | 1 | -0/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | They're called rooms | David Baker | 2017-10-05 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Get rule type right | David Baker | 2017-10-05 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Support for channel notifications | David Baker | 2017-10-05 | 3 | -8/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add condition type to check the sender's power level and add a base rule using it for @channel notifications. | ||||
| * | | | | | | | | | Merge pull request #2483 from jeremycline/unfreeze-ujson-dump | Erik Johnston | 2017-10-11 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Unfreeze event before serializing with ujson | ||||
| | * | | | | | | | | | Unfreeze event before serializing with ujson | Jeremy Cline | 2017-09-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In newer versions of https://github.com/esnme/ultrajson, ujson does not serialize frozendicts (introduced in esnme/ultrajson@53f85b1). Although the PyPI version is still 1.35, Fedora ships with a build from commit esnme/ultrajson@2f1d487. This causes the serialization to fail if the distribution-provided package is used. This runs the event through the unfreeze utility before serializing it. Thanks to @ignatenkobrain for tracking down the root cause. fixes #2351 Signed-off-by: Jeremy Cline <jeremy@jcline.org> | ||||
| * | | | | | | | | | | Merge pull request #2490 from matrix-org/erikj/drop_left_room_events | Erik Johnston | 2017-10-10 | 3 | -0/+65 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | Ignore incoming events for rooms that we have left | ||||
| | * | | | | | | | | | Fix up comment | Erik Johnston | 2017-10-09 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Invalidate cache | Erik Johnston | 2017-10-03 | 1 | -0/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update comments | Erik Johnston | 2017-10-03 | 2 | -1/+8 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Remove spurious line feed | Erik Johnston | 2017-10-03 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Ignore incoming events for rooms that we have left | Erik Johnston | 2017-10-03 | 2 | -0/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When synapse receives an event for a room its not in over federation, it double checks with the remote server to see if it is in fact in the room. This is done so that if the server has forgotten about the room (usually as a result of the database being dropped) it can recover from it. However, in the presence of state resets in large rooms, this can cause a lot of work for servers that have legitimately left. As a hacky solution that supports both cases we drop incoming events for rooms that we have explicitly left. This means that we no longer support the case of servers having forgotten that they've rejoined a room, but that is sufficiently rare that we're not going to support it for now. | ||||
| * | | | | | | | | | | Merge pull request #2520 from matrix-org/rav/process_incoming_rooms_in_parallel | Richard van der Hoff | 2017-10-10 | 1 | -19/+34 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fed server: process PDUs for different rooms in parallel | ||||
| | * | | | | | | | | | | fed server: process PDUs for different rooms in parallel | Richard van der Hoff | 2017-10-09 | 1 | -19/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With luck, this will give a real-time improvement when there are many rooms and the server ends up calling out to fetch missing events. | ||||
| * | | | | | | | | | | | Merge pull request #2518 from matrix-org/rav/linearize_incoming_transactions | Richard van der Hoff | 2017-10-10 | 1 | -1/+29 |
| |\| | | | | | | | | | | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Fed server: use a linearizer for ongoing transactions | ||||
| | * | | | | | | | | | Fed server: use a linearizer for ongoing transactions | Richard van der Hoff | 2017-10-09 | 1 | -1/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to process the same transaction multiple times concurrently, so use a linearizer. | ||||
| * | | | | | | | | | | Merge pull request #2517 from matrix-org/rav/fed_server_refactor | Richard van der Hoff | 2017-10-09 | 1 | -24/+29 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fed server: refactor on_incoming_transaction | ||||
| | * | | | | | | | | | fed server: refactor on_incoming_transaction | Richard van der Hoff | 2017-10-09 | 1 | -24/+29 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move as much as possible to after the have_responded check, and reduce the number of times we iterate over the pdu list. | ||||
| * | | | | | | | | | Merge pull request #2516 from matrix-org/rav/fix_fed_server_origin_check | Richard van der Hoff | 2017-10-09 | 1 | -24/+24 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | Fed server: Move origin-check code to _handle_received_pdu | ||||
| | * | | | | | | | | Fed server: Move origin-check code to _handle_received_pdu | Richard van der Hoff | 2017-10-09 | 1 | -24/+24 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The response-building code expects there to be an entry in the `results` list for each entry in the pdu_list, so the early `continue` was messing this up. That doesn't really matter, because all that the federation client does is log any errors, but it's pretty poor form. | ||||
| * | | | | | | | | Merge pull request #2508 from matrix-org/rav/federation_queue_logcontexts | Richard van der Hoff | 2017-10-09 | 1 | -16/+32 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix up logcontext handling in (federation) TransactionQueue | ||||
| | * | | | | | | | | Fix up logcontext handling in (federation) TransactionQueue | Richard van der Hoff | 2017-10-06 | 1 | -16/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using preserve_context_over_function, which has problems with respect to logcontexts. | ||||
| * | | | | | | | | | Merge pull request #2507 from matrix-org/rav/execute_concurrently_log_contexts | Richard van der Hoff | 2017-10-09 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix logcontext handling for concurrently_execute | ||||
| | * | | | | | | | | | Fix logcontext handling for concurrently_execute | Richard van der Hoff | 2017-10-06 | 1 | -2/+2 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid preserve_context_over_deferred, which is broken. | ||||
| * | | | | | | | | | Merge pull request #2506 from matrix-org/rav/unhandled_failure | Richard van der Hoff | 2017-10-09 | 1 | -24/+21 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Fix up deferred handling in federation.py | ||||
| | * | | | | | | | | Fix up deferred handling in federation.py | Richard van der Hoff | 2017-10-06 | 1 | -24/+21 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid preserve_context_over_deferred, which is broken * set consumeErrors=True on defer.gatherResults, to avoid spurious "unhandled failure" erros | ||||
| * | | | | | | | | some comments in the state res code | Richard van der Hoff | 2017-10-05 | 1 | -0/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #2502 from matrix-org/dbkr/allow_dms_to_admins | David Baker | 2017-10-05 | 3 | -8/+10 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Spam checking: add the invitee to user_may_invite | ||||
| | * | | | | | | | Spam checking: add the invitee to user_may_invite | David Baker | 2017-10-05 | 3 | -8/+10 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #2500 from matrix-org/dbkr/fix_word_boundary_mentions | David Baker | 2017-10-05 | 1 | -2/+14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix notif kws that start/end with non-word chars | ||||
| | * | | | | | | | Use better method for word boundary searching | David Baker | 2017-10-05 | 1 | -11/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://github.com/matrix-org/matrix-js-sdk/commit/ebc95667b8a5777d13e5d3c679972bedae022fd5 | ||||
| | * | | | | | | | pep8 | David Baker | 2017-10-05 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix notif kws that start/end with non-word chars | David Baker | 2017-10-05 | 1 | -2/+21 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only prepend / append word bounary characters if the search expression starts or ends with a word character, otherwise they don't work because there's no word bounary between whitespace and a non-word char. | ||||
| * | | | | | | | Merge pull request #2495 from matrix-org/dbkr/spam_check_room_creation | David Baker | 2017-10-04 | 3 | -0/+73 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add room creation checks to spam checker | ||||
| | * | | | | | | | spam check room publishing | David Baker | 2017-10-04 | 2 | -0/+26 |
| | | | | | | | | | |||||
| | * | | | | | | | un-double indent | David Baker | 2017-10-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Add room creation checks to spam checker | David Baker | 2017-10-04 | 3 | -0/+47 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets the spam checker deny attempts to create rooms and add aliases to them. | ||||
| * | | | | | | | Merge pull request #2492 from matrix-org/dbkr/spam_check_invites | David Baker | 2017-10-03 | 3 | -2/+39 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow spam checker to reject invites too | ||||
| | * | | | | | | | s/roomid/room_id/ | David Baker | 2017-10-03 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | pass room id too | David Baker | 2017-10-03 | 3 | -4/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Federation was passing strings anyway | David Baker | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so pass string everywhere | ||||
| | * | | | | | | | this shouldn't be debug | David Baker | 2017-10-03 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | better logging | David Baker | 2017-10-03 | 1 | -4/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Actually write warpper function | David Baker | 2017-10-03 | 1 | -0/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Skip spam check for admin users | David Baker | 2017-10-03 | 1 | -8/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix param name & lint | David Baker | 2017-10-03 | 1 | -2/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Allow spam checker to reject invites too | David Baker | 2017-10-03 | 2 | -6/+18 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #2491 from matrix-org/rav/port_db_fixes | Richard van der Hoff | 2017-10-03 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Drop search values with nul characters | ||||
| | * | | | | | | Drop search values with nul characters | Richard van der Hoff | 2017-10-02 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/matrix-org/synapse/issues/2187 contains a report of a port failing due to nul characters somewhere in the search table. Let's try dropping the offending rows. | ||||
| * | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-02 | 5 | -13/+37 |
| |\ \ \ \ \ \ \ | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |