summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* CommentsErik Johnston2017-04-111-1/+14
* Reduce federation presence replication trafficErik Johnston2017-04-106-80/+139
* TypoErik Johnston2017-04-101-1/+1
* Merge pull request #2102 from DanielDent/add-auth-emailDavid Baker2017-04-102-1/+21
|\
| * Support authenticated SMTPDaniel Dent2017-04-052-1/+21
* | Merge pull request #2109 from matrix-org/erikj/send_queue_fixErik Johnston2017-04-103-92/+245
|\ \
| * | Rename variableErik Johnston2017-04-101-7/+7
| * | Revert to sending the same data type as beforeErik Johnston2017-04-101-2/+2
| * | Change nameErik Johnston2017-04-101-2/+2
| * | CommentsErik Johnston2017-04-102-6/+8
| * | CommentErik Johnston2017-04-071-2/+15
| * | Add loggingErik Johnston2017-04-071-0/+8
| * | Fix up federation SendQueue and document typesErik Johnston2017-04-072-91/+221
* | | Up replication ping timeoutErik Johnston2017-04-101-2/+4
* | | Merge pull request #2108 from matrix-org/erikj/current_state_idsErik Johnston2017-04-071-10/+26
|\ \ \ | |/ / |/| |
| * | CommentErik Johnston2017-04-071-0/+9
| * | Speed up get_current_state_idsErik Johnston2017-04-071-10/+17
|/ /
* | Merge pull request #2107 from HarHarLinks/patch-1Erik Johnston2017-04-071-1/+1
|\ \
| * | fix typo in synctl helpKim Brose2017-04-061-1/+1
* | | Merge pull request #2103 from matrix-org/erikj/no-double-encodeErik Johnston2017-04-075-47/+88
|\ \ \
| * | | Document types of the replication streamsErik Johnston2017-04-061-28/+76
| * | | Don't double json encode typing replication dataErik Johnston2017-04-052-6/+2
| * | | Don't double json encode federation replication dataErik Johnston2017-04-052-13/+10
* | | | Use iteritemsErik Johnston2017-04-061-2/+2
* | | | Merge pull request #2106 from matrix-org/erikj/reduce_user_syncErik Johnston2017-04-061-4/+43
|\ \ \ \
| * | | | CommentErik Johnston2017-04-061-1/+1
| * | | | DocsErik Johnston2017-04-061-0/+7
| * | | | Don't immediately notify the master about users whose syncs have gone awayErik Johnston2017-04-051-4/+36
| |/ / /
* | | | Fix incorrect type when using InvalidateCacheCommandErik Johnston2017-04-061-1/+1
* | | | Add log linesErik Johnston2017-04-051-1/+2
* | | | Merge pull request #2104 from matrix-org/erikj/metrics_tcpErik Johnston2017-04-051-7/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Rearrange metricsErik Johnston2017-04-052-19/+31
| * | | Fix typoErik Johnston2017-04-051-2/+2
| * | | Fixup some metrics for tcp replErik Johnston2017-04-052-0/+19
|/ / /
* | | Merge pull request #2097 from matrix-org/erikj/repl_tcp_clientErik Johnston2017-04-0521-582/+602
|\ \ \
| * | | Add commentErik Johnston2017-04-041-0/+5
| * | | Add the appropriate amount of preserve_fnErik Johnston2017-04-044-17/+19
| * | | Remove unused worker config optionErik Johnston2017-04-041-1/+0
| * | | Shuffle and comment synchrotron presenceErik Johnston2017-04-041-9/+11
| * | | Move where we ack federationErik Johnston2017-04-041-7/+16
| * | | Update all the workers and master to use TCP replicationErik Johnston2017-04-039-401/+259
| * | | Change slave storage to use new replication interfaceErik Johnston2017-04-0311-179/+128
| * | | Add basic replication client handler and factoryErik Johnston2017-04-031-0/+196
* | | | Merge pull request #2099 from matrix-org/erikj/deviceinbox_reduceErik Johnston2017-04-051-4/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Deduplicate new deviceinbox rows for replicationErik Johnston2017-04-041-4/+7
|/ / /
* | | Merge pull request #2098 from matrix-org/erikj/repl_tcp_fixErik Johnston2017-04-043-6/+15
|\ \ \
| * | | Advance replication streams even if nothing is listeningErik Johnston2017-04-043-6/+15
* | | | Fiddle tcp replication loggingErik Johnston2017-04-041-2/+2
|/ / /
* | | Merge pull request #2082 from matrix-org/erikj/repl_tcp_serverErik Johnston2017-04-0415-20/+2156
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_s...Erik Johnston2017-04-0428-180/+489
| |\ \ \ | |/ / / |/| / / | |/ /
* | | Merge pull request #2095 from matrix-org/rav/cull_log_preservesRichard van der Hoff2017-04-034-43/+31
|\ \ \
| * | | Remove spurious yieldRichard van der Hoff2017-04-031-1/+1
| * | | Remove more spurious `PreserveLoggingContext`sRichard van der Hoff2017-04-031-24/+19
| * | | Remove spurious PreserveLoggingContextRichard van der Hoff2017-04-031-6/+5
| * | | preserve_fn some deferred-returning thingsRichard van der Hoff2017-04-031-2/+5
| * | | Fix fixme in preserve_fnRichard van der Hoff2017-04-031-5/+1
| * | | Remove spurious @preserve_fn decoratorsRichard van der Hoff2017-04-031-5/+0
* | | | Merge remote-tracking branch 'origin/release-v0.20.0' into developRichard van der Hoff2017-04-032-5/+19
|\ \ \ \
| * \ \ \ Merge pull request #2094 from matrix-org/rav/fix_federation_joinRichard van der Hoff2017-04-032-5/+19
| |\ \ \ \
| | * | | | Accept join events from all serversRichard van der Hoff2017-04-032-5/+19
| |/ / / /
* | / / / Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse into developErik Johnston2017-04-032-1/+45
|\| | | | | |/ / / |/| | |
| * | | Bump version and changelog v0.20.0-rc1Erik Johnston2017-03-302-1/+45
* | | | Merge pull request #2078 from APwhitehat/assertuserfriendlyErik Johnston2017-03-311-1/+2
|\ \ \ \
| * | | | add user friendly report of assertion error in synctl.pyAnant Prakash2017-03-291-1/+2
* | | | | Merge pull request #1984 from RyanBreaker/patch-1Erik Johnston2017-03-311-2/+2
|\ \ \ \ \
| * | | | | Add --upgrade pipRyan Breaker2017-03-131-0/+1
| * | | | | Add missing package to CentOS sectionRyan Breaker2017-03-101-2/+2
* | | | | | Merge pull request #2011 from matrix-org/matthew/turn_allow_guestsErik Johnston2017-03-313-5/+46
|\ \ \ \ \ \
| * | | | | | typoMatthew Hodgson2017-03-151-1/+1
| * | | | | | set default for turn_allow_guests correctlyMatthew Hodgson2017-03-151-1/+1
| * | | | | | add setting (on by default) to support TURN for guestsMatthew Hodgson2017-03-153-5/+46
* | | | | | | Merge pull request #1986 from matrix-org/matthew/enable_guest_3pErik Johnston2017-03-311-4/+4
|\ \ \ \ \ \ \
| * | | | | | | switch to allow_guest=True for authing 3Ps as per PR feedbackMatthew Hodgson2017-03-311-0/+8
| * | | | | | | enable guest access for the 3pl/3pid APIsMatthew Hodgson2017-03-121-8/+0
* | | | | | | | Merge pull request #2024 from jerrykan/db_port_schemaErik Johnston2017-03-311-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't assume postgres tables are in the public schema during db portJohn Kristensen2017-03-171-3/+1
* | | | | | | | | Merge pull request #1961 from benhylau/patch-1Erik Johnston2017-03-311-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarify doc for SQLite to PostgreSQL portBenedict Lau2017-03-011-3/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1927 from zuckschwerdt/fix-nuke-scriptErik Johnston2017-03-311-10/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bring nuke-room script to current schemaChristian W. Zuckschwerdt2017-02-191-10/+33
* | | | | | | | | | Merge pull request #2075 from matrix-org/erikj/cache_speedErik Johnston2017-03-317-16/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused instance variableErik Johnston2017-03-311-4/+0
| * | | | | | | | | | DocsErik Johnston2017-03-301-0/+5
| * | | | | | | | | | Revert log context changeErik Johnston2017-03-301-3/+0
| * | | | | | | | | | Doc new instance variablesErik Johnston2017-03-301-1/+8
| * | | | | | | | | | Fix up testsErik Johnston2017-03-303-2/+42
| * | | | | | | | | | Manually calculate cache key as getcallargs is expensiveErik Johnston2017-03-301-6/+28
| * | | | | | | | | | Don't convert to deferreds when not necessaryErik Johnston2017-03-305-8/+12
* | | | | | | | | | | Merge pull request #2076 from matrix-org/erikj/as_perfErik Johnston2017-03-312-19/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add commentErik Johnston2017-03-291-1/+1
| * | | | | | | | | | | Cache whether an AS is interested based on membersErik Johnston2017-03-281-1/+9
| * | | | | | | | | | | Remove param and cast at call siteErik Johnston2017-03-281-8/+6
| * | | | | | | | | | | Compile the regex's used in ASesErik Johnston2017-03-282-10/+8
* | | | | | | | | | | | Merge pull request #2083 from matrix-org/erikj/copy_replace_speedErik Johnston2017-03-311-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Speed up copy_and_replaceErik Johnston2017-03-301-3/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2079 from matrix-org/erikj/push_regex_cacheErik Johnston2017-03-301-47/+57
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Cache glob to regex at a higher level for pushErik Johnston2017-03-291-47/+57
* | | | | | | | | | | Fix the logcontext handling in the cache wrappers (#2077)Richard van der Hoff2017-03-304-19/+136
| | | | | | | | | * | Always advance stream tokensErik Johnston2017-04-031-1/+4
| | | | | | | | | * | Use callbacks to notify tcp replication rather than deferredsErik Johnston2017-03-312-20/+12
| | | | | | | | | * | Add a timestamp to USER_SYNC commandErik Johnston2017-03-314-16/+24
| | | | | | | | | * | Fix up presenceErik Johnston2017-03-311-1/+3
| | | | | | | | | * | Add a brief list of commands to docsErik Johnston2017-03-311-0/+46
| | | | | | | | | * | Fix up docsErik Johnston2017-03-314-28/+12
| | | | | | | | | * | Remove user from process_presence when stops syncingErik Johnston2017-03-301-0/+1
| | | | | | | | | * | Fix indentation in docs/Erik Johnston2017-03-301-25/+28
| | | | | | | | | * | Add tcp replication listener type and hook it upErik Johnston2017-03-301-0/+11
| | | | | | | | | * | Add functions to presence to support remote syncsErik Johnston2017-03-301-0/+66
| | | | | | | | | * | Add server side resource for tcp replicationErik Johnston2017-03-301-0/+300
| | | | | | | | | * | Initial TCP protocol implementationErik Johnston2017-03-304-0/+1148
| | | | | | | | | * | Define the various streams we will replicateErik Johnston2017-03-302-0/+423
| | | | | | | | | * | Make federation send queue take the current positionErik Johnston2017-03-302-16/+26
| | | | | | | | | * | Add a simple hook to wait for replication trafficErik Johnston2017-03-301-0/+6
| | | | | | | | | * | Add new storage functions for new replicationErik Johnston2017-03-305-4/+137
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Use txn.fetchall() so we can reuse txnErik Johnston2017-03-301-1/+1
* | | | | | | | | | synctl.py: wait for synapse to stop before restarting (#2020)Anant Prakash2017-03-291-4/+43
|/ / / / / / / / /
* | | | | | | / / Increase cache size for _get_state_group_for_eventErik Johnston2017-03-291-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #1849 from matrix-org/erikj/state_typoErik Johnston2017-03-291-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug where current_state_events renamed to current_state_idsErik Johnston2017-01-231-3/+3
* | | | | | | | | Bail early if remote wouldn't be retried (#2064)Erik Johnston2017-03-291-2/+8
* | | | | | | | | Merge pull request #2053 from matrix-org/erikj/e2e_one_time_upsertErik Johnston2017-03-291-9/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Decrank last commitErik Johnston2017-03-291-4/+5
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_ti...Erik Johnston2017-03-2945-593/+828
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correctly look up keyErik Johnston2017-03-291-6/+5
| * | | | | | | | | | The algorithm is part of the key idErik Johnston2017-03-281-4/+4
| * | | | | | | | | | Raise a more helpful exceptionErik Johnston2017-03-231-2/+4
| * | | | | | | | | | Don't user upsert to persist new one time keysErik Johnston2017-03-231-9/+48
* | | | | | | | | | | Merge pull request #2067 from matrix-org/erikj/notify_on_fedErik Johnston2017-03-291-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Notify on new federation trafficErik Johnston2017-03-271-0/+7
* | | | | | | | | | | Merge pull request #2037 from ricco386/fix_readme_centos_issuesRichard van der Hoff2017-03-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed requirement that is not neededRichard Kellner2017-03-221-1/+1
| * | | | | | | | | | | Updated user creation sectionRichard Kellner2017-03-201-0/+1
| * | | | | | | | | | | Added missing system requiremnt and pip upgrade before installRichard Kellner2017-03-201-1/+2
* | | | | | | | | | | | Merge pull request #2063 from matrix-org/erikj/device_list_batchErik Johnston2017-03-282-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Batch sending of device list pokesErik Johnston2017-03-242-0/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2070 from matrix-org/erikj/perf_sendErik Johnston2017-03-271-36/+51
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | TypoErik Johnston2017-03-271-1/+1
| * | | | | | | | | | Short circuit if all new events have same state groupErik Johnston2017-03-271-36/+51
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2062 from matrix-org/erikj/presence_replicationErik Johnston2017-03-242-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Actually call invalidateErik Johnston2017-03-241-1/+1
| * | | | | | | | | | Use presence replication stream to invalidate cacheErik Johnston2017-03-242-2/+3
* | | | | | | | | | | Merge pull request #2061 from matrix-org/erikj/add_transaction_storeErik Johnston2017-03-242-0/+4
|\| | | | | | | | | |
| * | | | | | | | | | Add slave transaction storeErik Johnston2017-03-242-0/+4
* | | | | | | | | | | Merge pull request #2060 from matrix-org/erikj/cache_hosts_in_roomErik Johnston2017-03-242-2/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cache hosts in roomErik Johnston2017-03-242-2/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #2058 from matrix-org/rav/logcontext_leaks_2Richard van der Hoff2017-03-241-12/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | try not to drop context after federation requestsRichard van der Hoff2017-03-231-12/+16
* | | | | | | | | | | | Merge pull request #2057 from matrix-org/rav/missing_yield_2Richard van der Hoff2017-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add another missing yield on check_device_registeredRichard van der Hoff2017-03-231-1/+1
* | | | | | | | | | | | Merge pull request #2054 from matrix-org/erikj/user_iter_cursorErik Johnston2017-03-2418-131/+101
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Replace some calls to cursor_to_dictErik Johnston2017-03-243-39/+13
| * | | | | | | | | | | | Use iter(items|values)Erik Johnston2017-03-243-51/+48
| * | | | | | | | | | | | User Cursor.__iter__ instead of fetchallErik Johnston2017-03-2316-41/+40
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2055 from matrix-org/dbkr/fix_add_msisdn_requestTokenDavid Baker2017-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Oops, remove unintentional changeDavid Baker2017-03-231-7/+0
| * | | | | | | | | | | | Fix token request for addition of phone numbersDavid Baker2017-03-232-1/+8
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2056 from matrix-org/dbkr/fix_invite_rejectDavid Baker2017-03-241-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix rejection of invites not reaching syncDavid Baker2017-03-231-0/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #2050 from matrix-org/rav/federation_backoffRichard van der Hoff2017-03-2312-315/+355
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix testsRichard van der Hoff2017-03-232-1/+3
| * | | | | | | | | | | Ignore backoff history for invites, aliases, and roomdirsRichard van der Hoff2017-03-236-14/+52
| * | | | | | | | | | | push federation retry limiter down to matrixfederationclientRichard van der Hoff2017-03-238-287/+280
| * | | | | | | | | | | MatrixFederationHttpClient: clean upRichard van der Hoff2017-03-231-17/+24
* | | | | | | | | | | | Merge pull request #2052 from matrix-org/rav/time_bound_deferredRichard van der Hoff2017-03-232-4/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix time_bound_deferred to throw the right exceptionRichard van der Hoff2017-03-232-4/+39
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #1783 from pik/filter-validationErik Johnston2017-03-234-95/+238
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add jsonschema to python_dependencies.pypik2017-03-231-0/+1
| * | | | | | | | | | use jsonschema.FormatChecker for RoomID and UserID stringspik2017-03-233-24/+40
| * | | | | | | | | | Add valid filter tests, flake8, fix typopik2017-03-232-10/+55
| * | | | | | | | | | check_valid_filter using JSONSchemapik2017-03-232-94/+175
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2005 from kfatehi/docs/readmeRichard van der Hoff2017-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update README: specify python2.7 in virtualenvKeyvan Fatehi2017-03-161-1/+1
* | | | | | | | | | | Merge pull request #2048 from matrix-org/rav/missing_yieldRichard van der Hoff2017-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add a missing yield in device key uploadRichard van der Hoff2017-03-231-1/+1
* | | | | | | | | | | | Merge pull request #2049 from matrix-org/rav/logcontext_leaksRichard van der Hoff2017-03-232-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix a couple of logcontext leaksRichard van der Hoff2017-03-232-5/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2044 from matrix-org/rav/crypto_docsRichard van der Hoff2017-03-222-4/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix up some key verif docstringsRichard van der Hoff2017-03-212-4/+24
* | | | | | | | | | | | Merge pull request #2042 from matrix-org/rav/fix_key_cachingRichard van der Hoff2017-03-224-63/+225
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix caching of remote servers' signature keysRichard van der Hoff2017-03-224-63/+225
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' into developMatthew Hodgson2017-03-213-4/+51
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'release-v0.19.3' of github.com:matrix-org/synapse v0.19.3Erik Johnston2017-03-2050-238/+1531
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bump changelog and version github/release-v0.19.3 release-v0.19.3Erik Johnston2017-03-202-1/+7
| | * | | | | | | | | Bump changelog and versions v0.19.3-rc2Erik Johnston2017-03-132-1/+10
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3Erik Johnston2017-03-1348-237/+1483
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge tag 'v0.19.3-rc1' into release-v0.19.3Erik Johnston2017-03-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bump changelog and version v0.19.3-rc1Erik Johnston2017-03-082-1/+33
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | * / | | | | | | | | Bump changelog and versionErik Johnston2017-03-082-1/+33
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #2028 from majewsky/readme-fix-1Matthew Hodgson2017-03-181-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | README.md: fix link to client list on matrix.org/docsStefan Majewsky2017-03-181-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2033 from matrix-org/erikj/repl_speedErik Johnston2017-03-215-54/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix unit testErik Johnston2017-03-201-1/+1
| * | | | | | | | | | PEP8Erik Johnston2017-03-202-3/+0
| * | | | | | | | | | Don't send the full event json over replicationErik Johnston2017-03-174-50/+38
* | | | | | | | | | | Merge pull request #2035 from matrix-org/rav/debug_federationRichard van der Hoff2017-03-211-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add some debug to help diagnose weird federation issueRichard van der Hoff2017-03-201-1/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2026 from matrix-org/rav/logcontext_docsRichard van der Hoff2017-03-202-8/+449
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | log_contexts.rst: fix formatting of Note blockRichard van der Hoff2017-03-201-6/+6
| * | | | | | | | | | log_contexts.rst: fix typosRichard van der Hoff2017-03-181-2/+2
| * | | | | | | | | | Logcontext docsRichard van der Hoff2017-03-172-8/+449
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2027 from matrix-org/rav/logcontext_leaksRichard van der Hoff2017-03-2012-62/+147
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Stop preserve_fn leaking context into the reactorRichard van der Hoff2017-03-183-34/+93
| * | | | | | | | | | Run the reactor with the sentinel logcontextRichard van der Hoff2017-03-188-16/+51
| * | | | | | | | | | Remove broken use of clock.call_laterRichard van der Hoff2017-03-181-12/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2025 from matrix-org/rav/no_reset_state_on_rejectionsRichard van der Hoff2017-03-206-84/+278
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Avoid resetting state on rejected eventsRichard van der Hoff2017-03-172-4/+14
| * | | | | | | | | Refactoring and cleanupsRichard van der Hoff2017-03-175-80/+264
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2016 from matrix-org/rav/queue_pdus_during_joinRichard van der Hoff2017-03-172-24/+69
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Queue up federation PDUs while a room join is in progressRichard van der Hoff2017-03-151-24/+44
| * | | | | | | | Implement reset_context_after_deferredRichard van der Hoff2017-03-151-0/+25
* | | | | | | | | Merge pull request #2022 from matrix-org/erikj/no_op_syncErik Johnston2017-03-1610-52/+93
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CommentsErik Johnston2017-03-162-2/+4
| * | | | | | | | | CommentErik Johnston2017-03-161-3/+8
| * | | | | | | | | Don't recreate so many setsErik Johnston2017-03-1610-51/+42
| * | | | | | | | | Implement no op for room stream in syncErik Johnston2017-03-161-4/+47
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2014 from Half-Shot/hs/fix-appservice-presenceErik Johnston2017-03-152-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Modify test_user_sync so it doesn't look at last_active_ts over last_user_syn...Will Hunt2017-03-151-1/+1
| * | | | | | | | | Add a great comment to handle_timeout for active vs sync times.Will Hunt2017-03-151-0/+2
| * | | | | | | | | Add fallback to last_active_ts if it beats the last sync time.Will Hunt2017-03-151-1/+2
* | | | | | | | | | Merge pull request #2013 from matrix-org/erikj/presence_FASTERErik Johnston2017-03-157-53/+115
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CommentErik Johnston2017-03-151-1/+3
| * | | | | | | | | | Cache set of users whose presence the other user should seeErik Johnston2017-03-151-13/+27
| * | | | | | | | | | CommentErik Johnston2017-03-152-0/+6
| * | | | | | | | | | Remove unused importErik Johnston2017-03-151-1/+0
| * | | | | | | | | | Format presence events on the edges instead of reformatting them multiple timesErik Johnston2017-03-157-39/+80
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1997 from matrix-org/dbkr/cas_partialdownloadDavid Baker2017-03-151-1/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Handle PartialDownloadError in CAS loginDavid Baker2017-03-141-1/+8
* | | | | | | | | | Merge pull request #2010 from matrix-org/rav/fix_txnq_wedgeRichard van der Hoff2017-03-156-5/+29
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix assertion to stop transaction queue getting wedgedRichard van der Hoff2017-03-156-5/+29
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2008 from matrix-org/erikj/notifier_statsErik Johnston2017-03-151-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add some metrics on notifierErik Johnston2017-03-151-0/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2Erik Johnston2017-03-159-50/+412
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Use extend instead of +=David Baker2017-03-141-4/+4
| * | | | | | | | Oops, remove printDavid Baker2017-03-141-1/+0
| * | | | | | | | Fix registration for broken clientsDavid Baker2017-03-131-4/+22
| * | | | | | | | Support registration / login with phone numberDavid Baker2017-03-139-50/+395
* | | | | | | | | Merge pull request #1992 from matrix-org/rav/fix_media_loopRichard van der Hoff2017-03-144-24/+121
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | kick jenkinsRichard van der Hoff2017-03-140-0/+0
| * | | | | | | | | Address review commentsRichard van der Hoff2017-03-142-20/+31
| * | | | | | | | | re-refactor exception heirarchyRichard van der Hoff2017-03-141-16/+14
| * | | | | | | | | Fix routing loop when fetching remote mediaRichard van der Hoff2017-03-134-14/+102
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2002 from matrix-org/erikj/dont_sync_by_defaultErik Johnston2017-03-141-13/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reduce spurious calls to generate syncErik Johnston2017-03-141-13/+31
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1989 from matrix-org/erikj/public_list_speedErik Johnston2017-03-147-33/+76
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_lis...Erik Johnston2017-03-1426-592/+492
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1996 from matrix-org/erikj/fix_current_stateErik Johnston2017-03-141-3/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix current_state_events table to not lieErik Johnston2017-03-141-3/+28
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1993 from matrix-org/luke/delete-devicesLuke Barnard2017-03-144-0/+139
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Implement _simple_delete_many_txn, use it to delete devicesLuke Barnard2017-03-134-11/+101
| * | | | | | | | FlakeLuke Barnard2017-03-131-0/+2
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 23:52:15 +0000