Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #2226 from matrix-org/erikj/domain_from_id | Erik Johnston | 2017-05-16 | 1 | -3/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Speed up get_domain_from_id | Erik Johnston | 2017-05-16 | 1 | -3/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2224 from matrix-org/erikj/prefill_state | Erik Johnston | 2017-05-16 | 3 | -9/+26 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove spurious merge artifacts | Erik Johnston | 2017-05-16 | 1 | -13/+0 | |
| * | | | | | Take a copy before prefilling, as it may be a frozendict | Erik Johnston | 2017-05-16 | 1 | -1/+1 | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state | Erik Johnston | 2017-05-15 | 6 | -1/+38 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Update comment | Erik Johnston | 2017-05-15 | 1 | -1/+2 | |
| * | | | | | | Comments | Erik Johnston | 2017-05-15 | 2 | -3/+6 | |
| * | | | | | | Add more granular event send metrics | Erik Johnston | 2017-05-15 | 1 | -0/+12 | |
| * | | | | | | Prefill state caches | Erik Johnston | 2017-05-15 | 3 | -6/+20 | |
| | | | | | * | replaced json.dumps with encode_canonical_json | Krombel | 2017-06-21 | 1 | -1/+2 | |
| | | | | | * | Merge branch 'develop' into avoid_duplicate_filters | Krombel | 2017-05-16 | 10 | -13/+101 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge pull request #2218 from matrix-org/rav/event_search_index | Richard van der Hoff | 2017-05-16 | 4 | -12/+63 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Add a comment to old delta | Richard van der Hoff | 2017-05-11 | 1 | -0/+4 | |
| * | | | | | | Don't create event_search index on sqlite | Richard van der Hoff | 2017-05-11 | 2 | -3/+11 | |
| * | | | | | | Add more logging for purging | Richard van der Hoff | 2017-05-11 | 1 | -7/+14 | |
| * | | | | | | Add an index to event_search | Richard van der Hoff | 2017-05-11 | 3 | -3/+35 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2221 from psaavedra/sync_timeline_limit_filter_by_name | Erik Johnston | 2017-05-15 | 4 | -0/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed syntax nits | Pablo Saavedra | 2017-05-15 | 2 | -5/+6 | |
| * | | | | | | Fixed implementation errors | Pablo Saavedra | 2017-05-15 | 2 | -3/+7 | |
| * | | | | | | Configurable maximum number of events requested by /sync and /messages (#2220) | Pablo Saavedra | 2017-05-13 | 4 | -0/+21 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2223 from matrix-org/erikj/ignore_not_retrying | Erik Johnston | 2017-05-15 | 1 | -1/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Don't log exceptions for NotRetryingDestination | Erik Johnston | 2017-05-15 | 1 | -1/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2215 from hamber-dick/develop | Erik Johnston | 2017-05-15 | 1 | -0/+9 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Merge pull request #1 from hamber-dick/dev-branch-hamber-dick | hamber-dick | 2017-05-10 | 1 | -0/+9 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Documantation to chek synapse version | hamber-dick | 2017-05-10 | 1 | -0/+9 | |
| |/ / / / / | ||||||
| | | | | * | avoid access-error if no filter_id matches | Krombel | 2017-05-15 | 1 | -3/+3 | |
| | | | | * | insert whitespace to fix travis build | Krombel | 2017-05-12 | 1 | -1/+1 | |
| | | | | * | add check to only add a new filter if the same filter does not exist previously | Krombel | 2017-05-11 | 1 | -0/+9 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #2214 from matrix-org/rav/hurry_up_purge | Richard van der Hoff | 2017-05-11 | 1 | -20/+42 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Tidy purge code and add some comments | Richard van der Hoff | 2017-05-11 | 1 | -12/+19 | |
| * | | | | Don't de-delta state groups we're about to delete | Richard van der Hoff | 2017-05-10 | 1 | -11/+9 | |
| * | | | | add some logging to purge_history | Richard van der Hoff | 2017-05-10 | 1 | -4/+21 | |
* | | | | | Merge pull request #2213 from matrix-org/luke/username-availability-qp | Luke Barnard | 2017-05-11 | 2 | -5/+11 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Modify condition on empty localpart | Luke Barnard | 2017-05-10 | 1 | -1/+1 | |
| * | | | | Modify register/available to be GET with query param | Luke Barnard | 2017-05-10 | 2 | -5/+11 | |
|/ / / / | ||||||
* | | | | Merge pull request #2208 from matrix-org/erikj/ratelimit_overrid | Erik Johnston | 2017-05-10 | 6 | -19/+93 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Add per user ratelimiting overrides | Erik Johnston | 2017-05-10 | 6 | -19/+93 | |
* | | | | Merge pull request #2206 from matrix-org/rav/one_time_key_upload_change_sig | Richard van der Hoff | 2017-05-10 | 4 | -36/+239 | |
|\ \ \ \ | ||||||
| * | | | | Replace some instances of preserve_context_over_deferred | Richard van der Hoff | 2017-05-09 | 1 | -3/+3 | |
| * | | | | Do some logging when one-time-keys get claimed | Richard van der Hoff | 2017-05-09 | 3 | -0/+54 | |
| * | | | | Allow clients to upload one-time-keys with new sigs | Richard van der Hoff | 2017-05-09 | 3 | -33/+182 | |
| |/ / / | ||||||
* | | | | Merge pull request #2209 from matrix-org/luke/username-availability-post | Luke Barnard | 2017-05-10 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Change register/available to POST (from GET) | Luke Barnard | 2017-05-10 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-05-08 | 2 | -1/+63 | |
|\| | | ||||||
| * | | Bump version and changelog v0.21.0-rc2 | Erik Johnston | 2017-05-08 | 2 | -1/+14 | |
| * | | Bump version and changelog v0.21.0-rc1 | Erik Johnston | 2017-05-08 | 2 | -1/+50 | |
* | | | Merge pull request #2203 from matrix-org/erikj/event_cache_hit_ratio | Erik Johnston | 2017-05-08 | 3 | -5/+27 | |
|\ \ \ | ||||||
| * | | | Expand docstring a bit | Erik Johnston | 2017-05-08 | 1 | -1/+7 | |
| * | | | Don't update event cache hit ratio from get_joined_users | Erik Johnston | 2017-05-08 | 3 | -5/+21 | |
* | | | | Merge pull request #2201 from matrix-org/erikj/store_device_cache | Erik Johnston | 2017-05-08 | 1 | -3/+22 | |
|\ \ \ \ | ||||||
| * | | | | Add missing yields | Erik Johnston | 2017-05-08 | 1 | -2/+4 | |
| * | | | | Invalidate cache on device deletion | Erik Johnston | 2017-05-08 | 1 | -2/+6 | |
| * | | | | Comment | Erik Johnston | 2017-05-08 | 1 | -0/+2 | |
| * | | | | Cache check to see if device exists | Erik Johnston | 2017-05-08 | 1 | -1/+12 | |
| |/ / / | ||||||
* | | | | Merge pull request #2202 from matrix-org/erikj/cache_count_device | Erik Johnston | 2017-05-08 | 1 | -0/+9 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Cache one time key counts | Erik Johnston | 2017-05-08 | 1 | -0/+9 | |
|/ / / | ||||||
* | | | Increase client_ip cache size | Erik Johnston | 2017-05-08 | 1 | -0/+1 | |
* | | | Merge pull request #2200 from matrix-org/erikj/revert_push | Erik Johnston | 2017-05-08 | 4 | -24/+53 | |
|\ \ \ | ||||||
| * | | | Revert "Remove unused import" | Erik Johnston | 2017-05-08 | 1 | -0/+1 | |
| * | | | Revert "We don't care about forgotten rooms" | Erik Johnston | 2017-05-08 | 1 | -0/+12 | |
| * | | | Revert "Speed up filtering of a single event in push" | Erik Johnston | 2017-05-08 | 4 | -24/+40 | |
| |/ / | ||||||
* | | | Merge pull request #2190 from matrix-org/erikj/mark_remote_as_back_more | Erik Johnston | 2017-05-05 | 2 | -7/+9 | |
|\ \ \ | ||||||
| * | | | Use preserve_fn and add logs | Erik Johnston | 2017-05-05 | 1 | -1/+3 | |
| * | | | Remove redundant reset of destination timers | Erik Johnston | 2017-05-05 | 1 | -7/+0 | |
| * | | | Always mark remotes as up if we receive a signed request from them | Erik Johnston | 2017-05-05 | 1 | -0/+7 | |
* | | | | Merge pull request #2189 from matrix-org/erikj/handle_remote_device_list | Erik Johnston | 2017-05-05 | 1 | -1/+28 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Comment | Erik Johnston | 2017-05-05 | 1 | -0/+6 | |
| * | | | Add comment and TODO | Erik Johnston | 2017-05-05 | 1 | -0/+6 | |
| * | | | Handle exceptions thrown in handling remote device list updates | Erik Johnston | 2017-05-05 | 1 | -1/+16 | |
| |/ / | ||||||
* | | | Merge pull request #2192 from matrix-org/kegan/simple-http-client-timeouts | Kegsay | 2017-05-05 | 1 | -14/+21 | |
|\ \ \ | ||||||
| * | | | Remember how twisted works | Kegan Dougal | 2017-05-05 | 1 | -2/+2 | |
| * | | | Include the clock | Kegan Dougal | 2017-05-05 | 1 | -0/+1 | |
| * | | | Rewrite SimpleHttpClient.request to include timeouts | Kegan Dougal | 2017-05-05 | 1 | -13/+19 | |
* | | | | Merge pull request #2176 from matrix-org/erikj/faster_get_joined | Erik Johnston | 2017-05-05 | 1 | -16/+42 | |
|\ \ \ \ | ||||||
| * | | | | Fixes | Erik Johnston | 2017-05-05 | 1 | -3/+4 | |
| * | | | | Add comment | Erik Johnston | 2017-05-04 | 1 | -0/+3 | |
| * | | | | Make get_joined_users faster | Erik Johnston | 2017-05-03 | 1 | -16/+38 | |
* | | | | | Merge pull request #2185 from matrix-org/erikj/smaller_caches | Erik Johnston | 2017-05-05 | 2 | -11/+35 | |
|\ \ \ \ \ | ||||||
| * | | | | | Optimise caches with single key | Erik Johnston | 2017-05-04 | 1 | -9/+33 | |
| * | | | | | Reduce size of get_users_in_room | Erik Johnston | 2017-05-04 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #2174 from matrix-org/erikj/current_cache_hosts | Erik Johnston | 2017-05-05 | 4 | -5/+54 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Intern host strings | Erik Johnston | 2017-05-04 | 1 | -1/+2 | |
| * | | | | Make caches bigger | Erik Johnston | 2017-05-04 | 1 | -1/+1 | |
| * | | | | Fix comment and num args | Erik Johnston | 2017-05-04 | 2 | -2/+2 | |
| * | | | | Add new storage functions to slave store | Erik Johnston | 2017-05-04 | 1 | -0/+3 | |
| * | | | | Add cache for get_current_hosts_in_room | Erik Johnston | 2017-05-02 | 3 | -5/+50 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2186 from matrix-org/revert-2175-erikj/prefill_state | Erik Johnston | 2017-05-04 | 3 | -27/+9 | |
|\ \ \ \ | ||||||
| * | | | | Revert "Prefill state caches" | Erik Johnston | 2017-05-04 | 3 | -27/+9 | |
|/ / / / | ||||||
* | | | | Merge pull request #2183 from matrix-org/luke/username-availability | Luke Barnard | 2017-05-04 | 1 | -0/+41 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Appease the flake8 gods | Luke Barnard | 2017-05-03 | 1 | -5/+10 | |
| * | | | Implement username availability checker | Luke Barnard | 2017-05-03 | 1 | -0/+36 | |
* | | | | Merge pull request #2147 from matrix-org/dbkr/http_request_propagate_error | David Baker | 2017-05-03 | 3 | -4/+41 | |
|\ \ \ \ | ||||||
| * | | | | No need for the exception variable | David Baker | 2017-05-03 | 1 | -1/+1 | |
| * | | | | List caught expection types | David Baker | 2017-05-03 | 1 | -1/+1 | |
| * | | | | Remove debugging | David Baker | 2017-04-26 | 1 | -2/+1 | |
| * | | | | Revert accidental commit | David Baker | 2017-04-26 | 1 | -4/+4 | |
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagat... | David Baker | 2017-04-26 | 19 | -122/+309 | |
| |\ \ \ \ | ||||||
| * | | | | | Fix get_json | David Baker | 2017-04-26 | 1 | -5/+4 | |
| * | | | | | Use CodeMessageException subclass instead | David Baker | 2017-04-25 | 4 | -61/+51 | |
| * | | | | | Need the HTTP status code | David Baker | 2017-04-21 | 1 | -5/+5 | |
| * | | | | | Do the same for get_json | David Baker | 2017-04-21 | 1 | -8/+21 | |
| * | | | | | Don't error for 3xx responses | David Baker | 2017-04-21 | 1 | -1/+1 | |
| * | | | | | 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 | |
|/ / / / |