Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
|\ \ | ||||||
| * | | 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 | Richard van der Hoff | 2017-10-11 | 2 | -6/+46 | |
* | | | | 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 | Richard van der Hoff | 2017-10-11 | 1 | -2/+3 | |
| |/ / / | ||||||
* | | | | Merge pull request #2515 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+51 | |
|\ \ \ \ | ||||||
| * | | | | logformatter: fix AttributeError | Richard van der Hoff | 2017-10-11 | 1 | -3/+11 | |
| * | | | | Fancy logformatter to format exceptions better | Richard van der Hoff | 2017-10-09 | 1 | -0/+43 | |
* | | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | peeeeeeeeep8888888888888888888888888888 | Erik Johnston | 2017-10-11 | 1 | -1/+1 | |
| * | | | | | Fix group stream replication | Erik Johnston | 2017-10-11 | 1 | -7/+7 | |
|/ / / / / | ||||||
* | | | | | 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 | 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 | |
|\ \ \ \ | ||||||
| * | | | | 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 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 | 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 | 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 | 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 | |
| |\| | | | | | | ||||||
| | * | | | | | | 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 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 | 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 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 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 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | 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 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | 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 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
| * | | | | | | | | There was already a constant for this | David Baker | 2017-10-10 | 1 | -3/+4 | |
| * | | | | | | | | 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 | |
* | | | | | | | | | | Merge pull request #2483 from jeremycline/unfreeze-ujson-dump | Erik Johnston | 2017-10-11 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Unfreeze event before serializing with ujson | Jeremy Cline | 2017-09-30 | 1 | -1/+2 | |
* | | | | | | | | | | | Merge pull request #2490 from matrix-org/erikj/drop_left_room_events | Erik Johnston | 2017-10-10 | 3 | -0/+65 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
* | | | | | | | | | | | 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 | Richard van der Hoff | 2017-10-09 | 1 | -19/+34 | |
* | | | | | | | | | | | | 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 | Richard van der Hoff | 2017-10-09 | 1 | -1/+29 | |
* | | | | | | | | | | | 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 | Richard van der Hoff | 2017-10-09 | 1 | -24/+29 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | 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 | Richard van der Hoff | 2017-10-09 | 1 | -24/+24 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | 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 | Richard van der Hoff | 2017-10-06 | 1 | -16/+32 | |
* | | | | | | | | | | 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 | Richard van der Hoff | 2017-10-06 | 1 | -2/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | 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 | Richard van der Hoff | 2017-10-06 | 1 | -24/+21 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | 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 | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use better method for word boundary searching | David Baker | 2017-10-05 | 1 | -11/+3 | |
| * | | | | | | | | 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 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #2495 from matrix-org/dbkr/spam_check_room_creation | David Baker | 2017-10-04 | 3 | -0/+73 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #2492 from matrix-org/dbkr/spam_check_invites | David Baker | 2017-10-03 | 3 | -2/+39 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
| * | | | | | | | | 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 | Richard van der Hoff | 2017-10-02 | 1 | -4/+7 | |
* | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-02 | 5 | -13/+37 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Bump version and changelog v0.23.1 | Erik Johnston | 2017-10-02 | 2 | -1/+9 | |
| * | | | | | | | Make 'affinity' package optional | Erik Johnston | 2017-10-02 | 2 | -2/+17 | |
| * | | | | | | | Move quit_with_error | Erik Johnston | 2017-10-02 | 2 | -10/+11 | |
* | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-02 | 3 | -3/+10 | |
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse v0.23.0 | Erik Johnston | 2017-10-02 | 52 | -859/+1833 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | Bump version and change log github/release-v0.23.0 release-v0.23.0 | Erik Johnston | 2017-10-02 | 2 | -1/+7 | |
| * | | | | | | Merge pull request #2464 from rnbdsh/patch-4 | Richard van der Hoff | 2017-09-25 | 1 | -2/+3 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Start traditionally, stop synctl | rnbdsh | 2017-09-24 | 1 | -1/+2 | |
| | * | | | | | | Remove non-existing files, add stop, use synctl | rnbdsh | 2017-09-24 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2480 from matrix-org/rav/federation_client_logging | Richard van der Hoff | 2017-09-29 | 1 | -7/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Improve logging of failures in matrixfederationclient | Richard van der Hoff | 2017-09-28 | 1 | -7/+6 | |
* | | | | | | | | Only log if we've removed media | Erik Johnston | 2017-09-28 | 1 | -2/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | Handle SERVFAILs when doing AAAA lookups for federation (#2477) | Richard van der Hoff | 2017-09-28 | 1 | -5/+17 | |
* | | | | | | | Up the limits on number of url cache entries to delete at one time | Erik Johnston | 2017-09-28 | 1 | -2/+2 | |
* | | | | | | | Add old indices | Erik Johnston | 2017-09-28 | 1 | -0/+2 | |
* | | | | | | | Clear up expired url cache every 10s | Erik Johnston | 2017-09-28 | 1 | -1/+1 | |
* | | | | | | | Actually assign result to variable | Erik Johnston | 2017-09-28 | 1 | -1/+1 | |
* | | | | | | | Only pull out local media that were for url cache | Erik Johnston | 2017-09-28 | 1 | -1/+1 | |
* | | | | | | | Fix typo in url cache expiry timer | Erik Johnston | 2017-09-28 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnails | Erik Johnston | 2017-09-28 | 1 | -31/+81 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Support new and old style media id formats | Erik Johnston | 2017-09-28 | 1 | -31/+81 | |
* | | | | | | | | Fix typo | Erik Johnston | 2017-09-28 | 1 | -3/+3 | |
* | | | | | | | | Merge pull request #2478 from matrix-org/erikj/expire_url_cache_thumbnails | Erik Johnston | 2017-09-28 | 5 | -12/+234 | |
|\| | | | | | | | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Change expires column to expires_ts | Erik Johnston | 2017-09-28 | 3 | -10/+29 | |
| * | | | | | | More brackets | Erik Johnston | 2017-09-28 | 1 | -1/+1 | |
| * | | | | | | Delete expired url cache data | Erik Johnston | 2017-09-28 | 5 | -5/+208 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2476 from matrix-org/erikj/joined_members_auth | Erik Johnston | 2017-09-28 | 2 | -13/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix /joined_members to work with AS users | Erik Johnston | 2017-09-28 | 2 | -13/+26 | |
* | | | | | | | Merge pull request #2475 from matrix-org/erikj/joined_members_auth | Erik Johnston | 2017-09-27 | 2 | -10/+38 | |
|\| | | | | | | ||||||
| * | | | | | | Fix bug where /joined_members didn't check user was in room | Erik Johnston | 2017-09-27 | 2 | -10/+38 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2474 from matrix-org/dbkr/spam_check_module | David Baker | 2017-09-27 | 6 | -23/+74 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Don't test is spam_checker not None | David Baker | 2017-09-27 | 1 | -1/+7 | |
| * | | | | | | Remove unintentional debugging | David Baker | 2017-09-27 | 1 | -1/+0 | |
| * | | | | | | pep8 | David Baker | 2017-09-27 | 2 | -0/+2 | |
| * | | | | | | Forgot the new file again :( | David Baker | 2017-09-27 | 1 | -0/+35 | |
| * | | | | | | Make the spam checker a module | David Baker | 2017-09-26 | 5 | -23/+33 | |
* | | | | | | | pep8 | David Baker | 2017-09-26 | 1 | -0/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2473 from matrix-org/dbkr/factor_out_module_loading | David Baker | 2017-09-26 | 2 | -12/+51 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | unnecessary parens | David Baker | 2017-09-26 | 1 | -1/+1 | |
| * | | | | | Add module_loader.py | David Baker | 2017-09-26 | 1 | -0/+41 | |
| * | | | | | Factor out module loading to a separate place | David Baker | 2017-09-26 | 1 | -12/+10 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0 v0.23.0-rc2 | Erik Johnston | 2017-09-26 | 3 | -19/+39 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #2470 from matrix-org/erikj/sync_speed_fix | Erik Johnston | 2017-09-25 | 1 | -5/+18 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Refactor to speed up incremental syncs | Erik Johnston | 2017-09-25 | 1 | -5/+18 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #2468 from maxidor/develop | Richard van der Hoff | 2017-09-25 | 1 | -13/+20 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Include review feedback | Max Dor | 2017-09-25 | 1 | -5/+3 | |
| | * | | | | | Clarify recommended network setup | Max Dor | 2017-09-25 | 1 | -15/+24 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-09-25 | 2 | -1/+33 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #2390 from r3dey3/develop | Richard van der Hoff | 2017-09-25 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'develop' into develop | Richard van der Hoff | 2017-09-25 | 48 | -805/+1855 | |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Fix iteration of requests_missing_keys; list doesn't have .values() | Kenny Keslar | 2017-07-26 | 1 | -1/+1 | |
* | | | | | | | | Bump changelog and version | Erik Johnston | 2017-09-26 | 2 | -1/+9 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Update CHANGES v0.23.0-rc1 | Erik Johnston | 2017-09-25 | 1 | -3/+11 |