Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | s/get_forward_events/get_successor_events/ | Erik Johnston | 2019-03-04 | 1 | -1/+1 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n... | Erik Johnston | 2019-03-04 | 6 | -52/+137 |
|\ | |||||
| * | Fix incorrect log about not persisting duplicate state event. (#4776) | Richard van der Hoff | 2019-03-01 | 1 | -3/+4 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room... | Andrew Morgan | 2019-02-26 | 21 | -482/+1672 |
| |\ | |||||
| | * | Revert "Prevent showing non-fed rooms in fed /publicRooms" | Andrew Morgan | 2019-02-26 | 1 | -65/+11 |
| | * | Merge pull request #4736 from matrix-org/anoa/public_rooms_federate | Andrew Morgan | 2019-02-26 | 1 | -11/+65 |
| | |\ | |||||
| | | * | Cleaner chunk logic | Andrew Morgan | 2019-02-26 | 1 | -5/+4 |
| | | * | Correct indent | Andrew Morgan | 2019-02-26 | 1 | -3/+3 |
| | | * | Correct docstring types and chunk logic | Andrew Morgan | 2019-02-26 | 1 | -10/+11 |
| | | * | Clean up room chunk logic | Andrew Morgan | 2019-02-26 | 1 | -6/+8 |
| | | * | Make not showing non-federated rooms the default | Andrew Morgan | 2019-02-26 | 1 | -1/+1 |
| | | * | Result may be None | Andrew Morgan | 2019-02-26 | 1 | -1/+1 |
| | | * | Address rich comments | Andrew Morgan | 2019-02-26 | 1 | -6/+30 |
| | | * | elif not else if | Andrew Morgan | 2019-02-25 | 1 | -1/+1 |
| | | * | syntax derp | Andrew Morgan | 2019-02-25 | 1 | -1/+1 |
| | | * | Simplify call to generate_room_entry | Andrew Morgan | 2019-02-25 | 1 | -17/+13 |
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room... | Erik Johnston | 2019-02-25 | 21 | -477/+1620 |
| | | |\ | |||||
| | | * | | Docs and arg name clarification | Andrew Morgan | 2019-02-25 | 1 | -2/+15 |
| | | * | | Don't restrict non-fed rooms over client APIs | Andrew Morgan | 2019-02-25 | 1 | -11/+18 |
| | | * | | Config option to prevent showing non-fed rooms in fed /publicRooms | Andrew Morgan | 2019-02-25 | 1 | -2/+15 |
| | * | | | switch from google.com to recaptcha.net for reCAPTCHA (#4731) | Matthew Hodgson | 2019-02-25 | 1 | -2/+2 |
| | * | | | Merge pull request #4737 from matrix-org/erikj/failure_log_tb | Erik Johnston | 2019-02-25 | 1 | -1/+5 |
| | |\ \ \ | |||||
| | | * | | | Log tracebacks correctly | Erik Johnston | 2019-02-25 | 1 | -1/+5 |
| | | | |/ | | | |/| | |||||
| | * | | | Fix typo | Erik Johnston | 2019-02-25 | 1 | -1/+1 |
| | * | | | More comments | Erik Johnston | 2019-02-25 | 1 | -0/+4 |
| | * | | | Assert rather than clobber the values | Erik Johnston | 2019-02-25 | 1 | -2/+2 |
| | * | | | Add comments and paranoia | Erik Johnston | 2019-02-25 | 1 | -2/+23 |
| | * | | | Fix backfill storing incorrect state for events | Erik Johnston | 2019-02-22 | 1 | -1/+4 |
| | |/ / | |||||
| | * | | Run push_receipts_to_remotes as background job (#4707) | Richard van der Hoff | 2019-02-21 | 1 | -34/+34 |
| | * | | Merge pull request #4263 from rkfg/develop | Erik Johnston | 2019-02-21 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Prevent crash on pagination. | rkfg | 2018-12-06 | 1 | -1/+1 |
| * | | | | Put function def back to the way it was | Andrew Morgan | 2019-02-26 | 1 | -3/+3 |
| * | | | | Prevent showing non-fed rooms in fed /publicRooms | Andrew Morgan | 2019-02-26 | 1 | -12/+50 |
| | |_|/ | |/| | | |||||
| * | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
* | | | | Update comments | Erik Johnston | 2019-02-27 | 1 | -3/+13 |
* | | | | Stop backpaginating when events not visible | Erik Johnston | 2019-02-20 | 1 | -0/+31 |
| |/ / |/| | | |||||
* | | | Fix registration on workers (#4682) | Erik Johnston | 2019-02-20 | 3 | -8/+196 |
* | | | Merge pull request #4652 from matrix-org/babolivier/acme-delegated | Brendan Abolivier | 2019-02-19 | 1 | -4/+5 |
|\ \ \ | |||||
| * | | | Fetch ACME domain into an instance member | Brendan Abolivier | 2019-02-19 | 1 | -4/+5 |
| * | | | Use a configuration parameter to give the domain to generate a certificate for | Brendan Abolivier | 2019-02-18 | 1 | -25/+4 |
| * | | | Merge branch 'develop' into babolivier/acme-delegated | Brendan Abolivier | 2019-02-18 | 3 | -10/+35 |
| |\ \ \ | |||||
| * | | | | Typo in info log | Andrew Morgan | 2019-02-18 | 1 | -1/+1 |
| * | | | | Various cosmetics to make TravisCI happy | Brendan Abolivier | 2019-02-15 | 1 | -2/+5 |
| * | | | | Remove unused import | Brendan Abolivier | 2019-02-15 | 1 | -1/+0 |
| * | | | | Support .well-known delegation when issuing certificates through ACME | Brendan Abolivier | 2019-02-15 | 1 | -4/+23 |
* | | | | | Merge pull request #4642 from matrix-org/anoa/bans_room_upgrade | Andrew Morgan | 2019-02-19 | 1 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | lint | Andrew Morgan | 2019-02-18 | 1 | -1/+3 |
| * | | | | | Move member event processing and changelog fix | Andrew Morgan | 2019-02-18 | 1 | -9/+7 |
| * | | | | | Membership events are done later | Andrew Morgan | 2019-02-18 | 1 | -12/+20 |
| * | | | | | Transfer bans on room upgrade | Andrew Morgan | 2019-02-18 | 1 | -0/+14 |
| |/ / / / | |||||
* | | | | | Merge pull request #4666 from matrix-org/erikj/register_login_split | Erik Johnston | 2019-02-18 | 1 | -8/+106 |
|\ \ \ \ \ | |||||
| * | | | | | Move register_device into handler | Erik Johnston | 2019-02-18 | 1 | -4/+47 |
| * | | | | | Split out registration to worker | Erik Johnston | 2019-02-18 | 1 | -4/+59 |
* | | | | | | Merge pull request #4668 from matrix-org/erikj/catch_exceptions | Erik Johnston | 2019-02-18 | 1 | -5/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pep8 | Erik Johnston | 2019-02-18 | 1 | -1/+5 |
| * | | | | | | Correctly handle HttpResponseException | Erik Johnston | 2019-02-18 | 1 | -4/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workers | Erik Johnston | 2019-02-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix kicking guest users in worker mode | Erik Johnston | 2019-02-18 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptions | Erik Johnston | 2019-02-18 | 2 | -5/+11 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Correctly handle RequestSendFailed exceptions | Erik Johnston | 2019-02-14 | 2 | -5/+11 |
| |/ / / | |||||
* | | | | Only fetch aliases when publishing rooms | Erik Johnston | 2019-02-14 | 1 | -15/+15 |
* | | | | Add configurable room list publishing rules | Erik Johnston | 2019-02-14 | 1 | -5/+24 |
|/ / / | |||||
* | | | Run `black` on user directory code (#4635) | Amber Brown | 2019-02-13 | 1 | -44/+50 |
* | | | Merge pull request #4608 from matrix-org/anoa/acls_room_upgrade | Erik Johnston | 2019-02-12 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Transfer Server ACLs on room upgrade | Andrew Morgan | 2019-02-11 | 1 | -0/+1 |
* | | | | make sure version is in body and wrap in linearizer queue | Hubert Chathi | 2019-02-08 | 1 | -11/+26 |
* | | | | re-try to make isort happy | Hubert Chathi | 2019-02-06 | 1 | -1/+1 |
* | | | | fix import to make isort happy | Hubert Chathi | 2019-02-06 | 1 | -2/+7 |
* | | | | add new endpoint to update backup versions | Hubert Chathi | 2019-02-06 | 1 | -1/+33 |
* | | | | return proper error codes for some 404s | Hubert Chathi | 2019-02-06 | 1 | -4/+16 |
|/ / / | |||||
* | | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatable | Andrew Morgan | 2019-01-31 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | New function for getting room's create event | Andrew Morgan | 2019-01-31 | 1 | -7/+1 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad... | Andrew Morgan | 2019-01-31 | 1 | -1/+13 |
| |\ \ \ | |||||
| * | | | | lint | Andrew Morgan | 2019-01-31 | 1 | -2/+4 |
| * | | | | Copy over non-federatable trait on room upgrade | Andrew Morgan | 2019-01-30 | 1 | -0/+14 |
* | | | | | Add some debug for membership syncing issues (#4538) | Richard van der Hoff | 2019-01-31 | 1 | -2/+11 |
| |/ / / |/| | | | |||||
* | | | | Fix remote invite rejections not comming down sync | Erik Johnston | 2019-01-30 | 1 | -1/+13 |
|/ / / | |||||
* | | | ACME config cleanups (#4525) | Richard van der Hoff | 2019-01-30 | 1 | -12/+15 |
* | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 2 | -3/+3 |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions... | Erik Johnston | 2019-01-29 | 2 | -1/+10 |
|\ \ \ | |||||
| * | | | Use snder and not event ID domain to check if ours | Erik Johnston | 2019-01-29 | 1 | -0/+8 |
| * | | | Remove event ID usage when checking if new room | Erik Johnston | 2019-01-29 | 1 | -1/+2 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions... | Erik Johnston | 2019-01-29 | 2 | -29/+7 |
|\| | | | |||||
| * | | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 1 | -28/+6 |
| |\ \ \ | |||||
| | * | | | Correctly set context.app_service | Erik Johnston | 2019-01-29 | 1 | -0/+2 |
| | * | | | Refactor event building into EventBuilder | Erik Johnston | 2019-01-29 | 1 | -29/+5 |
| * | | | | Fixup calls to `comput_event_signature` | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| |/ / / | |||||
* / / / | Implement rechecking of redactions | Erik Johnston | 2019-01-29 | 1 | -1/+5 |
|/ / / | |||||
* | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validator | Erik Johnston | 2019-01-29 | 2 | -3/+8 |
|\ \ \ | |||||
| * | | | Split up event validation between event and builder | Erik Johnston | 2019-01-28 | 2 | -3/+8 |
* | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 3 | -11/+23 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Correctly use default room version if none is set | Erik Johnston | 2019-01-28 | 1 | -2/+2 |
| * | | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 3 | -10/+22 |
* | | | | Change return syntax in doc string | Andrew Morgan | 2019-01-28 | 1 | -1/+1 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg... | Andrew Morgan | 2019-01-28 | 2 | -29/+53 |
|\| | | | |||||
| * | | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 2 | -29/+53 |
| |\ \ \ | |||||
| | * | | | Require event format version to parse or create events | Erik Johnston | 2019-01-25 | 2 | -29/+53 |
* | | | | | Reuse predecessor method | Andrew Morgan | 2019-01-28 | 1 | -12/+8 |
* | | | | | Fixes | Andrew Morgan | 2019-01-25 | 1 | -39/+39 |
* | | | | | Clean up direct_rooms access | Andrew Morgan | 2019-01-25 | 1 | -3/+3 |
* | | | | | Use python magic | Andrew Morgan | 2019-01-25 | 1 | -2/+1 |
* | | | | | Destructure account data tuple before use | Andrew Morgan | 2019-01-25 | 1 | -3/+3 |
* | | | | | Remove unnecessary null check | Andrew Morgan | 2019-01-25 | 1 | -7/+6 |
* | | | | | Move room_tag declaration to be closer to its use | Andrew Morgan | 2019-01-25 | 1 | -4/+5 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg... | Andrew Morgan | 2019-01-25 | 5 | -34/+231 |
|\| | | | | |||||
| * | | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 1 | -0/+47 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Apply suggestions from code review | Richard van der Hoff | 2019-01-24 | 1 | -1/+1 |
| | * | | | Fix a bug with single-room search searching all rooms | Andrew Morgan | 2019-01-22 | 1 | -32/+10 |
| | * | | | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 1 | -0/+69 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813 | Erik Johnston | 2019-01-25 | 4 | -33/+183 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions | Erik Johnston | 2019-01-24 | 1 | -2/+15 |
| | |\ \ \ \ | |||||
| | | * | | | | Review comments | Erik Johnston | 2019-01-24 | 1 | -0/+5 |
| | | * | | | | Add room_version param to get_pdu | Erik Johnston | 2019-01-23 | 1 | -2/+10 |
| | * | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites | Erik Johnston | 2019-01-24 | 1 | -29/+3 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Remove unecessary setting of outlier bit | Erik Johnston | 2019-01-24 | 1 | -2/+0 |
| | | * | | | | | Use term 'out of band membership' instead | Erik Johnston | 2019-01-24 | 1 | -2/+2 |
| | | * | | | | | Clarify the invite flows | Erik Johnston | 2019-01-23 | 1 | -1/+11 |
| | | * | | | | | Remove unnecessary '_sign_event' | Erik Johnston | 2019-01-23 | 1 | -14/+0 |
| | | * | | | | | Store rejected remote invite events as outliers | Erik Johnston | 2019-01-23 | 1 | -32/+12 |
| | | |/ / / / | |||||
| | * | | | | | Change default timeout value from 0 to None | Andrew Morgan | 2019-01-24 | 1 | -1/+1 |
| | * | | | | | Use self.clock instead of datetime | Andrew Morgan | 2019-01-24 | 1 | -4/+3 |
| | * | | | | | isort | Andrew Morgan | 2019-01-24 | 1 | -1/+1 |
| | * | | | | | lint | Andrew Morgan | 2019-01-24 | 1 | -1/+2 |
| | * | | | | | Time out filtered room dir queries after 60s | Andrew Morgan | 2019-01-24 | 1 | -2/+12 |
| | |/ / / / | |||||
| | * | | | | Add metric for user dir current event stream position | Andrew Morgan | 2019-01-23 | 1 | -0/+6 |
| | * | | | | Support ACME for certificate provisioning (#4384) | Amber Brown | 2019-01-23 | 1 | -0/+147 |
| * | | | | | Implement MSC 1813 - Add room version to make APIs | Erik Johnston | 2019-01-23 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Move tag and direct state copying into separate function | Andrew Morgan | 2019-01-25 | 1 | -43/+63 |
* | | | | | lint | Andrew Morgan | 2019-01-22 | 1 | -1/+3 |
* | | | | | Prevent duplicate room IDs in m.direct | Andrew Morgan | 2019-01-22 | 1 | -10/+9 |
* | | | | | Fix comments | Andrew Morgan | 2019-01-22 | 1 | -2/+2 |
* | | | | | Join logic covers both room creator and arbitrary users | Andrew Morgan | 2019-01-22 | 1 | -33/+0 |
* | | | | | tags, m.direct copying over correctly | Andrew Morgan | 2019-01-22 | 2 | -11/+62 |
* | | | | | Fix typos | Andrew Morgan | 2019-01-22 | 1 | -8/+8 |
* | | | | | Migrating dm and room tags work for migrator | Andrew Morgan | 2019-01-22 | 1 | -2/+13 |
* | | | | | Prevent crash on user who doesn't have any direct rooms | Andrew Morgan | 2019-01-22 | 1 | -1/+1 |
* | | | | | Preserve DM status of a room on upgrade | Andrew Morgan | 2019-01-22 | 1 | -0/+19 |
* | | | | | Fix typo | Andrew Morgan | 2019-01-22 | 1 | -2/+2 |
|/ / / / | |||||
* / / / | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 1 | -0/+1 |
|/ / / | |||||
* | | | sign_request -> build_auth_headers (#4408) | Richard van der Hoff | 2019-01-17 | 1 | -3/+6 |
* | | | don't store more remote device lists if they have more than 1K devices (#4397) | Richard van der Hoff | 2019-01-16 | 1 | -0/+19 |
* | | | fix NPE in /messages by checking if all events were filtered out (#4330) | Matthew Hodgson | 2019-01-02 | 1 | -10/+11 |
* | | | Fixed line length | Nathan Pennie | 2018-12-19 | 1 | -1/+5 |
* | | | Fix the variable names used for account_data | Nathan Pennie | 2018-12-19 | 1 | -3/+3 |
* | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 3 | -23/+39 |
* | | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 1 | -7/+16 |
* | | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 1 | -2/+11 |
* | | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 1 | -29/+0 |
| |/ |/| | |||||
* | | Add an option to disable search for homeservers which may not be interested i... | Travis Ralston | 2018-12-04 | 1 | -0/+3 |
* | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 1 | -2/+21 |
* | | Remove duplicate slashes in generated consent URLs | Travis Ralston | 2018-11-15 | 1 | -1/+1 |
* | | Remove hack to support rejoining rooms | Erik Johnston | 2018-11-09 | 1 | -74/+42 |
* | | Simplify to always drop events if server isn't in the room | Erik Johnston | 2018-11-09 | 1 | -14/+9 |
* | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 1 | -1/+1 |
* | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -7/+15 |
* | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 1 | -24/+24 |
* | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 1 | -4/+10 |
* | | Include a version query string arg for the consent route | Travis Ralston | 2018-10-31 | 1 | -1/+4 |
* | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 8 | -133/+515 |
|\ \ | |||||
| * \ | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades | Richard van der Hoff | 2018-10-31 | 2 | -14/+140 |
| |\ \ | |||||
| | * | | Avoid else clause on exception for clarity | Richard van der Hoff | 2018-10-31 | 1 | -2/+1 |
| | * | | Attempt to move room aliases on room upgrades | Richard van der Hoff | 2018-10-31 | 2 | -14/+141 |
| * | | | Log some bits about event creation (#4121) | Richard van der Hoff | 2018-10-31 | 2 | -0/+7 |
| * | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| * | | | Delete the disused & unspecced identicon functionality (#4106) | Amber Brown | 2018-10-29 | 1 | -3/+0 |
| |/ / | |||||
| * | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar | Richard van der Hoff | 2018-10-29 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | Remember to copy the avatar on room upgrades | Richard van der Hoff | 2018-10-26 | 1 | -1/+2 |
| * | | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 1 | -44/+81 |
| |/ / | |||||
| * | | optimise state copying | Richard van der Hoff | 2018-10-26 | 1 | -7/+5 |
| * | | Address review comments | Richard van der Hoff | 2018-10-26 | 1 | -7/+9 |
| * | | restrict PLs in old room | Richard van der Hoff | 2018-10-25 | 1 | -1/+43 |
| * | | copy state | Richard van der Hoff | 2018-10-25 | 1 | -11/+26 |
| * | | preserve PLs | Richard van der Hoff | 2018-10-25 | 1 | -1/+7 |
| * | | preserve room visibility | Richard van der Hoff | 2018-10-25 | 1 | -3/+5 |
| * | | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 1 | -0/+121 |
| * | | Allow power_level_content_override=None for _send_events_for_new_room | Richard van der Hoff | 2018-10-25 | 1 | -5/+6 |
| * | | Make room_member_handler a member of RoomCreationHandler | Richard van der Hoff | 2018-10-25 | 2 | -8/+7 |
| * | | Factor _generate_room_id out of create_room | Richard van der Hoff | 2018-10-25 | 1 | -22/+23 |
| |/ | |||||
| * | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 5 | -86/+72 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... | Erik Johnston | 2018-10-25 | 8 | -43/+79 |
| |\ | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea... | Neil Johnson | 2018-10-25 | 13 | -103/+440 |
| | |\ | |||||
| | * | | remove trailing whiter space | Neil Johnson | 2018-10-24 | 1 | -1/+1 |
| | * | | fix tuple | Richard van der Hoff | 2018-10-24 | 1 | -1/+2 |
| | * | | remove errant exception and style | Neil Johnson | 2018-10-23 | 1 | -5/+5 |
| | * | | clean up config error logic and imports | Neil Johnson | 2018-10-17 | 1 | -14/+16 |
| | * | | no need to join room if creator | Neil Johnson | 2018-10-13 | 1 | -1/+2 |
| | * | | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 1 | -3/+8 |
| | * | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 5 | -42/+74 |
| | |\ \ | |||||
| | * | | | move logic into register, fix room alias localpart bug, tests | Neil Johnson | 2018-10-04 | 1 | -27/+18 |
| | * | | | emit room aliases event | Matthew Hodgson | 2018-09-29 | 1 | -3/+8 |
| | * | | | fix thinkos | Matthew Hodgson | 2018-09-29 | 1 | -6/+6 |
| | * | | | fix UTs | Matthew Hodgson | 2018-09-28 | 1 | -4/+9 |
| | * | | | untested stab at autocreating autojoin rooms | Matthew Hodgson | 2018-09-28 | 1 | -0/+18 |
| * | | | | Add config option to control alias creation | Erik Johnston | 2018-10-19 | 1 | -0/+9 |
* | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 9 | -74/+100 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 1 | -15/+15 |
| |\ \ \ \ | |||||
| | * | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | * | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 1 | -2/+2 |
| | * | | | | Fix up use of resolve_events_with_factory | Erik Johnston | 2018-10-16 | 1 | -13/+10 |
| * | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 3 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 3 | -4/+4 |
| * | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 2 | -32/+50 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Clean up room alias creation | Erik Johnston | 2018-10-19 | 2 | -32/+50 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 1 | -2/+16 |
| |\ \ \ \ \ | |||||
| | * | | | | | Comments help | Travis Ralston | 2018-10-23 | 1 | -0/+5 |
| | * | | | | | isort | Travis Ralston | 2018-10-12 | 1 | -1/+1 |
| | * | | | | | More sane handling of group errors and pep8 | Travis Ralston | 2018-10-12 | 1 | -4/+5 |
| | * | | | | | Merge branch 'develop' into travis/fix-federated-group-requests | Travis Ralston | 2018-10-12 | 7 | -91/+181 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Remove debugging statement | Travis Ralston | 2018-09-26 | 1 | -1/+0 |
| | * | | | | | | Handle HttpResponseException more safely for federated groups | Travis Ralston | 2018-09-26 | 1 | -2/+11 |
| * | | | | | | | Give some more things logcontexts (#4077) | Richard van der Hoff | 2018-10-23 | 2 | -7/+11 |
| * | | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 1 | -14/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 2 | -9/+14 |
|\| | | | | | | |||||
| * | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 1 | -2/+9 |
| * | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 1 | -7/+5 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | pep8 | Travis Ralston | 2018-10-15 | 1 | -1/+1 |
* | | | | | | Ensure the terms params are actually provided | Travis Ralston | 2018-10-15 | 1 | -0/+1 |
* | | | | | | Python is hard | Travis Ralston | 2018-10-15 | 1 | -5/+6 |
* | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-15 | 1 | -0/+289 |
|\| | | | | | |||||
| * | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 1 | -0/+289 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| | * | | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 1 | -20/+21 |
| | * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 13 | -205/+498 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Apparently this blank line is Very Important | David Baker | 2018-10-09 | 1 | -0/+1 |
| | * | | | | be python3 compatible | David Baker | 2018-10-09 | 1 | -2/+3 |
| | * | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -1/+1 |
| | * | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -1/+1 |
| | * | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 20 | -168/+546 |
| | |\ \ \ \ | |||||
| | * | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | * | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 1 | -7/+28 |
| | * | | | | | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| | * | | | | | fix flakes | Matthew Hodgson | 2018-08-12 | 1 | -2/+2 |
| | * | | | | | fix typos | Matthew Hodgson | 2018-08-12 | 1 | -1/+2 |
| | * | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -8/+103 |
| | * | | | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 1 | -2/+0 |
| | * | | | | | fix factoring out of _should_replace_room_key | Matthew Hodgson | 2018-08-12 | 1 | -3/+4 |
| | * | | | | | rename room_key_version table correctly, and fix opt args | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | * | | | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -30/+58 |
| | * | | | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 1 | -7/+11 |
| | * | | | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -5/+42 |
| | * | | | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 1 | -26/+43 |
| | * | | | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 1 | -15/+31 |
| | * | | | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 1 | -0/+60 |
* | | | | | | | Update login terms structure for the proposed language support | Travis Ralston | 2018-10-12 | 1 | -4/+7 |
* | | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-12 | 2 | -20/+37 |
|\| | | | | | | |||||
| * | | | | | | Add description to counter metric | Erik Johnston | 2018-10-10 | 1 | -1/+5 |
| * | | | | | | Track number of non-empty sync responses instead | Erik Johnston | 2018-10-10 | 1 | -9/+15 |
| * | | | | | | Append _total to metric and fix up spelling | Erik Johnston | 2018-10-10 | 1 | -2/+2 |
| * | | | | | | Add metric to count lazy member sync requests | Erik Johnston | 2018-10-09 | 1 | -6/+20 |
| * | | | | | | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 1 | -15/+3 |