Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | 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 | 3 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-11-01 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Add STATE_V2_TEST room version | Erik Johnston | 2018-11-01 | 2 | -2/+7 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-11-01 | 31 | -31/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'release-v0.33.8' | Amber Brown | 2018-11-01 | 108 | -1814/+4145 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | changelog v0.33.8 github/release-v0.33.8 release-v0.33.8 | Amber Brown | 2018-11-01 | 1 | -0/+6 | |
| | * | | | | | | | | | | version | Amber Brown | 2018-11-01 | 1 | -1/+1 | |
| | * | | | | | | | | | | changelog v0.33.8rc2 | Amber Brown | 2018-10-31 | 2 | -1/+10 | |
| | * | | | | | | | | | | version bump | Amber Brown | 2018-10-31 | 1 | -1/+1 | |
| | * | | | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 3 | -3/+112 | |
| | * | | | | | | | | | | changelog v0.33.8rc1 | Amber Brown | 2018-10-29 | 30 | -30/+47 | |
| | * | | | | | | | | | | 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 | 3 | -14/+141 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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 | 3 | -14/+142 | |
* | | | | | | | | | | | | | Merge pull request #4125 from MazeChaZer/fix-typo-in-docker-compose | Richard van der Hoff | 2018-10-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix typo in docker-compose.yml | Jonas Schürmann | 2018-10-31 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Log some bits about event creation (#4121) | Richard van der Hoff | 2018-10-31 | 3 | -0/+8 | |
* | | | | | | | | | | | | | | Merge pull request #4124 from matrix-org/rav/fix_tox | Richard van der Hoff | 2018-10-31 | 3 | -19/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-10-30 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | Attempt to fix tox installs | Richard van der Hoff | 2018-10-30 | 2 | -19/+14 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120) | Amber Brown | 2018-10-31 | 3 | -106/+13 | |
* | | | | | | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 5 | -113/+2 | |
* | | | | | | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 3 | -3/+112 | |
* | | | | | | | | | | | | | Remove the unused /pull federation API (#4118) | Amber Brown | 2018-10-31 | 3 | -14/+1 | |
* | | | | | | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groups | Erik Johnston | 2018-10-30 | 5 | -48/+138 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | 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 | 115 | -1683/+3799 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | 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 | 70 | -301/+2020 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Batch process handling state groups | Erik Johnston | 2018-10-19 | 2 | -101/+92 | |
| * | | | | | | | | | | | | | | Fix up comments | Erik Johnston | 2018-10-12 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-04 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | 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 | 10 | -13/+182 | |
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #4109 from matrix-org/erikj/repl_devices | Erik Johnston | 2018-10-29 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-29 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | Deduplicate device updates sent over replication | Erik Johnston | 2018-10-29 | 1 | -1/+5 | |
* | | | | | | | | | | | | | | Merge pull request #4111 from matrix-org/erikj/repl_names | Erik Johnston | 2018-10-29 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-29 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / | 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 | 6 | -113/+1 | |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar | Richard van der Hoff | 2018-10-29 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remember to copy the avatar on room upgrades | Richard van der Hoff | 2018-10-26 | 2 | -1/+3 | |
* | | | | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_pls | Richard van der Hoff | 2018-10-29 | 2 | -44/+82 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 2 | -44/+82 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 9 | -47/+325 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | fix broken test | Richard van der Hoff | 2018-10-25 | 1 | -9/+1 | |
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-10-25 | 1 | -0/+1 | |
| * | | | | | | | | | | | | 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 | 2 | -1/+2 | |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 6 | -202/+378 | |
* | | | | | | | | | | | | Merge pull request #4089 from dekonnection/master | Richard van der Hoff | 2018-10-25 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Make Docker image listening on ipv6 as well as ipv4 | Cédric Laudrel | 2018-10-25 | 2 | -2/+3 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 11 | -485/+714 | |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-10-25 | 2 | -2/+12 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #4072 from steamp0rt/patch-1 | Richard van der Hoff | 2018-10-23 | 2 | -2/+12 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | README.rst: fix minor grammar | Richard van der Hoff | 2018-10-22 | 1 | -3/+3 | |
| | * | | | | | | | | | | Whoops! | steamport | 2018-10-19 | 1 | -1/+1 | |
| | * | | | | | | | | | | I HATE RST | steamport | 2018-10-19 | 1 | -0/+1 | |
| | * | | | | | | | | | | Fix | steamport | 2018-10-19 | 1 | -3/+4 | |
| | * | | | | | | | | | | Fix formatting. | steamport | 2018-10-19 | 1 | -0/+1 | |
| | * | | | | | | | | | | Add CL | steamport | 2018-10-19 | 1 | -0/+1 | |
| | * | | | | | | | | | | Add Caddy example to README | steamport | 2018-10-19 | 1 | -0/+6 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 8 | -15/+256 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... | Erik Johnston | 2018-10-25 | 91 | -948/+2364 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Use allow/deny | Erik Johnston | 2018-10-25 | 3 | -11/+11 | |
| * | | | | | | | | | | | | Use match rather than search | Erik Johnston | 2018-10-24 | 1 | -2/+3 | |
| * | | | | | | | | | | | | Add tests for alias creation rules | Erik Johnston | 2018-10-19 | 1 | -0/+48 | |
| * | | | | | | | | | | | | Add tests for config generation | Erik Johnston | 2018-10-19 | 1 | -0/+67 | |
| * | | | | | | | | | | | | Anchor returned regex to start and end of string | Erik Johnston | 2018-10-19 | 1 | -2/+6 | |
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-19 | 1 | -0/+1 | |
| * | | | | | | | | | | | | 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 | 6 | -33/+94 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 | 4 | -18/+51 | |
| * | | | | | | | | | | | | 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 | 50 | -383/+1704 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | remove white space | Neil Johnson | 2018-10-23 | 2 | -3/+1 | |
| * | | | | | | | | | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 5 | -27/+55 | |
* | | | | | | | | | | | | | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin | Neil Johnson | 2018-10-25 | 6 | -23/+101 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea... | Neil Johnson | 2018-10-25 | 142 | -1205/+4207 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | oops, run the check_isort build | Richard van der Hoff | 2018-10-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Only cache the wheels | Richard van der Hoff | 2018-10-25 | 1 | -2/+10 | |
* | | | | | | | | | | | | | | Combine the pep8 and check_isort builds into one | Richard van der Hoff | 2018-10-25 | 1 | -4/+1 | |
* | | | | | | | | | | | | | | disable coverage checking | Richard van der Hoff | 2018-10-25 | 1 | -4/+1 | |
* | | | | | | | | | | | | | | only fetch develop for check-newsfragments | Richard van der Hoff | 2018-10-24 | 1 | -4/+4 | |
* | | | | | | | | | | | | | | Disable newsfragment checks on branch builds | Richard van der Hoff | 2018-10-24 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | reduce git clone depth | Richard van der Hoff | 2018-10-24 | 1 | -0/+4 | |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | fix branch regexp | Richard van der Hoff | 2018-10-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | also build on release branches | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 | |
* | | | | | | | | | | | | | Disable travis-ci branch builds for most branches | Richard van der Hoff | 2018-10-24 | 1 | -0/+6 | |
* | | | | | | | | | | | | | Merge pull request #4083 from matrix-org/rav/fix_event_filter_validation | Richard van der Hoff | 2018-10-24 | 3 | -2/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid... | Richard van der Hoff | 2018-10-24 | 21 | -81/+1344 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 12 | -20/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 12 | -20/+21 | |
* | | | | | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 9 | -61/+1323 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | isort | Erik Johnston | 2018-10-24 | 1 | -4/+1 | |
| * | | | | | | | | | | | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 5 | -13/+13 | |
| * | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-16 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Add some state res v2 tests | Erik Johnston | 2018-10-16 | 2 | -0/+666 | |
| * | | | | | | | | | | | | | | 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 | 3 | -2/+16 | |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 8 | -141/+142 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-10-22 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | 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 | 4 | -64/+56 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-19 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | 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 | 3 | -8/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | 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 | 120 | -924/+1167 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Remove debugging statement | Travis Ralston | 2018-09-26 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | Changelog | Travis Ralston | 2018-09-26 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | 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 | 3 | -7/+12 | |
* | | | | | | | | | | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 6 | -80/+97 | |
* | | | | | | | | | | | | | | | Merge pull request #3698 from spantaleev/add-matrix-docker-ansible-deploy | Richard van der Hoff | 2018-10-23 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add information about the matrix-docker-ansible-deploy playbook | Slavi Pantaleev | 2018-10-14 | 2 | -0/+7 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontexts | Richard van der Hoff | 2018-10-22 | 2 | -8/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 2 | -8/+23 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutil | Richard van der Hoff | 2018-10-22 | 3 | -10/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 3 | -10/+6 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | uh, Matrix is called Matrix these days... | Matthew Hodgson | 2018-10-21 | 1 | -2/+4 | |
* | | | | | | | | | | | | | | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on... | Amber Brown | 2018-10-20 | 27 | -518/+511 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'rav/fix_email_templates_4065' into develop | Richard van der Hoff | 2018-10-19 | 2 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Remove notes on fallback for email_templates | Richard van der Hoff | 2018-10-19 | 2 | -8/+0 | |
* | | | | | | | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 | Richard van der Hoff | 2018-10-19 | 3 | -28/+21 | |
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Calculate absolute path for email templates | Richard van der Hoff | 2018-10-19 | 3 | -28/+21 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Fix manhole on py3 (pt 2) (#4067) | Amber Brown | 2018-10-19 | 2 | -0/+3 | |
* | | | | | | | | | | | | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 3 | -16/+22 | |
* | | | | | | | | | | | | Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3 | Richard van der Hoff | 2018-10-19 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | changelog | Amber Brown | 2018-10-19 | 1 | -0/+1 | |
| * | | | | | | | | | | | make a bytestring | Amber Brown | 2018-10-19 | 1 | -2/+2 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #4057 from matrix-org/rav/use_correct_python | Amber Brown | 2018-10-19 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Use the right python when starting workers | Richard van der Hoff | 2018-10-18 | 2 | -1/+3 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | / / | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 1 | -0/+17 | |
|\| | | | | | | | | | | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add warnings about the upgrade to 0.33.7 github/release-v0.33.7 release-v0.33.7 | Richard van der Hoff | 2018-10-18 | 1 | -0/+17 | |
* | | | | | | | | | | remove redundant changelog file | Richard van der Hoff | 2018-10-18 | 1 | -1/+0 | |
* | | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 24 | -18/+101 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | 0.33.7 v0.33.7 | Richard van der Hoff | 2018-10-18 | 2 | -3/+6 | |
| * | | | | | | | | | fix changelog formatting v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+4 | |
| * | | | | | | | | | v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+1 | |
| * | | | | | | | | | prep changelog | Richard van der Hoff | 2018-10-17 | 3 | -13/+25 | |
| * | | | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-17 | 5 | -35/+26 | |
| * | | | | | | | | | Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_data | Richard van der Hoff | 2018-10-17 | 13 | -6/+53 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | 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 | 13 | -6/+50 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | update changelog v0.33.7rc1 | Amber Brown | 2018-10-15 | 11 | -10/+28 | |
| * | | | | | | | | | update changelog | Amber Brown | 2018-10-15 | 1 | -2/+1 | |
| * | | | | | | | | | version bump | Amber Brown | 2018-10-15 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4049 from matrix-org/erikj/synctl_colour | Erik Johnston | 2018-10-18 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Assume isatty is always defined, and catch AttributeError. Also don't bother ... | Erik Johnston | 2018-10-17 | 1 | -2/+6 | |
| * | | | | | | | | | Newsfile | Erik Johnston | 2018-10-17 | 1 | -0/+1 | |
| * | | | | | | | | | Only colourise synctl output when attached to tty | Erik Johnston | 2018-10-17 | 1 | -1/+6 | |
* | | | | | | | | | | Merge pull request #4050 from matrix-org/erikj/fix_py37_iteration | Erik Johnston | 2018-10-17 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2018-10-17 | 1 | -0/+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 | 4 | -3/+50 | |
* | | | | | | | | | Merge pull request #4045 from matrix-org/rav/fix_get_missing_events | Richard van der Hoff | 2018-10-17 | 5 | -35/+26 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 5 | -35/+26 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4041 from matrix-org/rav/run_tests_in_docker | Amber Brown | 2018-10-17 | 3 | -43/+51 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use wget rather than curl | Richard van der Hoff | 2018-10-16 | 1 | -2/+2 | |
| * | | | | | | | | changelog | Richard van der Hoff | 2018-10-16 | 1 | -0/+1 | |
| * | | | | | | | | run the circle builds in docker containers | Richard van der Hoff | 2018-10-16 | 1 | -41/+48 | |
|/ / / / / / / / | ||||||
* / / / / / / / | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 4 | -61/+64 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 10 | -0/+1442 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
| * | | | | | | | Add changelog | David Baker | 2018-10-09 | 1 | -0/+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 | 210 | -3221/+5551 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | 5 | -8/+15 | |
| * | | | | | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 2 | -1/+2 | |
| * | | | | | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 232 | -4107/+7197 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | 2 | -16/+57 | |
| * | | | | | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 | |
| * | | | | | | | | | flake8 | Matthew Hodgson | 2018-08-12 | 2 | -9/+14 | |
| * | | | | | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 4 | -33/+287 | |
| * | | | | | | | | | linting | Matthew Hodgson | 2018-08-12 | 1 | -25/+23 | |
| * | | | | | | | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 3 | -11/+15 | |
| * | | | | | | | | | first cut at a UT | Matthew Hodgson | 2018-08-12 | 1 | -0/+141 | |
| * | | | | | | | | | 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 | |
* | | | | | | | | | | Merge pull request #4033 from intelfx/py37-hotfixes | Amber Brown | 2018-10-15 | 3 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3 | Ivan Shapovalov | 2018-10-14 | 2 | -2/+3 | |
| * | | | | | | | | | synapse/visibility.py: fix SyntaxError on py3.7 | Ivan Shapovalov | 2018-10-14 | 2 | -1/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Make workers work on Py3 (#4027) | Amber Brown | 2018-10-13 | 13 | -62/+64 | |
* | | | | | | | | | Comments on get_all_new_events_stream | Richard van der Hoff | 2018-10-12 | 1 | -1/+15 |