Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2598 from matrix-org/revert-2596-erikj/attestation_jitter | Erik Johnston | 2017-10-27 | 1 | -12/+1 |
|\ | |||||
| * | Revert "Add jitter to validity period of attestations" | Erik Johnston | 2017-10-27 | 1 | -12/+1 |
|/ | |||||
* | Merge pull request #2596 from matrix-org/erikj/attestation_jitter | Erik Johnston | 2017-10-27 | 1 | -1/+12 |
|\ | |||||
| * | Add jitter to validity period of attestations | Erik Johnston | 2017-10-27 | 1 | -1/+12 |
|/ | |||||
* | Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1 | Erik Johnston | 2017-10-24 | 64 | -159/+219 |
|\ | |||||
| * | Bump version and changelog release-v0.24.1 | Erik Johnston | 2017-10-24 | 2 | -1/+9 |
| * | Merge pull request #2567 from matrix-org/erikj/group_fed_update_profile | Erik Johnston | 2017-10-24 | 2 | -11/+31 |
| |\ | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_... | Erik Johnston | 2017-10-24 | 57 | -135/+171 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #2568 from matrix-org/rav/pep8 | Richard van der Hoff | 2017-10-23 | 55 | -100/+97 |
| |\ \ | |||||
| | * | | fix vars named `l` | Richard van der Hoff | 2017-10-23 | 2 | -7/+4 |
| | * | | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 54 | -93/+93 |
| |/ / | |||||
| * | | Merge pull request #2566 from matrix-org/rav/media_logcontext_leak | Richard van der Hoff | 2017-10-23 | 1 | -1/+4 |
| |\ \ | |||||
| | * | | Fix a logcontext leak in the media repo | Richard van der Hoff | 2017-10-23 | 1 | -1/+4 |
| * | | | Merge pull request #2561 from matrix-org/rav/id_checking | Richard van der Hoff | 2017-10-23 | 4 | -34/+70 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Validate group ids when parsing | Richard van der Hoff | 2017-10-21 | 3 | -17/+45 |
| | * | | Allow = in mxids and groupids | Richard van der Hoff | 2017-10-20 | 3 | -5/+4 |
| | * | | Disallow capital letters in userids | Richard van der Hoff | 2017-10-20 | 3 | -16/+25 |
| | | * | Correctly wire in update group profile over federation | Erik Johnston | 2017-10-23 | 2 | -11/+31 |
| | |/ | |/| | |||||
| * | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-23 | 3 | -1/+45 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0 | Erik Johnston | 2017-10-23 | 83 | -571/+6538 |
|\ \ \ | |||||
| * | | | Bump version and changelog release-v0.24.0 | Erik Johnston | 2017-10-23 | 2 | -1/+7 |
| * | | | Correctly bump version v0.24.0-rc1 | Erik Johnston | 2017-10-19 | 1 | -1/+1 |
| * | | | Update changelog | Erik Johnston | 2017-10-19 | 1 | -0/+1 |
| * | | | Bump version and changelog | Erik Johnston | 2017-10-19 | 2 | -1/+36 |
| | |/ | |/| | |||||
* | | | Merge pull request #2540 from 4nd3r/patch-1 | Richard van der Hoff | 2017-10-16 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | make it absolutely clear that Purge History API does not remove all traces of... | Ander Punnar | 2017-10-14 | 1 | -0/+2 |
|/ / / | |||||
| | * | Merge pull request #2560 from matrix-org/rav/kill_pointless_method | Richard van der Hoff | 2017-10-23 | 6 | -12/+8 |
| |/| | |||||
| | * | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 6 | -12/+8 |
| |/ | |||||
| * | Merge pull request #2559 from matrix-org/erikj/group_id_validation | Erik Johnston | 2017-10-19 | 3 | -3/+46 |
| |\ | |||||
| | * | 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 | 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 | 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 | Richard van der Hoff | 2017-10-17 | 1 | -1/+0 |
| * | | 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 | Richard van der Hoff | 2017-10-17 | 1 | -3/+3 |
| * | | 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) | Krombel | 2017-10-17 | 1 | -2/+2 |
| * | | Improve error handling for missing files (#2551) | Richard van der Hoff | 2017-10-17 | 3 | -17/+33 |
| * | | 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 | Richard van der Hoff | 2017-10-17 | 1 | -76/+0 |
| | |/ | |||||
| * | | Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldable | Richard van der Hoff | 2017-10-17 | 1 | -0/+38 |
| |\ \ | |||||
| | * | | Fix name of test_logcontext | Richard van der Hoff | 2017-10-17 | 1 | -0/+0 |
| | * | | 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 | Richard van der Hoff | 2017-10-17 | 2 | -7/+22 |
| | |/ | |||||
| * | | Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms | David Baker | 2017-10-17 | 3 | -0/+42 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 |
| * | | Merge pull request #2544 from matrix-org/luke/groups-invited-users | Luke Barnard | 2017-10-16 | 6 | -1/+102 |
| |\ \ | |||||
| | * | | 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 |
| |\ \ \ | | |_|/ | |/| | | |||||
| * | | | 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 | David Baker | 2017-10-16 | 1 | -1/+1 |
| |/ / / | |||||
| | | * | 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 |
| |/ | |||||
| * | Merge pull request #2538 from matrix-org/erikj/media_backup | Erik Johnston | 2017-10-13 | 6 | -200/+309 |
| |\ | |||||
| | * | 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 |
| |\ | |||||
| | * | 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 |
| | |/ / / / / / / / |