| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagat... | David Baker | 2017-04-21 | 7 | -2/+168 |
| |\ \ \ \ \ |
|
| * | | | | | | Propagate errors sensibly from proxied IS requests | David Baker | 2017-04-21 | 3 | -6/+42 |
* | | | | | | | Merge pull request #2175 from matrix-org/erikj/prefill_state | Erik Johnston | 2017-05-03 | 3 | -9/+27 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Update comment | Erik Johnston | 2017-05-03 | 1 | -1/+2 |
| * | | | | | | | Comments | Erik Johnston | 2017-05-03 | 2 | -3/+6 |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state | Erik Johnston | 2017-05-03 | 8 | -6/+35 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | Prefill state caches | Erik Johnston | 2017-05-02 | 3 | -6/+18 |
| | |_|_|_|_|/ /
| |/| | | | | | |
|
* | | | | | | | | Merge pull request #2170 from matrix-org/erikj/fed_hole_state | Erik Johnston | 2017-05-03 | 1 | -21/+12 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | Merge together redundant calculations/logging | Erik Johnston | 2017-05-03 | 1 | -9/+2 |
| * | | | | | | | Fixup | Erik Johnston | 2017-04-28 | 1 | -10/+4 |
| * | | | | | | | Remove unncessary call in _get_missing_events_for_pdu | Erik Johnston | 2017-04-28 | 1 | -13/+11 |
| * | | | | | | | Don't fetch state for missing events that we fetched | Erik Johnston | 2017-04-28 | 1 | -0/+6 |
* | | | | | | | | Merge pull request #2178 from matrix-org/erikj/message_metrics | Erik Johnston | 2017-05-02 | 7 | -5/+32 |
|\ \ \ \ \ \ \ \
| |_|_|_|_|_|/ /
|/| | | | | | | |
|
| * | | | | | | | Add more granular event send metrics | Erik Johnston | 2017-05-02 | 7 | -5/+32 |
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | Merge pull request #2180 from matrix-org/rav/fix_timeout_on_timeout | Richard van der Hoff | 2017-05-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Instantiate DeferredTimedOutError correctly | Richard van der Hoff | 2017-05-02 | 1 | -1/+1 |
| |/ / / / / |
|
* | | | | | | Merge pull request #2080 from matrix-org/erikj/filter_speed | Erik Johnston | 2017-04-28 | 4 | -40/+24 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Remove unused import | Erik Johnston | 2017-04-28 | 1 | -1/+0 |
| * | | | | | We don't care about forgotten rooms | Erik Johnston | 2017-04-28 | 1 | -12/+0 |
| * | | | | | Speed up filtering of a single event in push | Erik Johnston | 2017-04-28 | 4 | -40/+37 |
* | | | | | | Merge pull request #2163 from matrix-org/erikj/fix_invite_state | Erik Johnston | 2017-04-27 | 3 | -7/+26 |
|\ \ \ \ \ \ |
|
| * | | | | | | Comment and remove spurious logging | Erik Johnston | 2017-04-27 | 2 | -1/+3 |
| * | | | | | | Fix tests | Erik Johnston | 2017-04-26 | 1 | -3/+3 |
| * | | | | | | Fix invite state to always include all events | Erik Johnston | 2017-04-26 | 3 | -7/+24 |
| |/ / / / / |
|
* | | | | | | Merge pull request #2127 from APwhitehat/alreadystarted | Erik Johnston | 2017-04-27 | 1 | -0/+3 |
|\ \ \ \ \ \ |
|
| * | | | | | | synctl.py: Check if synapse is already running | Anant Prakash | 2017-04-13 | 1 | -0/+3 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | Merge pull request #2131 from matthewjwolff/develop | Erik Johnston | 2017-04-27 | 3 | -4/+13 |
|\ \ \ \ \ \ |
|
| * | | | | | | Queried CONDITIONAL_REQUIREMENTS | Matthew Wolff | 2017-04-18 | 1 | -2/+5 |
| * | | | | | | Fixed travis build failure | Matthew Wolff | 2017-04-17 | 1 | -3/+1 |
| * | | | | | | web_server_root documentation fix | Matthew Wolff | 2017-04-17 | 3 | -4/+12 |
* | | | | | | | Fix bgupdate error if index already exists (#2167) | Richard van der Hoff | 2017-04-27 | 1 | -30/+53 |
* | | | | | | | Merge pull request #2168 from matrix-org/erikj/federation_logging | Erik Johnston | 2017-04-27 | 1 | -2/+22 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Typo | Erik Johnston | 2017-04-27 | 1 | -1/+1 |
| * | | | | | | | Add some extra logging for edge cases of federation | Erik Johnston | 2017-04-27 | 1 | -2/+22 |
| | |_|/ / / /
| |/| | | | | |
|
* | | | | | | | Merge pull request #2130 from APwhitehat/roomexists | Erik Johnston | 2017-04-27 | 1 | -1/+5 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Check that requested room_id exists | Anant Prakash | 2017-04-14 | 1 | -1/+5 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | Merge pull request #2160 from matrix-org/erikj/reduce_join_cache_size | Erik Johnston | 2017-04-26 | 1 | -2/+3 |
|\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | | |
|
| * | | | | | Make state caches cache in ascii | Erik Johnston | 2017-04-25 | 1 | -2/+3 |
* | | | | | | document how to make IPv6 work (#2088) | Matthew Hodgson | 2017-04-25 | 1 | -0/+19 |
* | | | | | | Merge pull request #2159 from matrix-org/erikj/reduce_join_cache_size | Erik Johnston | 2017-04-25 | 4 | -10/+42 |
|\| | | | | |
|
| * | | | | | fix up | Erik Johnston | 2017-04-25 | 1 | -1/+2 |
| * | | | | | Don't specify default as dict | Erik Johnston | 2017-04-25 | 1 | -1/+1 |
| * | | | | | Comment | Erik Johnston | 2017-04-25 | 1 | -0/+2 |
| * | | | | | Reduce size of joined_user cache | Erik Johnston | 2017-04-25 | 4 | -11/+40 |
* | | | | | | Merge pull request #2149 from enckse/develop | Erik Johnston | 2017-04-25 | 1 | -3/+2 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | clarify metric setup to use 'scrape_configs' section of yaml and use an array... | Sean Enck | 2017-04-21 | 1 | -3/+2 |
* | | | | | | Reduce _get_state_group_for_event cache size | Erik Johnston | 2017-04-25 | 1 | -1/+1 |
* | | | | | | Merge pull request #2158 from matrix-org/erikj/reduce_cache_size | Erik Johnston | 2017-04-25 | 3 | -24/+28 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove DEBUG_CACHES | Erik Johnston | 2017-04-25 | 1 | -2/+0 |
| * | | | | | | Reduce cache size by not storing deferreds | Erik Johnston | 2017-04-25 | 2 | -22/+28 |
* | | | | | | | Merge pull request #2156 from matrix-org/markjh/old_verify_keys | Mark Haines | 2017-04-25 | 1 | -3/+2 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Fix code for reporting old verify keys in synapse | Mark Haines | 2017-04-24 | 1 | -3/+2 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #2145 from matrix-org/rav/reject_invite_to_unreachable_server | Richard van der Hoff | 2017-04-24 | 6 | -54/+130 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Try harder when sending leave events | Richard van der Hoff | 2017-04-21 | 1 | -1/+19 |
| * | | | | | | Remove redundant try/except clauses | Richard van der Hoff | 2017-04-21 | 1 | -23/+11 |
| * | | | | | | Broaden the conditions for locally_rejecting invites | Richard van der Hoff | 2017-04-21 | 1 | -1/+7 |
| * | | | | | | Remove redundant function | Richard van der Hoff | 2017-04-21 | 1 | -10/+5 |
| * | | | | | | Fix some lies, and other clarifications, in docstrings | Richard van der Hoff | 2017-04-21 | 4 | -19/+88 |
| | |_|_|/ /
| |/| | | | |
|
* | | | | | | Merge pull request #2155 from matrix-org/erikj/string_intern | Erik Johnston | 2017-04-24 | 1 | -18/+11 |
|\ \ \ \ \ \ |
|
| * | | | | | | Only intern ascii strings | Erik Johnston | 2017-04-24 | 1 | -18/+11 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | Merge pull request #2154 from matrix-org/erikj/remove_unused_cache | Erik Johnston | 2017-04-24 | 2 | -9/+1 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Remove unused cache | Erik Johnston | 2017-04-24 | 2 | -9/+1 |
|/ / / / / |
|
* / / / / | Document some of the admin APIs (#2143) | Richard van der Hoff | 2017-04-21 | 1 | -0/+73 |
|/ / / / |
|
* | | | | m.read_marker -> m.fully_read (#2128) | Luke Barnard | 2017-04-18 | 3 | -9/+9 |
* | | | | Merge pull request #2132 from feld/patch-1 | Matthew Hodgson | 2017-04-17 | 1 | -1/+1 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Update README.rst | Mark Felder | 2017-04-17 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge pull request #2120 from matrix-org/luke/read-markers | Luke Barnard | 2017-04-13 | 6 | -1/+167 |
|\ \ \
| |_|/
|/| | |
|
| * | | Correct logic in is_event_after | Luke Barnard | 2017-04-13 | 1 | -1/+1 |
| * | | Simplify is_event_after logic | Luke Barnard | 2017-04-12 | 2 | -12/+6 |
| * | | More null-guard changes | Luke Barnard | 2017-04-12 | 1 | -4/+4 |
| * | | Remove Unused ref to hs | Luke Barnard | 2017-04-12 | 1 | -1/+0 |
| * | | Move a space | Luke Barnard | 2017-04-12 | 1 | -2/+2 |
| * | | Only notify user, not entire room | Luke Barnard | 2017-04-12 | 1 | -3/+1 |
| * | | Remove comment, simplify null-guard | Luke Barnard | 2017-04-12 | 1 | -4/+1 |
| * | | Handle no previous RM | Luke Barnard | 2017-04-12 | 1 | -1/+4 |
| * | | travis flake8.. | Luke Barnard | 2017-04-11 | 1 | -0/+1 |
| * | | flake8 | Luke Barnard | 2017-04-11 | 1 | -1/+0 |
| * | | Refactor event ordering check to events store | Luke Barnard | 2017-04-11 | 2 | -28/+32 |
| * | | Copyright | Luke Barnard | 2017-04-11 | 1 | -1/+1 |
| * | | flake8 | Luke Barnard | 2017-04-11 | 3 | -5/+4 |
| * | | Finish implementing RM endpoint | Luke Barnard | 2017-04-11 | 5 | -48/+67 |
| * | | Initial commit of RM server-side impl | lukebarnard | 2017-04-11 | 2 | -0/+153 |
* | | | Merge pull request #2115 from matrix-org/erikj/dedupe_federation_repl | Erik Johnston | 2017-04-12 | 7 | -130/+203 |
|\ \ \ |
|
| * | | | Comment | Erik Johnston | 2017-04-12 | 1 | -2/+1 |
| * | | | Reuse get_interested_parties | Erik Johnston | 2017-04-12 | 2 | -19/+8 |
| * | | | Move get_presence_list_* to SlaveStore | Erik Johnston | 2017-04-11 | 3 | -24/+13 |
| * | | | Comment | Erik Johnston | 2017-04-11 | 2 | -1/+9 |
| * | | | Move get_interested_parties | Erik Johnston | 2017-04-11 | 2 | -38/+36 |
| * | | | Comments | Erik Johnston | 2017-04-11 | 2 | -9/+10 |
| * | | | Move get_interested_remotes back to presence handler | Erik Johnston | 2017-04-11 | 2 | -38/+55 |
| * | | | Comments | Erik Johnston | 2017-04-11 | 1 | -1/+14 |
| * | | | Reduce federation presence replication traffic | Erik Johnston | 2017-04-10 | 6 | -80/+139 |
* | | | | Merge pull request #2121 from matrix-org/paul/sent-transactions-metric | Paul Evans | 2017-04-12 | 1 | -0/+3 |
|\ \ \ \ |
|
| * | | | | Add a counter metric for successfully-sent transactions | Paul "LeoNerd" Evans | 2017-04-11 | 1 | -0/+3 |
* | | | | | Merge pull request #2116 from matrix-org/erikj/dedupe_federation_repl2 | Erik Johnston | 2017-04-12 | 1 | -6/+24 |
|\ \ \ \ \ |
|
| * | | | | | Add some comments | Erik Johnston | 2017-04-12 | 1 | -0/+15 |
| * | | | | | Use generators | Erik Johnston | 2017-04-10 | 1 | -2/+2 |
| * | | | | | Dedupe KeyedEdu and Devices federation repl traffic | Erik Johnston | 2017-04-10 | 1 | -6/+9 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge pull request #2117 from matrix-org/erikj/remove_http_replication | Erik Johnston | 2017-04-12 | 8 | -990/+11 |
|\ \ \ \ \ |
|
| * | | | | | Remove last reference to worker_replication_url | Erik Johnston | 2017-04-12 | 1 | -1/+2 |
| * | | | | | Update replication docs | Erik Johnston | 2017-04-11 | 1 | -22/+4 |
| * | | | | | Update workers docs | Erik Johnston | 2017-04-11 | 1 | -10/+5 |
| * | | | | | Remove test of replication resource | Erik Johnston | 2017-04-11 | 1 | -204/+0 |
| * | | | | | Remove HTTP replication APIs | Erik Johnston | 2017-04-11 | 5 | -753/+0 |
| |/ / / / |
|
* | | | | | Merge pull request #2118 from matrix-org/erikj/no_devices | Erik Johnston | 2017-04-12 | 1 | -0/+3 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Bail on where clause instead | Erik Johnston | 2017-04-11 | 1 | -3/+4 |
| * | | | | Don't bother with outer check for now | Erik Johnston | 2017-04-11 | 1 | -3/+0 |
| * | | | | Fix getting latest device IP for user with no devices | Erik Johnston | 2017-04-11 | 1 | -0/+5 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-04-11 | 3 | -5/+14 |
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| * | | Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse v0.20.0 | Erik Johnston | 2017-04-11 | 100 | -1348/+3717 |
| |\ \ |
|
| | * | | Bump changelog github/release-v0.20.0 release-v0.20.0 | Erik Johnston | 2017-04-11 | 1 | -1/+1 |
| | * | | Merge pull request #2110 from matrix-org/rav/fix_reject_persistence | Richard van der Hoff | 2017-04-07 | 1 | -4/+4 |
| | |\ \ |
|
| | | * | | When we do an invite rejection, save the signed leave event to the db | Richard van der Hoff | 2017-04-07 | 1 | -4/+4 |
| | |/ / |
|
| | * | | Bump version and changelog | Erik Johnston | 2017-04-07 | 2 | -1/+10 |
* | | | | trust a hypothetical future riot.im IS | Matthew Hodgson | 2017-04-10 | 1 | -0/+1 |
| |_|/
|/| | |
|
* | | | Typo | Erik Johnston | 2017-04-10 | 1 | -1/+1 |
* | | | Merge pull request #2102 from DanielDent/add-auth-email | David Baker | 2017-04-10 | 2 | -1/+21 |
|\ \ \ |
|
| * | | | Support authenticated SMTP | Daniel Dent | 2017-04-05 | 2 | -1/+21 |
* | | | | Merge pull request #2109 from matrix-org/erikj/send_queue_fix | Erik Johnston | 2017-04-10 | 3 | -92/+245 |
|\ \ \ \ |
|
| * | | | | Rename variable | Erik Johnston | 2017-04-10 | 1 | -7/+7 |
| * | | | | Revert to sending the same data type as before | Erik Johnston | 2017-04-10 | 1 | -2/+2 |
| * | | | | Change name | Erik Johnston | 2017-04-10 | 1 | -2/+2 |
| * | | | | Comments | Erik Johnston | 2017-04-10 | 2 | -6/+8 |
| * | | | | Comment | Erik Johnston | 2017-04-07 | 1 | -2/+15 |
| * | | | | Add logging | Erik Johnston | 2017-04-07 | 1 | -0/+8 |
| * | | | | Fix up federation SendQueue and document types | Erik Johnston | 2017-04-07 | 2 | -91/+221 |
* | | | | | Up replication ping timeout | Erik Johnston | 2017-04-10 | 1 | -2/+4 |
* | | | | | Merge pull request #2108 from matrix-org/erikj/current_state_ids | Erik Johnston | 2017-04-07 | 1 | -10/+26 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Comment | Erik Johnston | 2017-04-07 | 1 | -0/+9 |
| * | | | | Speed up get_current_state_ids | Erik Johnston | 2017-04-07 | 1 | -10/+17 |
|/ / / / |
|
* | | | | Merge pull request #2107 from HarHarLinks/patch-1 | Erik Johnston | 2017-04-07 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | fix typo in synctl help | Kim Brose | 2017-04-06 | 1 | -1/+1 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #2103 from matrix-org/erikj/no-double-encode | Erik Johnston | 2017-04-07 | 5 | -47/+88 |
|\ \ \ \ |
|
| * | | | | Document types of the replication streams | Erik Johnston | 2017-04-06 | 1 | -28/+76 |
| * | | | | Don't double json encode typing replication data | Erik Johnston | 2017-04-05 | 2 | -6/+2 |
| * | | | | Don't double json encode federation replication data | Erik Johnston | 2017-04-05 | 2 | -13/+10 |
* | | | | | Use iteritems | Erik Johnston | 2017-04-06 | 1 | -2/+2 |
* | | | | | Merge pull request #2106 from matrix-org/erikj/reduce_user_sync | Erik Johnston | 2017-04-06 | 1 | -4/+43 |
|\ \ \ \ \ |
|
| * | | | | | Comment | Erik Johnston | 2017-04-06 | 1 | -1/+1 |
| * | | | | | Docs | Erik Johnston | 2017-04-06 | 1 | -0/+7 |
| * | | | | | Don't immediately notify the master about users whose syncs have gone away | Erik Johnston | 2017-04-05 | 1 | -4/+36 |
| |/ / / / |
|
* | | | | | Fix incorrect type when using InvalidateCacheCommand | Erik Johnston | 2017-04-06 | 1 | -1/+1 |
* | | | | | Add log lines | Erik Johnston | 2017-04-05 | 1 | -1/+2 |
* | | | | | Merge pull request #2104 from matrix-org/erikj/metrics_tcp | Erik Johnston | 2017-04-05 | 1 | -7/+38 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Rearrange metrics | Erik Johnston | 2017-04-05 | 2 | -19/+31 |
| * | | | | Fix typo | Erik Johnston | 2017-04-05 | 1 | -2/+2 |
| * | | | | Fixup some metrics for tcp repl | Erik Johnston | 2017-04-05 | 2 | -0/+19 |
|/ / / / |
|
* | | | | Merge pull request #2097 from matrix-org/erikj/repl_tcp_client | Erik Johnston | 2017-04-05 | 21 | -582/+602 |
|\ \ \ \ |
|
| * | | | | Add comment | Erik Johnston | 2017-04-04 | 1 | -0/+5 |
| * | | | | Add the appropriate amount of preserve_fn | Erik Johnston | 2017-04-04 | 4 | -17/+19 |
| * | | | | Remove unused worker config option | Erik Johnston | 2017-04-04 | 1 | -1/+0 |
| * | | | | Shuffle and comment synchrotron presence | Erik Johnston | 2017-04-04 | 1 | -9/+11 |
| * | | | | Move where we ack federation | Erik Johnston | 2017-04-04 | 1 | -7/+16 |
| * | | | | Update all the workers and master to use TCP replication | Erik Johnston | 2017-04-03 | 9 | -401/+259 |
| * | | | | Change slave storage to use new replication interface | Erik Johnston | 2017-04-03 | 11 | -179/+128 |
| * | | | | Add basic replication client handler and factory | Erik Johnston | 2017-04-03 | 1 | -0/+196 |
* | | | | | Merge pull request #2099 from matrix-org/erikj/deviceinbox_reduce | Erik Johnston | 2017-04-05 | 1 | -4/+7 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | Deduplicate new deviceinbox rows for replication | Erik Johnston | 2017-04-04 | 1 | -4/+7 |
|/ / / / |
|
* | | | | Merge pull request #2098 from matrix-org/erikj/repl_tcp_fix | Erik Johnston | 2017-04-04 | 3 | -6/+15 |
|\ \ \ \ |
|
| * | | | | Advance replication streams even if nothing is listening | Erik Johnston | 2017-04-04 | 3 | -6/+15 |
* | | | | | Fiddle tcp replication logging | Erik Johnston | 2017-04-04 | 1 | -2/+2 |
|/ / / / |
|
* | | | | Merge pull request #2082 from matrix-org/erikj/repl_tcp_server | Erik Johnston | 2017-04-04 | 15 | -20/+2156 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_s... | Erik Johnston | 2017-04-04 | 28 | -180/+489 |
| |\ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
* | | | | Merge pull request #2095 from matrix-org/rav/cull_log_preserves | Richard van der Hoff | 2017-04-03 | 4 | -43/+31 |
|\ \ \ \ |
|
| * | | | | Remove spurious yield | Richard van der Hoff | 2017-04-03 | 1 | -1/+1 |
| * | | | | Remove more spurious `PreserveLoggingContext`s | Richard van der Hoff | 2017-04-03 | 1 | -24/+19 |
| * | | | | Remove spurious PreserveLoggingContext | Richard van der Hoff | 2017-04-03 | 1 | -6/+5 |
| * | | | | preserve_fn some deferred-returning things | Richard van der Hoff | 2017-04-03 | 1 | -2/+5 |
| * | | | | Fix fixme in preserve_fn | Richard van der Hoff | 2017-04-03 | 1 | -5/+1 |
| * | | | | Remove spurious @preserve_fn decorators | Richard van der Hoff | 2017-04-03 | 1 | -5/+0 |
* | | | | | Merge remote-tracking branch 'origin/release-v0.20.0' into develop | Richard van der Hoff | 2017-04-03 | 2 | -5/+19 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | Merge pull request #2094 from matrix-org/rav/fix_federation_join | Richard van der Hoff | 2017-04-03 | 2 | -5/+19 |
| |\ \ \ \ |
|
| | * | | | | Accept join events from all servers | Richard van der Hoff | 2017-04-03 | 2 | -5/+19 |
| |/ / / / |
|
* | / / / | Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-04-03 | 2 | -1/+45 |
|\| | | |
| |/ / /
|/| | | |
|
| * | | | Bump version and changelog v0.20.0-rc1 | Erik Johnston | 2017-03-30 | 2 | -1/+45 |
* | | | | Merge pull request #2078 from APwhitehat/assertuserfriendly | Erik Johnston | 2017-03-31 | 1 | -1/+2 |
|\ \ \ \ |
|
| * | | | | add user friendly report of assertion error in synctl.py | Anant Prakash | 2017-03-29 | 1 | -1/+2 |
* | | | | | Merge pull request #1984 from RyanBreaker/patch-1 | Erik Johnston | 2017-03-31 | 1 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | Add --upgrade pip | Ryan Breaker | 2017-03-13 | 1 | -0/+1 |
| * | | | | | Add missing package to CentOS section | Ryan Breaker | 2017-03-10 | 1 | -2/+2 |
* | | | | | | Merge pull request #2011 from matrix-org/matthew/turn_allow_guests | Erik Johnston | 2017-03-31 | 3 | -5/+46 |
|\ \ \ \ \ \ |
|
| * | | | | | | typo | Matthew Hodgson | 2017-03-15 | 1 | -1/+1 |
| * | | | | | | set default for turn_allow_guests correctly | Matthew Hodgson | 2017-03-15 | 1 | -1/+1 |
| * | | | | | | add setting (on by default) to support TURN for guests | Matthew Hodgson | 2017-03-15 | 3 | -5/+46 |
* | | | | | | | Merge pull request #1986 from matrix-org/matthew/enable_guest_3p | Erik Johnston | 2017-03-31 | 1 | -4/+4 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | switch to allow_guest=True for authing 3Ps as per PR feedback | Matthew Hodgson | 2017-03-31 | 1 | -0/+8 |
| * | | | | | | | enable guest access for the 3pl/3pid APIs | Matthew Hodgson | 2017-03-12 | 1 | -8/+0 |
* | | | | | | | | Merge pull request #2024 from jerrykan/db_port_schema | Erik Johnston | 2017-03-31 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Don't assume postgres tables are in the public schema during db port | John Kristensen | 2017-03-17 | 1 | -3/+1 |
* | | | | | | | | | Merge pull request #1961 from benhylau/patch-1 | Erik Johnston | 2017-03-31 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Clarify doc for SQLite to PostgreSQL port | Benedict Lau | 2017-03-01 | 1 | -3/+3 |
| | |_|_|/ / / / /
| |/| | | | | | | |
|
* | | | | | | | | | Merge pull request #1927 from zuckschwerdt/fix-nuke-script | Erik Johnston | 2017-03-31 | 1 | -10/+33 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | bring nuke-room script to current schema | Christian W. Zuckschwerdt | 2017-02-19 | 1 | -10/+33 |
* | | | | | | | | | | Merge pull request #2075 from matrix-org/erikj/cache_speed | Erik Johnston | 2017-03-31 | 7 | -16/+87 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Remove unused instance variable | Erik Johnston | 2017-03-31 | 1 | -4/+0 |
| * | | | | | | | | | | Docs | Erik Johnston | 2017-03-30 | 1 | -0/+5 |
| * | | | | | | | | | | Revert log context change | Erik Johnston | 2017-03-30 | 1 | -3/+0 |
| * | | | | | | | | | | Doc new instance variables | Erik Johnston | 2017-03-30 | 1 | -1/+8 |
| * | | | | | | | | | | Fix up tests | Erik Johnston | 2017-03-30 | 3 | -2/+42 |
| * | | | | | | | | | | Manually calculate cache key as getcallargs is expensive | Erik Johnston | 2017-03-30 | 1 | -6/+28 |
| * | | | | | | | | | | Don't convert to deferreds when not necessary | Erik Johnston | 2017-03-30 | 5 | -8/+12 |
* | | | | | | | | | | | Merge pull request #2076 from matrix-org/erikj/as_perf | Erik Johnston | 2017-03-31 | 2 | -19/+23 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Add comment | Erik Johnston | 2017-03-29 | 1 | -1/+1 |
| * | | | | | | | | | | | Cache whether an AS is interested based on members | Erik Johnston | 2017-03-28 | 1 | -1/+9 |
| * | | | | | | | | | | | Remove param and cast at call site | Erik Johnston | 2017-03-28 | 1 | -8/+6 |
| * | | | | | | | | | | | Compile the regex's used in ASes | Erik Johnston | 2017-03-28 | 2 | -10/+8 |
* | | | | | | | | | | | | Merge pull request #2083 from matrix-org/erikj/copy_replace_speed | Erik Johnston | 2017-03-31 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Speed up copy_and_replace | Erik Johnston | 2017-03-30 | 1 | -3/+1 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #2079 from matrix-org/erikj/push_regex_cache | Erik Johnston | 2017-03-30 | 1 | -47/+57 |
|\ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Cache glob to regex at a higher level for push | Erik Johnston | 2017-03-29 | 1 | -47/+57 |
* | | | | | | | | | | | Fix the logcontext handling in the cache wrappers (#2077) | Richard van der Hoff | 2017-03-30 | 4 | -19/+136 |
| | | | | | | | | * | | Always advance stream tokens | Erik Johnston | 2017-04-03 | 1 | -1/+4 |
| | | | | | | | | * | | Use callbacks to notify tcp replication rather than deferreds | Erik Johnston | 2017-03-31 | 2 | -20/+12 |
| | | | | | | | | * | | Add a timestamp to USER_SYNC command | Erik Johnston | 2017-03-31 | 4 | -16/+24 |
| | | | | | | | | * | | Fix up presence | Erik Johnston | 2017-03-31 | 1 | -1/+3 |
| | | | | | | | | * | | Add a brief list of commands to docs | Erik Johnston | 2017-03-31 | 1 | -0/+46 |
| | | | | | | | | * | | Fix up docs | Erik Johnston | 2017-03-31 | 4 | -28/+12 |
| | | | | | | | | * | | Remove user from process_presence when stops syncing | Erik Johnston | 2017-03-30 | 1 | -0/+1 |
| | | | | | | | | * | | Fix indentation in docs/ | Erik Johnston | 2017-03-30 | 1 | -25/+28 |
| | | | | | | | | * | | Add tcp replication listener type and hook it up | Erik Johnston | 2017-03-30 | 1 | -0/+11 |
| | | | | | | | | * | | Add functions to presence to support remote syncs | Erik Johnston | 2017-03-30 | 1 | -0/+66 |
| | | | | | | | | * | | Add server side resource for tcp replication | Erik Johnston | 2017-03-30 | 1 | -0/+300 |
| | | | | | | | | * | | Initial TCP protocol implementation | Erik Johnston | 2017-03-30 | 4 | -0/+1148 |
| | | | | | | | | * | | Define the various streams we will replicate | Erik Johnston | 2017-03-30 | 2 | -0/+423 |
| | | | | | | | | * | | Make federation send queue take the current position | Erik Johnston | 2017-03-30 | 2 | -16/+26 |
| | | | | | | | | * | | Add a simple hook to wait for replication traffic | Erik Johnston | 2017-03-30 | 1 | -0/+6 |
| | | | | | | | | * | | Add new storage functions for new replication | Erik Johnston | 2017-03-30 | 5 | -4/+137 |
| |_|_|_|_|_|_|_|/ /
|/| | | | | | | | | |
|
* | | | | | | | | | | Use txn.fetchall() so we can reuse txn | Erik Johnston | 2017-03-30 | 1 | -1/+1 |
* | | | | | | | | | | synctl.py: wait for synapse to stop before restarting (#2020) | Anant Prakash | 2017-03-29 | 1 | -4/+43 |
|/ / / / / / / / / |
|
* | | | | | | / / | Increase cache size for _get_state_group_for_event | Erik Johnston | 2017-03-29 | 1 | -1/+1 |
| |_|_|_|_|_|/ /
|/| | | | | | | |
|
* | | | | | | | | Merge pull request #1849 from matrix-org/erikj/state_typo | Erik Johnston | 2017-03-29 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Fix bug where current_state_events renamed to current_state_ids | Erik Johnston | 2017-01-23 | 1 | -3/+3 |
* | | | | | | | | | Bail early if remote wouldn't be retried (#2064) | Erik Johnston | 2017-03-29 | 1 | -2/+8 |
* | | | | | | | | | Merge pull request #2053 from matrix-org/erikj/e2e_one_time_upsert | Erik Johnston | 2017-03-29 | 1 | -9/+50 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Decrank last commit | Erik Johnston | 2017-03-29 | 1 | -4/+5 |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_ti... | Erik Johnston | 2017-03-29 | 45 | -593/+828 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Correctly look up key | Erik Johnston | 2017-03-29 | 1 | -6/+5 |
| * | | | | | | | | | | The algorithm is part of the key id | Erik Johnston | 2017-03-28 | 1 | -4/+4 |
| * | | | | | | | | | | Raise a more helpful exception | Erik Johnston | 2017-03-23 | 1 | -2/+4 |
| * | | | | | | | | | | Don't user upsert to persist new one time keys | Erik Johnston | 2017-03-23 | 1 | -9/+48 |
* | | | | | | | | | | | Merge pull request #2067 from matrix-org/erikj/notify_on_fed | Erik Johnston | 2017-03-29 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Notify on new federation traffic | Erik Johnston | 2017-03-27 | 1 | -0/+7 |
* | | | | | | | | | | | Merge pull request #2037 from ricco386/fix_readme_centos_issues | Richard van der Hoff | 2017-03-29 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Removed requirement that is not needed | Richard Kellner | 2017-03-22 | 1 | -1/+1 |
| * | | | | | | | | | | | Updated user creation section | Richard Kellner | 2017-03-20 | 1 | -0/+1 |
| * | | | | | | | | | | | Added missing system requiremnt and pip upgrade before install | Richard Kellner | 2017-03-20 | 1 | -1/+2 |
* | | | | | | | | | | | | Merge pull request #2063 from matrix-org/erikj/device_list_batch | Erik Johnston | 2017-03-28 | 2 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Batch sending of device list pokes | Erik Johnston | 2017-03-24 | 2 | -0/+5 |
| | |/ / / / / / / / /
| |/| | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #2070 from matrix-org/erikj/perf_send | Erik Johnston | 2017-03-27 | 1 | -36/+51 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Typo | Erik Johnston | 2017-03-27 | 1 | -1/+1 |