Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into matthew/heroes-for-avatars github/matthew/heroes-for-avatars matthew/heroes-for-avatars | Amber Brown | 2018-11-03 | 139 | -2461/+5839 |
|\ | |||||
| * | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 2 | -4/+24 |
| * | Merge pull request #4132 from matrix-org/rav/fix_device_list_locking | Richard van der Hoff | 2018-11-02 | 3 | -11/+128 |
| |\ | |||||
| | * | Add unique indexes to a couple of tables | Richard van der Hoff | 2018-11-02 | 3 | -6/+88 |
| | * | Remove redundant database locks for device list updates | Richard van der Hoff | 2018-11-02 | 1 | -5/+40 |
| * | | Merge pull request #4133 from matrix-org/travis/fix-terms-auth | Richard van der Hoff | 2018-11-02 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix logic error that prevented guests from seeing the privacy policy | Travis Ralston | 2018-11-01 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_none | Erik Johnston | 2018-11-02 | 1 | -0/+4 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix None exception in state res v2 | Erik Johnston | 2018-11-02 | 1 | -0/+4 |
| * | | Merge pull request #4004 from matrix-org/travis/login-terms | Travis Ralston | 2018-11-01 | 5 | -17/+135 |
| |\ \ | | |/ | |/| | |||||
| | * | Include a version query string arg for the consent route | Travis Ralston | 2018-10-31 | 2 | -3/+8 |
| | * | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 45 | -879/+1761 |
| | |\ | |||||
| | * \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 46 | -503/+1136 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 21 | -106/+472 |
| | |\ \ \ | |||||
| | * | | | | pep8 | Travis Ralston | 2018-10-15 | 3 | -14/+3 |
| | * | | | | 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 | 10 | -3/+1047 |
| | |\ \ \ \ | |||||
| | * | | | | | Update login terms structure for the proposed language support | Travis Ralston | 2018-10-12 | 1 | -4/+7 |
| | * | | | | | Rely on the lack of ?u to represent public access | Travis Ralston | 2018-10-12 | 2 | -10/+6 |
| | * | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-12 | 18 | -125/+224 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Use a flag rather than a new route for the public policy | Travis Ralston | 2018-10-03 | 3 | -17/+25 |
| | * | | | | | | Auto-consent to the privacy policy if the user registered with terms | Travis Ralston | 2018-10-03 | 1 | -0/+6 |
| | * | | | | | | Make the terms flow requried | Travis Ralston | 2018-10-03 | 1 | -4/+4 |
| | * | | | | | | Flesh out the fallback auth for terms | Travis Ralston | 2018-10-03 | 1 | -7/+67 |
| | * | | | | | | Supply params for terms auth stage | Travis Ralston | 2018-10-03 | 1 | -0/+9 |
| | * | | | | | | Incorporate Dave's work for GDPR login flows | Travis Ralston | 2018-10-03 | 4 | -0/+40 |
| * | | | | | | | Merge pull request #4128 from matrix-org/erikj/state_res_v2_version | Erik Johnston | 2018-11-01 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add STATE_V2_TEST room version | Erik Johnston | 2018-11-01 | 2 | -2/+7 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-11-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | version | Amber Brown | 2018-11-01 | 1 | -1/+1 |
| | * | | | | | | version bump | Amber Brown | 2018-10-31 | 1 | -1/+1 |
| | * | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| | * | | | | | | version bump | Amber Brown | 2018-10-29 | 1 | -1/+1 |
| * | | | | | | | 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 |
| * | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120) | Amber Brown | 2018-10-31 | 2 | -106/+12 |
| * | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 4 | -113/+1 |
| * | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| * | | | | | | | | Remove the unused /pull federation API (#4118) | Amber Brown | 2018-10-31 | 2 | -14/+0 |
| * | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groups | Erik Johnston | 2018-10-30 | 4 | -48/+137 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Move _find_unreferenced_groups | Erik Johnston | 2018-10-29 | 2 | -81/+83 |
| | * | | | | | | | | Fix set operations thinko | Erik Johnston | 2018-10-29 | 1 | -3/+4 |
| | * | | | | | | | | Don't make temporary list | Erik Johnston | 2018-10-29 | 1 | -3/+2 |
| | * | | | | | | | | Make SQL a bit cleaner | Erik Johnston | 2018-10-29 | 1 | -3/+2 |
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat... | Erik Johnston | 2018-10-26 | 59 | -948/+2189 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | * | | | | | | | | pep8 | Erik Johnston | 2018-10-19 | 1 | -1/+1 |
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat... | Erik Johnston | 2018-10-19 | 49 | -250/+1763 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Batch process handling state groups | Erik Johnston | 2018-10-19 | 2 | -101/+92 |
| | * | | | | | | | | | Fix up comments | Erik Johnston | 2018-10-12 | 1 | -3/+3 |
| | * | | | | | | | | | Add state_group index to event_to_state_groups | Erik Johnston | 2018-10-04 | 3 | -1/+27 |
| | * | | | | | | | | | Delete unreferened state groups during purge | Erik Johnston | 2018-10-04 | 2 | -6/+77 |
| * | | | | | | | | | | Write some tests for the email pusher (#4095) | Amber Brown | 2018-10-30 | 3 | -6/+14 |
| * | | | | | | | | | | Deduplicate device updates sent over replication | Erik Johnston | 2018-10-29 | 1 | -1/+5 |
| * | | | | | | | | | | Don't truncate command name in metrics | Erik Johnston | 2018-10-29 | 1 | -2/+2 |
| * | | | | | | | | | | Delete the disused & unspecced identicon functionality (#4106) | Amber Brown | 2018-10-29 | 4 | -74/+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 |
| * | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_pls | Richard van der Hoff | 2018-10-29 | 1 | -44/+81 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 1 | -44/+81 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 7 | -38/+323 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | optimise state copying | Richard van der Hoff | 2018-10-26 | 1 | -7/+5 |
| | * | | | | | | | | | Address review comments | Richard van der Hoff | 2018-10-26 | 2 | -12/+25 |
| | * | | | | | | | | | 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 | 2 | -4/+6 |
| | * | | | | | | | | | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 5 | -0/+208 |
| | * | | | | | | | | | 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 |
| * | | | | | | | | | | Make the replication logger quieter (#4108) | Amber Brown | 2018-10-29 | 1 | -1/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 2 | -0/+215 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 9 | -420/+603 |
| * | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 5 | -15/+140 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... | Erik Johnston | 2018-10-25 | 46 | -443/+1124 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Use allow/deny | Erik Johnston | 2018-10-25 | 1 | -6/+6 |
| | * | | | | | | | | | Use match rather than search | Erik Johnston | 2018-10-24 | 1 | -2/+3 |
| | * | | | | | | | | | Anchor returned regex to start and end of string | Erik Johnston | 2018-10-19 | 1 | -2/+6 |
| | * | | | | | | | | | Add config option to control alias creation | Erik Johnston | 2018-10-19 | 5 | -15/+135 |
| * | | | | | | | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_init | Neil Johnson | 2018-10-25 | 4 | -31/+84 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | add new line | Neil Johnson | 2018-10-25 | 1 | -0/+1 |
| | * | | | | | | | | | improve comments | Neil Johnson | 2018-10-25 | 1 | -6/+6 |
| | * | | | | | | | | | fix style inconsistencies | Neil Johnson | 2018-10-24 | 2 | -15/+47 |
| | * | | | | | | | | | commit transaction before closing | Neil Johnson | 2018-10-24 | 1 | -0/+1 |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 31 | -368/+994 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | * | | | | | | | | | remove white space | Neil Johnson | 2018-10-23 | 1 | -2/+1 |
| | * | | | | | | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 3 | -25/+45 |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea... | Neil Johnson | 2018-10-25 | 83 | -676/+2779 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid... | Richard van der Hoff | 2018-10-24 | 12 | -67/+665 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | | * | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 6 | -61/+659 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | | | * | | | | | | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 4 | -11/+11 |
| | | | * | | | | | | | | | Update event_auth table for rejected events | Erik Johnston | 2018-10-16 | 1 | -15/+21 |
| | | | * | | | | | | | | | Fix up use of resolve_events_with_factory | Erik Johnston | 2018-10-16 | 1 | -13/+10 |
| | | | * | | | | | | | | | User event.sender rather than alias event.user_id | Erik Johnston | 2018-10-16 | 1 | -1/+1 |
| | | | * | | | | | | | | | Add v2 state res algorithm. | Erik Johnston | 2018-10-16 | 3 | -24/+616 |
| | * | | | | | | | | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+4 |
| | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 7 | -141/+141 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fix start_pushers vs _start_pushers confusion | Richard van der Hoff | 2018-10-24 | 1 | -3/+3 |
| | | * | | | | | | | | | | sanity-check the is_processing flag | Richard van der Hoff | 2018-10-24 | 2 | -8/+14 |
| | | * | | | | | | | | | | Run PusherPool.start as a background process | Richard van der Hoff | 2018-10-22 | 1 | -5/+7 |
| | | * | | | | | | | | | | Make on_started synchronous too | Richard van der Hoff | 2018-10-22 | 3 | -11/+21 |
| | | * | | | | | | | | | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 7 | -50/+14 |
| | | * | | | | | | | | | | Give pushers their own background logcontext | Richard van der Hoff | 2018-10-22 | 2 | -58/+54 |
| | | * | | | | | | | | | | move get_all_pushers call down | Richard van der Hoff | 2018-10-22 | 1 | -3/+9 |
| | | * | | | | | | | | | | Factor PusherPool._start_pusher out of _start_pushers | Richard van der Hoff | 2018-10-22 | 1 | -18/+33 |
| | | * | | | | | | | | | | Rename _refresh_pusher | Richard van der Hoff | 2018-10-22 | 2 | -3/+4 |
| | * | | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 3 | -64/+55 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Clean up room alias creation | Erik Johnston | 2018-10-19 | 3 | -64/+55 |
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 2 | -8/+22 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | 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 | 49 | -314/+590 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | | 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 |
| | | * | | | | | | | | | | Fix exception documentation in matrixfederationclient.py | Travis Ralston | 2018-09-26 | 1 | -6/+6 |
| | * | | | | | | | | | | | 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 | 5 | -80/+96 |
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontexts | Richard van der Hoff | 2018-10-22 | 1 | -8/+22 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 1 | -8/+22 |
| | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutil | Richard van der Hoff | 2018-10-22 | 2 | -10/+5 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 2 | -10/+5 |
| | | |/ / / / / / / / / | |||||
| | * / / / / / / / / / | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on... | Amber Brown | 2018-10-20 | 9 | -71/+70 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 | Richard van der Hoff | 2018-10-19 | 2 | -28/+20 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Calculate absolute path for email templates | Richard van der Hoff | 2018-10-19 | 2 | -28/+20 |
| | * | | | | | | | | | Fix manhole on py3 (pt 2) (#4067) | Amber Brown | 2018-10-19 | 1 | -0/+2 |
| | * | | | | | | | | | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 2 | -16/+21 |
| | * | | | | | | | | | make a bytestring | Amber Brown | 2018-10-19 | 1 | -2/+2 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 11 | -5/+369 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | 0.33.7 v0.33.7 | Richard van der Hoff | 2018-10-18 | 1 | -1/+1 |
| | | * | | | | | | | v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+1 |
| | | * | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-17 | 4 | -35/+25 |
| | | * | | | | | | | Put the warning blob at the top of the file | Richard van der Hoff | 2018-10-17 | 1 | -6/+9 |
| | | * | | | | | | | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 10 | -4/+365 |
| | | * | | | | | | | version bump | Amber Brown | 2018-10-15 | 1 | -1/+1 |
| | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | * | | | | | | | Fix bug where we raised StopIteration in a generator | Erik Johnston | 2018-10-17 | 1 | -2/+5 |
| | * | | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 2 | -3/+10 |
| | * | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 4 | -35/+25 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 3 | -61/+63 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 8 | -0/+1044 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | missed one | David Baker | 2018-10-12 | 1 | -0/+1 |
| | | * | | | | | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| | | * | | | | | Misc PR feedback bits | David Baker | 2018-10-12 | 1 | -2/+2 |
| | | * | | | | | Don't mangle exceptions | David Baker | 2018-10-12 | 1 | -4/+2 |
| | | * | | | | | Split /room_keys/version into 2 servlets | David Baker | 2018-10-12 | 1 | -9/+21 |
| | | * | | | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 3 | -29/+22 |
| | | * | | | | | Fix mergefail | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | * | | | | | isort | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 115 | -1523/+2315 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | 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 |
| | | * | | | | | | Don't reuse backup versions | David Baker | 2018-10-05 | 2 | -3/+9 |
| | | * | | | | | | WIP e2e key backups | David Baker | 2018-09-13 | 2 | -4/+10 |
| | | * | | | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 4 | -4/+10 |
| | | * | | | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -1/+1 |
| | | * | | | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 116 | -1483/+3715 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | allow session_data to be any JSON instead of just a string | Hubert Chathi | 2018-08-21 | 1 | -2/+4 |
| | | * | | | | | | | allow auth_data to be any JSON instead of a string | Hubert Chathi | 2018-08-21 | 1 | -2/+5 |
| | | * | | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | * | | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -0/+1 |
| | | * | | | | | | | use parse_string | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | | * | | | | | | | 404 nicely if you try to interact with a missing current version | Matthew Hodgson | 2018-08-12 | 1 | -16/+35 |
| | | * | | | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| | | * | | | | | | | flake8 | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | * | | | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 3 | -8/+36 |
| | | * | | | | | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| | | * | | | | | | | don't needlessly return user_id | Matthew Hodgson | 2018-08-12 | 1 | -1/+0 |
| | | * | | | | | | | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| | | * | | | | | | | 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 | 2 | -4/+6 |
| | | * | | | | | | | fix typos | Matthew Hodgson | 2018-08-12 | 2 | -2/+3 |
| | | * | | | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 2 | -9/+113 |
| | | * | | | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -20/+31 |
| | | * | | | | | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 2 | -2/+51 |
| | | * | | | | | | | add storage docstring; remove unused set_e2e_room_keys | Matthew Hodgson | 2018-08-12 | 1 | -36/+83 |
| | | * | | | | | | | 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 | 2 | -16/+16 |
| | | * | | | | | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 5 | -79/+99 |
| | | * | | | | | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 4 | -15/+38 |
| | | * | | | | | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 5 | -6/+171 |
| | | * | | | | | | | document the API | Matthew Hodgson | 2018-08-12 | 1 | -0/+133 |
| | | * | | | | | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 7 | -82/+134 |
| | | * | | | | | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 3 | -19/+84 |
| | | * | | | | | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 4 | -0/+289 |
| | * | | | | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3 | Ivan Shapovalov | 2018-10-14 | 1 | -2/+2 |
| | * | | | | | | | | synapse/visibility.py: fix SyntaxError on py3.7 | Ivan Shapovalov | 2018-10-14 | 1 | -1/+1 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Make workers work on Py3 (#4027) | Amber Brown | 2018-10-13 | 11 | -61/+62 |
| | * | | | | | | | Comments on get_all_new_events_stream | Richard van der Hoff | 2018-10-12 | 1 | -1/+15 |
| | * | | | | | | | 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 |
| | * | | | | | | | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptions | Erik Johnston | 2018-10-09 | 2 | -13/+35 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 2 | -31/+16 |
| | | * | | | | | | Use errback pattern and catch async failures | Erik Johnston | 2018-10-08 | 2 | -15/+35 |
| | | * | | | | | | Log looping call exceptions | Erik Johnston | 2018-10-05 | 1 | -1/+18 |
| | * | | | | | | | Optimisation for filter_events_for_server | Richard van der Hoff | 2018-10-08 | 1 | -7/+6 |
| | |/ / / / / / | |||||
| * | | | | | | | isort | Neil Johnson | 2018-10-24 | 1 | -2/+1 |
| * | | | | | | | 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 | 2 | -6/+6 |
| * | | | | | | | clean up config error logic and imports | Neil Johnson | 2018-10-17 | 2 | -19/+20 |
| * | | | | | | | 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 | 2 | -4/+18 |
| * | | | | | | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 17 | -130/+240 |
| |\| | | | | | | |||||
| | * | | | | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers | Richard van der Hoff | 2018-10-04 | 1 | -33/+69 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | actually exclude outliers | Richard van der Hoff | 2018-10-03 | 1 | -1/+2 |
| | | * | | | | | remove debugging | Richard van der Hoff | 2018-10-02 | 1 | -10/+0 |
| | | * | | | | | Fix bug in forward_extremity update logic | Richard van der Hoff | 2018-10-02 | 1 | -33/+78 |
| | * | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-10-04 | 2 | -2/+5 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | full version | Amber Brown | 2018-10-04 | 1 | -1/+1 |
| | | * | | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metrics | Richard van der Hoff | 2018-10-03 | 1 | -1/+4 |
| | | * | | | | | version | Amber Brown | 2018-10-03 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | * | | | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Sanitise error messages when user doesn't have permission to invite | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| | | * | | | | | Fix handling of rejected threepid invites | Erik Johnston | 2018-10-03 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | * | | | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix exception in background metrics collection | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| | | |/ / / / | |||||
| | * / / / / | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
| | |/ / / / | |||||
| | * | | | | Fix bug when invalidating destination retry timings | Erik Johnston | 2018-10-02 | 1 | -1/+1 |
| | * | | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-02 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'develop' into rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-01 | 30 | -142/+299 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Fix error handling for missing auth_event | Richard van der Hoff | 2018-09-26 | 1 | -2/+2 |
| | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 1 | -3/+10 |
| | * | | | | | Fix error when logging incomplete requests | Erik Johnston | 2018-10-02 | 1 | -6/+21 |
| | * | | | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 2 | -22/+23 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 2 | -22/+23 |
| | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Fix lazy loaded sync with rejected state events | Erik Johnston | 2018-10-01 | 1 | -2/+2 |
| | * | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -12/+46 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 20 | -36/+60 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Include event when resolving state for missing prevs | Richard van der Hoff | 2018-09-27 | 1 | -2/+16 |
| | | * | | | | | | Include state from remote servers in pdu handling | Richard van der Hoff | 2018-09-27 | 1 | -4/+19 |
| | | * | | | | | | Fix "unhashable type: 'list'" exception in federation handling | Richard van der Hoff | 2018-09-27 | 1 | -7/+12 |
| | * | | | | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 1 | -1/+1 |
| | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cache | Erik Johnston | 2018-10-01 | 2 | -3/+44 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Correctly match 'dict.pop' api | Erik Johnston | 2018-10-01 | 1 | -3/+11 |
| | | * | | | | | | Don't update eviction metrics on explicit removal | Erik Johnston | 2018-10-01 | 1 | -5/+0 |
| | | * | | | | | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-28 | 27 | -403/+248 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||||
| | | * | | | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-26 | 1 | -10/+17 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-25 | 5 | -21/+48 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-21 | 1 | -12/+9 |
| | | * | | | | | | | | Add a five minute cache to get_destination_retry_timings | Erik Johnston | 2018-09-21 | 2 | -1/+35 |
| | | * | | | | | | | | Make ExpiringCache slightly more performant | Erik Johnston | 2018-09-21 | 1 | -1/+5 |