Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_s... | Erik Johnston | 2017-04-04 | 17 | -152/+228 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | 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 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | 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 | 1 | -1/+1 | |
| |\| | | | | |/ / | |/| | | ||||||
| | * | | Bump version and changelog v0.20.0-rc1 | Erik Johnston | 2017-03-30 | 1 | -1/+1 | |
| * | | | 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 #2011 from matrix-org/matthew/turn_allow_guests | Erik Johnston | 2017-03-31 | 2 | -1/+12 | |
| |\ \ \ \ | ||||||
| | * | | | | 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 | 2 | -1/+12 | |
| * | | | | | 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 #2075 from matrix-org/erikj/cache_speed | Erik Johnston | 2017-03-31 | 4 | -14/+45 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 | |
| | * | | | | | | 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 | 1 | -18/+20 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | 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 | 1 | -9/+5 | |
| * | | | | | | | | 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 | 2 | -16/+37 | |
* | | | | | | | | 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 | |
* | | | | | | | | Fix up docs | Erik Johnston | 2017-03-31 | 3 | -20/+4 | |
* | | | | | | | | Remove user from process_presence when stops syncing | Erik Johnston | 2017-03-30 | 1 | -0/+1 | |
* | | | | | | | | 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 | 3 | -0/+974 | |
* | | | | | | | | 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 | 37 | -588/+717 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | 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 #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 | |
| |/ / / / / / | ||||||
* | | | | | | | Typo | Erik Johnston | 2017-03-27 | 1 | -1/+1 | |
* | | | | | | | Short circuit if all new events have same state group | Erik Johnston | 2017-03-27 | 1 | -36/+51 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2062 from matrix-org/erikj/presence_replication | Erik Johnston | 2017-03-24 | 2 | -2/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Actually call invalidate | Erik Johnston | 2017-03-24 | 1 | -1/+1 | |
| * | | | | | | Use presence replication stream to invalidate cache | Erik Johnston | 2017-03-24 | 2 | -2/+3 | |
* | | | | | | | Merge pull request #2061 from matrix-org/erikj/add_transaction_store | Erik Johnston | 2017-03-24 | 2 | -0/+4 | |
|\| | | | | | | ||||||
| * | | | | | | Add slave transaction store | Erik Johnston | 2017-03-24 | 2 | -0/+4 | |
* | | | | | | | Merge pull request #2060 from matrix-org/erikj/cache_hosts_in_room | Erik Johnston | 2017-03-24 | 2 | -2/+11 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Cache hosts in room | Erik Johnston | 2017-03-24 | 2 | -2/+11 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2058 from matrix-org/rav/logcontext_leaks_2 | Richard van der Hoff | 2017-03-24 | 1 | -12/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | try not to drop context after federation requests | Richard van der Hoff | 2017-03-23 | 1 | -12/+16 | |
* | | | | | | | | Merge pull request #2057 from matrix-org/rav/missing_yield_2 | Richard van der Hoff | 2017-03-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add another missing yield on check_device_registered | Richard van der Hoff | 2017-03-23 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #2054 from matrix-org/erikj/user_iter_cursor | Erik Johnston | 2017-03-24 | 17 | -129/+99 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Replace some calls to cursor_to_dict | Erik Johnston | 2017-03-24 | 3 | -39/+13 | |
| * | | | | | | | | Use iter(items|values) | Erik Johnston | 2017-03-24 | 3 | -51/+48 | |
| * | | | | | | | | User Cursor.__iter__ instead of fetchall | Erik Johnston | 2017-03-23 | 15 | -39/+38 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2055 from matrix-org/dbkr/fix_add_msisdn_requestToken | David Baker | 2017-03-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Oops, remove unintentional change | David Baker | 2017-03-23 | 1 | -7/+0 | |
| * | | | | | | | | Fix token request for addition of phone numbers | David Baker | 2017-03-23 | 2 | -1/+8 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2056 from matrix-org/dbkr/fix_invite_reject | David Baker | 2017-03-24 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix rejection of invites not reaching sync | David Baker | 2017-03-23 | 1 | -0/+7 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2050 from matrix-org/rav/federation_backoff | Richard van der Hoff | 2017-03-23 | 9 | -314/+350 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Ignore backoff history for invites, aliases, and roomdirs | Richard van der Hoff | 2017-03-23 | 6 | -14/+52 | |
| * | | | | | | | push federation retry limiter down to matrixfederationclient | Richard van der Hoff | 2017-03-23 | 7 | -287/+278 | |
| * | | | | | | | MatrixFederationHttpClient: clean up | Richard van der Hoff | 2017-03-23 | 1 | -17/+24 | |
* | | | | | | | | Merge pull request #2052 from matrix-org/rav/time_bound_deferred | Richard van der Hoff | 2017-03-23 | 1 | -4/+6 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix time_bound_deferred to throw the right exception | Richard van der Hoff | 2017-03-23 | 1 | -4/+6 | |
| |/ / / / / / | ||||||
* | | | | | | | Add jsonschema to python_dependencies.py | pik | 2017-03-23 | 1 | -0/+1 | |
* | | | | | | | use jsonschema.FormatChecker for RoomID and UserID strings | pik | 2017-03-23 | 1 | -18/+27 | |
* | | | | | | | Add valid filter tests, flake8, fix typo | pik | 2017-03-23 | 1 | -5/+6 | |
* | | | | | | | check_valid_filter using JSONSchema | pik | 2017-03-23 | 1 | -93/+158 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #2048 from matrix-org/rav/missing_yield | Richard van der Hoff | 2017-03-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add a missing yield in device key upload | Richard van der Hoff | 2017-03-23 | 1 | -1/+1 | |
* | | | | | | | Fix a couple of logcontext leaks | Richard van der Hoff | 2017-03-23 | 2 | -5/+5 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2044 from matrix-org/rav/crypto_docs | Richard van der Hoff | 2017-03-22 | 2 | -4/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix up some key verif docstrings | Richard van der Hoff | 2017-03-21 | 2 | -4/+24 | |
* | | | | | | | Merge pull request #2042 from matrix-org/rav/fix_key_caching | Richard van der Hoff | 2017-03-22 | 1 | -63/+72 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix caching of remote servers' signature keys | Richard van der Hoff | 2017-03-22 | 1 | -63/+72 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'master' into develop | Matthew Hodgson | 2017-03-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | ||||||
| * | | | | Bump changelog and version github/release-v0.19.3 release-v0.19.3 | Erik Johnston | 2017-03-20 | 1 | -1/+1 | |
| * | | | | Bump changelog and versions v0.19.3-rc2 | Erik Johnston | 2017-03-13 | 1 | -1/+1 | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3 | Erik Johnston | 2017-03-13 | 39 | -223/+1320 | |
| |\ \ \ \ | ||||||
| * | | | | | Bump changelog and version | Erik Johnston | 2017-03-08 | 1 | -1/+1 | |
* | | | | | | Merge pull request #2033 from matrix-org/erikj/repl_speed | Erik Johnston | 2017-03-21 | 4 | -53/+38 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | PEP8 | Erik Johnston | 2017-03-20 | 2 | -3/+0 | |
| * | | | | | | Don't send the full event json over replication | Erik Johnston | 2017-03-17 | 4 | -50/+38 | |
* | | | | | | | Add some debug to help diagnose weird federation issue | Richard van der Hoff | 2017-03-20 | 1 | -1/+8 | |
* | | | | | | | Merge pull request #2026 from matrix-org/rav/logcontext_docs | Richard van der Hoff | 2017-03-20 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Logcontext docs | Richard van der Hoff | 2017-03-17 | 1 | -0/+10 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2027 from matrix-org/rav/logcontext_leaks | Richard van der Hoff | 2017-03-20 | 11 | -62/+86 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Stop preserve_fn leaking context into the reactor | Richard van der Hoff | 2017-03-18 | 2 | -34/+32 | |
| * | | | | | | | Run the reactor with the sentinel logcontext | Richard van der Hoff | 2017-03-18 | 8 | -16/+51 | |
| * | | | | | | | Remove broken use of clock.call_later | Richard van der Hoff | 2017-03-18 | 1 | -12/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Avoid resetting state on rejected events | Richard van der Hoff | 2017-03-17 | 2 | -4/+14 | |
* | | | | | | | Refactoring and cleanups | Richard van der Hoff | 2017-03-17 | 5 | -80/+264 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2016 from matrix-org/rav/queue_pdus_during_join | Richard van der Hoff | 2017-03-17 | 2 | -24/+69 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Queue up federation PDUs while a room join is in progress | Richard van der Hoff | 2017-03-15 | 1 | -24/+44 | |
| * | | | | | | Implement reset_context_after_deferred | Richard van der Hoff | 2017-03-15 | 1 | -0/+25 | |
* | | | | | | | Comments | Erik Johnston | 2017-03-16 | 2 | -2/+4 | |
* | | | | | | | Comment | Erik Johnston | 2017-03-16 | 1 | -3/+8 | |
* | | | | | | | Don't recreate so many sets | Erik Johnston | 2017-03-16 | 10 | -51/+42 | |
* | | | | | | | Implement no op for room stream in sync | Erik Johnston | 2017-03-16 | 1 | -4/+47 | |
* | | | | | | | Merge pull request #2014 from Half-Shot/hs/fix-appservice-presence | Erik Johnston | 2017-03-15 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add a great comment to handle_timeout for active vs sync times. | Will Hunt | 2017-03-15 | 1 | -0/+2 | |
| * | | | | | | | Add fallback to last_active_ts if it beats the last sync time. | Will Hunt | 2017-03-15 | 1 | -1/+2 | |
* | | | | | | | | Comment | Erik Johnston | 2017-03-15 | 1 | -1/+3 | |
* | | | | | | | | Cache set of users whose presence the other user should see | Erik Johnston | 2017-03-15 | 1 | -13/+27 | |
* | | | | | | | | Comment | Erik Johnston | 2017-03-15 | 2 | -0/+6 | |
* | | | | | | | | Remove unused import | Erik Johnston | 2017-03-15 | 1 | -1/+0 | |
* | | | | | | | | Format presence events on the edges instead of reformatting them multiple times | Erik Johnston | 2017-03-15 | 7 | -39/+80 | |
* | | | | | | | | Merge pull request #1997 from matrix-org/dbkr/cas_partialdownload | David Baker | 2017-03-15 | 1 | -1/+8 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Handle PartialDownloadError in CAS login | David Baker | 2017-03-14 | 1 | -1/+8 | |
* | | | | | | | | Fix assertion to stop transaction queue getting wedged | Richard van der Hoff | 2017-03-15 | 6 | -5/+29 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Add some metrics on notifier | Erik Johnston | 2017-03-15 | 1 | -0/+6 | |
* | | | | | | | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2 | Erik Johnston | 2017-03-15 | 9 | -50/+412 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use extend instead of += | David Baker | 2017-03-14 | 1 | -4/+4 | |
| * | | | | | | | Oops, remove print | David Baker | 2017-03-14 | 1 | -1/+0 | |
| * | | | | | | | Fix registration for broken clients | David Baker | 2017-03-13 | 1 | -4/+22 | |
| * | | | | | | | Support registration / login with phone number | David Baker | 2017-03-13 | 9 | -50/+395 | |
* | | | | | | | | Merge pull request #1992 from matrix-org/rav/fix_media_loop | Richard van der Hoff | 2017-03-14 | 4 | -24/+121 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Address review comments | Richard van der Hoff | 2017-03-14 | 2 | -20/+31 | |
| * | | | | | | | | re-refactor exception heirarchy | Richard van der Hoff | 2017-03-14 | 1 | -16/+14 | |
| * | | | | | | | | Fix routing loop when fetching remote media | Richard van der Hoff | 2017-03-13 | 4 | -14/+102 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2002 from matrix-org/erikj/dont_sync_by_default | Erik Johnston | 2017-03-14 | 1 | -13/+31 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Reduce spurious calls to generate sync | Erik Johnston | 2017-03-14 | 1 | -13/+31 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_lis... | Erik Johnston | 2017-03-14 | 25 | -590/+488 | |
|\| | | | | | | | ||||||
| * | | | | | | | Fix current_state_events table to not lie | Erik Johnston | 2017-03-14 | 1 | -3/+28 | |
| * | | | | | | | Merge pull request #1993 from matrix-org/luke/delete-devices | Luke Barnard | 2017-03-14 | 4 | -0/+139 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | Implement _simple_delete_many_txn, use it to delete devices | Luke Barnard | 2017-03-13 | 4 | -11/+101 | |
| | * | | | | | | Flake | Luke Barnard | 2017-03-13 | 1 | -0/+2 | |
| | * | | | | | | Implement delete_devices API | Luke Barnard | 2017-03-13 | 1 | -0/+47 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #1990 from matrix-org/rav/log_config_comments | Richard van der Hoff | 2017-03-13 | 1 | -5/+7 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Add helpful texts to logger config options | Richard van der Hoff | 2017-03-13 | 1 | -5/+7 | |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pdu | Richard van der Hoff | 2017-03-13 | 22 | -423/+160 | |
| |\| | | | | | ||||||
| | * | | | | | Merge pull request #1983 from matrix-org/rav/no_redirect_stdio | Richard van der Hoff | 2017-03-13 | 9 | -14/+38 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Add an option to disable stdio redirect | Richard van der Hoff | 2017-03-10 | 1 | -1/+12 | |
| | | * | | | | | Refactor logger config for workers | Richard van der Hoff | 2017-03-10 | 9 | -13/+26 | |
| | * | | | | | | Merge pull request #1982 from matrix-org/rav/sighup_for_logconfig | Richard van der Hoff | 2017-03-13 | 1 | -10/+19 | |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | | * | | | | | Reread log config on SIGHUP | Richard van der Hoff | 2017-03-10 | 1 | -10/+19 | |
| | | |/ / / / | ||||||
| | * | | | | | Revert "Support registration & login with phone number" | Erik Johnston | 2017-03-13 | 9 | -395/+50 | |
| * | | | | | | Move FederationServer._handle_new_pdu to FederationHandler | Richard van der Hoff | 2017-03-09 | 2 | -198/+198 | |
| * | | | | | | Move sig check out of _handle_new_pdu | Richard van der Hoff | 2017-03-09 | 1 | -12/+36 | |
| * | | | | | | Factor _get_missing_events_for_pdu out of _handle_new_pdu | Richard van der Hoff | 2017-03-09 | 1 | -62/+82 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Add new storage function to slave store | Erik Johnston | 2017-03-13 | 1 | -0/+4 | |
* | | | | | | Comments | Erik Johnston | 2017-03-13 | 1 | -0/+12 | |
* | | | | | | Assume rooms likely haven't changed | Erik Johnston | 2017-03-13 | 2 | -8/+14 | |
* | | | | | | Get current state by using current_state_events table | Erik Johnston | 2017-03-10 | 5 | -31/+52 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Fix it for the workers | Erik Johnston | 2017-03-10 | 1 | -0/+8 | |
* | | | | | Noop repated delete device inbox calls from /sync | Erik Johnston | 2017-03-10 | 2 | -4/+38 | |
* | | | | | Add setdefault key to ExpiringCache | Erik Johnston | 2017-03-10 | 1 | -0/+7 | |
|/ / / / | ||||||
* | | / | Fix docstring | Richard van der Hoff | 2017-03-09 | 1 | -2/+1 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #1971 from matrix-org/dbkr/msisdn_signin | David Baker | 2017-03-09 | 9 | -50/+395 | |
|\ \ \ | ||||||
| * | | | Comment when our 3pids would be incomplete | David Baker | 2017-03-08 | 1 | -0/+2 | |
| * | | | Docs | David Baker | 2017-03-08 | 1 | -0/+13 | |
| * | | | Incorrectly copied copyright | David Baker | 2017-03-08 | 1 | -1/+0 | |
| * | | | Not any more, it doesn't | David Baker | 2017-03-08 | 1 | -1/+0 | |
| * | | | Better error message | David Baker | 2017-03-08 | 1 | -1/+3 | |
| * | | | pep8 | David Baker | 2017-03-08 | 2 | -1/+2 | |
| * | | | Add msisdn util file | David Baker | 2017-03-08 | 1 | -0/+27 | |
| * | | | Pull out datastore in initialiser | David Baker | 2017-03-08 | 1 | -5/+10 | |
| * | | | Minor fixes from PR feedback | David Baker | 2017-03-08 | 2 | -5/+3 | |
| * | | | Fix log line | David Baker | 2017-03-08 | 1 | -1/+1 | |
| * | | | Typos | David Baker | 2017-03-08 | 1 | -2/+2 | |
| * | | | Refector out assert_params_in_request | David Baker | 2017-03-08 | 3 | -37/+27 | |
| * | | | Factor out msisdn canonicalisation | David Baker | 2017-03-08 | 4 | -41/+11 | |
| * | | | Fix pep8 | David Baker | 2017-03-08 | 4 | -7/+7 | |
| * | | | Support new login format | David Baker | 2017-03-07 | 1 | -6/+91 | |
| * | | | Add msisdns as 3pids during registration | David Baker | 2017-03-03 | 1 | -0/+47 | |
| * | | | Just return the deferred straight off | David Baker | 2017-03-01 | 1 | -4/+2 | |
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin | David Baker | 2017-03-01 | 30 | -168/+618 | |
| |\ \ \ | ||||||
| * | | | | WIP support for msisdn 3pid proxy methods | David Baker | 2017-02-14 | 6 | -19/+228 | |
* | | | | | Remove spurious SQL logging (#1972) | Richard van der Hoff | 2017-03-08 | 1 | -8/+0 | |
* | | | | | Select distinct devices from DB | Erik Johnston | 2017-03-06 | 1 | -1/+1 | |
* | | | | | Merge pull request #1964 from matrix-org/erikj/device_list_update_fix | Erik Johnston | 2017-03-03 | 1 | -47/+123 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't keep around old stream IDs forever | Erik Johnston | 2017-03-03 | 1 | -2/+9 | |
| * | | | | | Spelling | Erik Johnston | 2017-03-03 | 1 | -2/+2 | |
| * | | | | | Fix device list update to not constantly resync | Erik Johnston | 2017-03-01 | 1 | -46/+115 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Fix up | Erik Johnston | 2017-03-03 | 2 | -8/+8 | |
* | | | | | Add index to device_lists_stream | Erik Johnston | 2017-03-01 | 3 | -4/+28 | |
* | | | | | Clobber old device list stream entries | Erik Johnston | 2017-03-01 | 1 | -0/+10 | |
|/ / / / | ||||||
* | | | | Don't log unknown cache warnings in workers | Erik Johnston | 2017-02-28 | 1 | -1/+3 | |
* | | | | Merge pull request #1959 from matrix-org/erikj/intern_once | Erik Johnston | 2017-02-28 | 1 | -3/+2 | |
|\ \ \ \ | ||||||
| * | | | | Intern table column names once | Erik Johnston | 2017-02-28 | 1 | -3/+2 | |
* | | | | | Add stream_id index to device_lists_outbound_pokes | Erik Johnston | 2017-02-28 | 2 | -1/+17 | |
|/ / / / | ||||||
* | | | | Fix up txn name | Erik Johnston | 2017-02-28 | 1 | -1/+1 | |
* | | | | Pop with default value to stop throwing | Erik Johnston | 2017-02-28 | 1 | -1/+1 | |
* | | | | Merge pull request #1955 from matrix-org/erikj/current_state_query_bypass | Erik Johnston | 2017-02-27 | 1 | -0/+15 | |
|\ \ \ \ | ||||||
| * | | | | Remove needless check | Erik Johnston | 2017-02-27 | 1 | -2/+0 | |
| * | | | | It should be all | Erik Johnston | 2017-02-27 | 1 | -1/+1 | |
| * | | | | Don't fetch current state in common case | Erik Johnston | 2017-02-27 | 1 | -0/+17 | |
* | | | | | Pop rather than del from dict | Erik Johnston | 2017-02-27 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1954 from matrix-org/erikj/cache_device2 | Erik Johnston | 2017-02-27 | 1 | -45/+73 | |
|\ \ \ \ | ||||||
| * | | | | Cache get_user_devices_from_cache | Erik Johnston | 2017-02-27 | 1 | -45/+73 | |
* | | | | | Merge pull request #1945 from jkolo/fix_dynamic_thumbnails_aspect | Erik Johnston | 2017-02-27 | 1 | -0/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix dynamic thumbnails aspect | Jurek | 2017-02-24 | 1 | -0/+3 | |
* | | | | | | Strip newlines from SQL queries | Erik Johnston | 2017-02-23 | 1 | -0/+6 | |
* | | | | | | Remove lock from rotate notifs | Erik Johnston | 2017-02-22 | 1 | -3/+0 | |
* | | | | | | Ensure we pass positive ints to delay function | Erik Johnston | 2017-02-22 | 1 | -1/+2 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Store looping call | Erik Johnston | 2017-02-21 | 1 | -1/+3 | |
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-02-21 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Bump version and changelog github/release-v0.19.2 release-v0.19.2 | Erik Johnston | 2017-02-21 | 1 | -1/+1 | |
| * | | | | Remove unused param | Erik Johnston | 2017-02-20 | 2 | -2/+1 | |
| * | | | | Fix /context/ visibiltiy rules | Erik Johnston | 2017-02-20 | 1 | -1/+4 | |
* | | | | | Fix a race in transaction queue | Richard van der Hoff | 2017-02-20 | 1 | -9/+21 | |
* | | | | | Remove unused param | Erik Johnston | 2017-02-20 | 2 | -2/+1 | |
* | | | | | Fix /context/ visibiltiy rules | Erik Johnston | 2017-02-20 | 1 | -1/+4 | |
* | | | | | Fix up notif rotation | Erik Johnston | 2017-02-18 | 1 | -14/+22 | |
* | | | | | Merge pull request #1925 from matrix-org/dbkr/pushers_lang_lengthen | David Baker | 2017-02-17 | 1 | -0/+39 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use TEXT rather than VARCHAR | David Baker | 2017-02-17 | 1 | -6/+6 | |
| * | | | | | Make the pushers lang field column longer | David Baker | 2017-02-17 | 1 | -0/+39 | |
* | | | | | | Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_ban | David Baker | 2017-02-17 | 1 | -1/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Allow forgetting rooms you're banned from | David Baker | 2017-02-15 | 1 | -1/+3 | |
* | | | | | | Comment | Erik Johnston | 2017-02-16 | 1 | -1/+4 | |
* | | | | | | Comment | Erik Johnston | 2017-02-16 | 1 | -7/+14 | |
* | | | | | | Store the default push actions in a more efficient manner | Erik Johnston | 2017-02-16 | 1 | -11/+40 | |
* | | | | | | Merge pull request #1916 from matrix-org/erikj/push_actions_delete | Erik Johnston | 2017-02-16 | 4 | -57/+254 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Less aggressive timers | Erik Johnston | 2017-02-14 | 1 | -2/+2 |