summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3161 from NotAFile/remove-v1authRichard van der Hoff2018-05-033-12/+6
|\
| * Burminate v1authAdrian Tschira2018-04-303-12/+6
* | Merge pull request #3175 from matrix-org/erikj/escape_metric_valuesErik Johnston2018-05-031-2/+28
|\ \
| * | Make _escape_character take MatchObjectErik Johnston2018-05-021-2/+10
| * | Escape label values in prometheus metricsErik Johnston2018-05-021-2/+20
* | | Merge pull request #3170 from matrix-org/rav/more_logcontext_leaksRichard van der Hoff2018-05-021-22/+38
|\ \ \
| * | | Merge branch 'develop' into rav/more_logcontext_leaksRichard van der Hoff2018-05-022-2/+2
| |\| |
| * | | Fix a class of logcontext leaksRichard van der Hoff2018-05-021-22/+38
* | | | Fix logcontext leak in media repoRichard van der Hoff2018-05-022-1/+4
| |/ / |/| |
* | | Merge pull request #3168 from matrix-org/rav/fix_logformatterRichard van der Hoff2018-05-021-1/+1
|\ \ \
| * | | Fix incorrect reference to StringIORichard van der Hoff2018-05-021-1/+1
| |/ /
* | | Merge branch 'master' into developNeil Johnson2018-05-011-1/+1
|\ \ \ | |/ / |/| |
| * | Update __init__.pyNeil Johnson2018-05-011-1/+1
* | | Merge branch 'release-v0.28.1' into developRichard van der Hoff2018-05-013-4/+26
|\| | | |/ |/|
| * Merge commit '33f469b' into release-v0.28.1Richard van der Hoff2018-05-013-4/+26
| |\
| | * Apply some limits to depth to counter abuseRichard van der Hoff2018-05-013-4/+26
| * | Miscellaneous fixes to python_dependenciesRichard van der Hoff2018-05-011-1/+19
| |/
* | Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)Will Hunt2018-04-302-8/+8
* | add guard for None on purge_history apiKrombel2018-04-301-1/+14
* | Merge pull request #3129 from matrix-org/matthew/fix_group_dupsMatthew Hodgson2018-04-301-0/+57
|\ \
| * | fix missing importMatthew Hodgson2018-04-281-0/+1
| * | pep8Matthew Hodgson2018-04-281-3/+5
| * | make it work with sqliteMatthew Hodgson2018-04-282-34/+54
| * | remove duplicates from groups tablesMatthew Hodgson2018-04-251-0/+34
* | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fnRichard van der Hoff2018-04-301-4/+2
|\ \ \
| * | | Remove redundant call to preserve_fnRichard van der Hoff2018-04-301-4/+2
* | | | Merge pull request #3144 from matrix-org/rav/run_in_background_exception_hand...Richard van der Hoff2018-04-301-1/+7
|\ \ \ \
| * | | | Trap exceptions thrown within run_in_backgroundRichard van der Hoff2018-04-271-1/+7
* | | | | Merge pull request #3102 from NotAFile/py3-attributeerrorRichard van der Hoff2018-04-301-3/+15
|\ \ \ \ \
| * | | | | add comment explaining attributeerrorAdrian Tschira2018-04-301-0/+3
| * | | | | Make event properties raise AttributeError insteadAdrian Tschira2018-04-151-3/+12
* | | | | | Merge pull request #3152 from NotAFile/py3-local-importsRichard van der Hoff2018-04-304-7/+7
|\ \ \ \ \ \
| * | | | | | make imports localAdrian Tschira2018-04-284-7/+7
* | | | | | | Merge pull request #3153 from NotAFile/py3-httplibRichard van der Hoff2018-04-301-3/+3
|\ \ \ \ \ \ \
| * | | | | | | move httplib import to sixAdrian Tschira2018-04-281-3/+3
| |/ / / / / /
* | | | | | | Merge pull request #3151 from NotAFile/py3-xrange-1Richard van der Hoff2018-04-309-11/+28
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into py3-xrange-1Richard van der Hoff2018-04-3039-110/+143
| |\ \ \ \ \ \ \
| * | | | | | | | Move more xrange to sixAdrian Tschira2018-04-289-11/+28
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3150 from NotAFile/py3-listcomp-yieldRichard van der Hoff2018-04-301-5/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Don't yield in list comprehensionsAdrian Tschira2018-04-281-5/+9
| |/ / / / / /
* | | | | | | Merge pull request #3085 from NotAFile/py3-config-text-modeRichard van der Hoff2018-04-302-4/+4
|\ \ \ \ \ \ \
| * | | | | | | open log_config in text mode tooAdrian Tschira2018-04-281-1/+1
| * | | | | | | Open config file in non-bytes modeAdrian Tschira2018-04-101-3/+3
* | | | | | | | Merge pull request #3084 from NotAFile/py3-certs-byte-modeRichard van der Hoff2018-04-301-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Open certificate files as bytesAdrian Tschira2018-04-101-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #3154 from NotAFile/py3-stringioRichard van der Hoff2018-04-302-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | replace stringIO importsAdrian Tschira2018-04-282-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3155 from NotAFile/py3-bytes-1Richard van der Hoff2018-04-304-7/+10
|\ \ \ \ \ \ \
| * | | | | | | more bytes stringsAdrian Tschira2018-04-294-7/+10
| |/ / / / / /
* | | | | | | Merge pull request #3140 from matrix-org/rav/use_run_in_backgroundRichard van der Hoff2018-04-3022-72/+98
|\ \ \ \ \ \ \
| * | | | | | | pep8; remove spurious importRichard van der Hoff2018-04-271-1/+1
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_backgroundRichard van der Hoff2018-04-2726-257/+388
| |\ \ \ \ \ \ \
| * | | | | | | | Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-2722-71/+97
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #3156 from NotAFile/py3-hmac-bytesRichard van der Hoff2018-04-302-11/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Construct HMAC as bytes on py3Adrian Tschira2018-04-292-11/+15
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3108 from NotAFile/py3-six-urlparseRichard van der Hoff2018-04-306-11/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use six.moves.urlparseAdrian Tschira2018-04-156-11/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'origin/develop' into rav/deferred_timeoutRichard van der Hoff2018-04-2726-257/+388
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #3142 from matrix-org/rav/reraiseRichard van der Hoff2018-04-272-13/+24
| |\ \ \ \ \ \
| | * | | | | | reraise exceptions more carefullyRichard van der Hoff2018-04-272-13/+24
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #3136 from matrix-org/rav/fix_dependenciesRichard van der Hoff2018-04-271-1/+19
| |\ \ \ \ \ \
| | * | | | | | Miscellaneous fixes to python_dependenciesRichard van der Hoff2018-04-261-1/+19
| * | | | | | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptionsRichard van der Hoff2018-04-2720-237/+335
| |\ \ \ \ \ \ \
| | * | | | | | | Improve exception handling for background processesRichard van der Hoff2018-04-2720-237/+335
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #3139 from matrix-org/rav/consume_errorsRichard van der Hoff2018-04-273-5/+9
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Add missing consumeErrorsRichard van der Hoff2018-04-273-5/+9
| | |/ / / / /
| * / / / / / update changelog and bump version to 0.28.0 v0.28.0 github/release-v0.28.0-rc1 release-v0.28.0-rc1Neil Johnson2018-04-261-1/+1
| |/ / / / /
* | | | | | Merge branch 'develop' into rav/deferred_timeoutRichard van der Hoff2018-04-275-14/+99
|\| | | | |
| * | | | | Fix media admin APIsErik Johnston2018-04-261-2/+2
| * | | | | Also fix reindexing of searchErik Johnston2018-04-251-1/+1
| * | | | | Fix quarantine media admin APIErik Johnston2018-04-251-1/+1
| | |_|_|/ | |/| | |
| * | | | Bump version and update changelog v0.28.0-rc1Neil Johnson2018-04-241-1/+1
| * | | | Merge pull request #3118 from matrix-org/rav/reject_prev_eventsRichard van der Hoff2018-04-232-9/+94
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove spurious paramRichard van der Hoff2018-04-231-1/+0
| | * | | accept stupid events over backfillRichard van der Hoff2018-04-201-4/+9
| | * | | Add some commentsRichard van der Hoff2018-04-182-5/+35
| | * | | Check events on backfill tooRichard van der Hoff2018-04-181-15/+42
| | * | | Reject events which have too many auth_events or prev_eventsRichard van der Hoff2018-04-181-4/+28
| | |/ /
* | | | Backport deferred.addTimeoutRichard van der Hoff2018-04-275-14/+90
* | | | Use deferred.addTimeout instead of time_bound_deferredRichard van der Hoff2018-04-235-97/+59
|/ / /
* | | Merge pull request #3106 from NotAFile/py3-six-itervalues-1Richard van der Hoff2018-04-204-11/+18
|\ \ \
| * | | Use six.itervalues in some placesAdrian Tschira2018-04-154-11/+18
| |/ /
* | | Merge pull request #3107 from NotAFile/py3-bool-nonzeroRichard van der Hoff2018-04-203-0/+9
|\ \ \
| * | | add __bool__ alias to __nonzero__ methodsAdrian Tschira2018-04-153-0/+9
| |/ /
* | | Merge pull request #3110 from NotAFile/py3-six-queueRichard van der Hoff2018-04-202-4/+6
|\ \ \
| * | | Replace Queue with six.moves.queueAdrian Tschira2018-04-162-4/+6
| |/ /
* | | Merge pull request #3103 from NotAFile/py3-baseexcepton-messageRichard van der Hoff2018-04-201-4/+4
|\ \ \
| * | | Use str(e) instead of e.messageAdrian Tschira2018-04-151-4/+4
| |/ /
* | | Merge pull request #3093 from matrix-org/rav/response_cache_wrapRichard van der Hoff2018-04-206-79/+111
|\ \ \
| * | | Reinstate linearizer for federation_server.on_context_state_requestRichard van der Hoff2018-04-201-5/+11
| * | | ResponseCache: fix handling of completed resultsRichard van der Hoff2018-04-131-13/+19
| * | | Refactor ResponseCache usageRichard van der Hoff2018-04-126-67/+87
* | | | Merge pull request #3117 from matrix-org/rav/refactor_have_eventsRichard van der Hoff2018-04-203-27/+55
|\ \ \ \
| * | | | Refactor store.have_eventsRichard van der Hoff2018-04-203-27/+55
| | |/ / | |/| |
* / | | Avoid creating events with huge numbers of prev_eventsRichard van der Hoff2018-04-163-54/+94
|/ / /
* | | Merge branch 'master' of https://github.com/matrix-org/synapse into developNeil Johnson2018-04-132-2/+2
|\ \ \
| * | | Bump version and Change log v0.27.4 github/release-v0.27.0 release-v0.27.0Neil Johnson2018-04-131-1/+1
| * | | Bump canonicaljson to 1.1.3Richard van der Hoff2018-04-131-1/+1
| * | | Update canonicaljson dependencyRichard van der Hoff2018-04-121-1/+1
* | | | fix federation_domain_whitelistMatthew Hodgson2018-04-131-6/+6
* | | | revert last to PR properlyMatthew Hodgson2018-04-131-6/+6
* | | | correctly auth inbound federation_domain_whitelist reqsMatthew Hodgson2018-04-131-6/+6
* | | | Merge branch 'master' of https://github.com/matrix-org/synapse into developNeil Johnson2018-04-131-1/+1
|\| | |
| * | | bump version/changelogNeil Johnson2018-04-111-1/+1
| * | | Merge commit '11d2609da70af797405241cdf7d9df19db5628f2' of https://github.com...Neil Johnson2018-04-111-48/+80
| |\ \ \
* | | | | Revert "Use sortedcontainers instead of blist"Richard van der Hoff2018-04-133-10/+10
| |_|/ / |/| | |
* | | | Merge pull request #3092 from matrix-org/rav/response_cache_metricsRichard van der Hoff2018-04-126-7/+21
|\ \ \ \
| * | | | Add metrics for ResponseCacheRichard van der Hoff2018-04-106-7/+21
* | | | | Format docstringErik Johnston2018-04-121-2/+3
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/processed_...Erik Johnston2018-04-122-2/+51
|\ \ \ \ \
| * \ \ \ \ Merge pull request #3059 from matrix-org/rav/doc_response_cacheRichard van der Hoff2018-04-121-0/+32
| |\ \ \ \ \
| | * | | | | Document the behaviour of ResponseCacheRichard van der Hoff2018-04-041-0/+32
| * | | | | | Merge pull request #3088 from matrix-org/erikj/as_parallelErik Johnston2018-04-121-2/+19
| |\ \ \ \ \ \
| | * | | | | | Send events to ASes concurrentlyErik Johnston2018-04-111-2/+19
* | | | | | | | Doc we raise on unknown eventErik Johnston2018-04-121-2/+3
* | | | | | | | s/list/tupleErik Johnston2018-04-121-2/+2
* | | | | | | | Set all metrics at the same timeErik Johnston2018-04-122-10/+10
* | | | | | | | Track last processed event received_tsErik Johnston2018-04-114-0/+52
* | | | | | | | Track where event stream processing have gotten up toErik Johnston2018-04-114-0/+24
* | | | | | | | Add GaugeMetricErik Johnston2018-04-112-1/+38
|/ / / / / / /
* | | | | | | Merge pull request #2760 from Valodim/pypyRichard van der Hoff2018-04-117-13/+24
|\ \ \ \ \ \ \
| * | | | | | | Don't disable GC when running on PyPyVincent Breitmoser2018-04-101-1/+7
| * | | | | | | In DomainSpecificString, override __repr__ in addition to __str__Vincent Breitmoser2018-04-101-1/+1
| * | | | | | | Fix pep8 error on psycopg2cffi hackRichard van der Hoff2018-04-101-6/+5
| * | | | | | | Use psycopg2cffi module instead of psycopg2 if running on pypyVincent Breitmoser2018-04-102-2/+8
| * | | | | | | Use sortedcontainers instead of blistVincent Breitmoser2018-04-103-10/+10
* | | | | | | | fix typoNeil Johnson2018-04-101-2/+2
* | | | | | | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sendsErik Johnston2018-04-102-55/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | Note why we're limiting concurrent event sendsErik Johnston2018-04-101-0/+5
| * | | | | | | | Limit concurrent event sends for a roomErik Johnston2018-04-091-49/+50
| * | | | | | | | Use create_and_send_nonmember_event everywhereErik Johnston2018-04-091-6/+1
* | | | | | | | | Merge pull request #3078 from matrix-org/erikj/federation_senderErik Johnston2018-04-101-15/+41
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Use run_in_background insteadErik Johnston2018-04-101-1/+1
| * | | | | | | | Preserve log contexts correctlyErik Johnston2018-04-101-1/+4
| * | | | | | | | Log event ID on exceptionErik Johnston2018-04-101-1/+4
| * | | | | | | | Handle all events in a room correctlyErik Johnston2018-04-091-1/+2
| * | | | | | | | Send federation events concurrentlyErik Johnston2018-04-091-4/+18
| * | | | | | | | Handle exceptions in get_hosts_for_room when sending events over federationErik Johnston2018-04-091-11/+16
| |/ / / / / / /
* | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ...Neil Johnson2018-04-102-7/+7
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | remove errant print v0.27.3-rc2Neil Johnson2018-04-091-1/+1
| * | | | | | Fix msec to sec, againNeil Johnson2018-04-091-3/+3
| * | | | | | Fix msec to secNeil Johnson2018-04-091-1/+1
| * | | | | | Fix psycopg2 interpolationNeil Johnson2018-04-091-5/+5
| * | | | | | version bump v0.27.3-rc2Neil Johnson2018-04-091-1/+1
| * | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into release-...Neil Johnson2018-04-0931-151/+613
| |\ \ \ \ \ \
| * | | | | | | bump version to release candidateNeil Johnson2018-04-091-1/+1
| * | | | | | | bump version v0.27.3-rc1Neil Johnson2018-04-091-1/+1
* | | | | | | | Merge pull request #3082 from matrix-org/erikj/urlencode_pathsErik Johnston2018-04-101-48/+80
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Ensure slashes are escapedErik Johnston2018-04-101-1/+1
| * | | | | | URL quote path segments over federationErik Johnston2018-04-101-48/+80
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2996 from krombel/allow_auto_join_roomsRichard van der Hoff2018-04-102-34/+34
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'develop' of into allow_auto_join_roomsKrombel2018-03-2848-101/+155
| |\ \ \ \ \
| * | | | | | move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-142-34/+34
* | | | | | | Merge pull request #3061 from NotAFile/add-some-byte-stringsRichard van der Hoff2018-04-095-13/+13
|\ \ \ \ \ \ \
| * | | | | | | Add b prefixes to some strings that are bytes in py3Adrian Tschira2018-04-045-13/+13
* | | | | | | | Merge pull request #3073 from NotAFile/use-six-reraiseRichard van der Hoff2018-04-091-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace old-style raise with six.reraiseAdrian Tschira2018-04-061-1/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #2938 from dklug/developRichard van der Hoff2018-04-091-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Return 401 for invalid access_token on logoutdklug2018-03-021-1/+4
* | | | | | | | | Merge pull request #3074 from NotAFile/fix-py3-printsRichard van der Hoff2018-04-091-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use python3-compatible printsAdrian Tschira2018-04-061-5/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3075 from NotAFile/six-type-checksRichard van der Hoff2018-04-093-6/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace some type checks with six type checksAdrian Tschira2018-04-073-6/+12
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3016 from silkeh/improve-service-lookupsRichard van der Hoff2018-04-091-95/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove address resolution of hosts in SRV recordsSilke2018-04-041-95/+8
* | | | | | | | | | Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoinRichard van der Hoff2018-04-091-0/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Return a 404 rather than a 500 on rejoining empty roomsRichard van der Hoff2018-04-091-0/+8
* | | | | | | | | | Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics"Richard van der Hoff2018-04-092-0/+51
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3046 from matrix-org/dbkr/join_groupLuke Barnard2018-04-065-25/+133
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | de-lint, quote consistencyLuke Barnard2018-04-061-2/+2
| * | | | | | | | | Explicitly grab individual columns from group objectLuke Barnard2018-04-061-6/+8
| * | | | | | | | | When exposing group state, return is_openly_joinableLuke Barnard2018-04-061-0/+5
| * | | | | | | | | By default, join policy is "invite"Luke Barnard2018-04-061-1/+1
| * | | | | | | | | add_user -> _add_userLuke Barnard2018-04-061-3/+3
| * | | | | | | | | pep8Luke Barnard2018-04-062-2/+4
| * | | | | | | | | Get group_info from existing call to check_group_is_oursLuke Barnard2018-04-061-5/+1
| * | | | | | | | | Don't use redundant inlineCallbacksLuke Barnard2018-04-061-4/+1
| * | | | | | | | | join_rule -> join_policyLuke Barnard2018-04-061-1/+1
| * | | | | | | | | is_joinable -> join_ruleLuke Barnard2018-04-062-5/+2
| * | | | | | | | | Fix federation client `set_group_joinable` typoLuke Barnard2018-04-061-1/+1
| * | | | | | | | | Factor out add_user from accept_invite and join_groupLuke Barnard2018-04-061-41/+29
| * | | | | | | | | pep8David Baker2018-04-061-1/+2
| * | | | | | | | | Implement group join APIDavid Baker2018-04-065-4/+124
* | | | | | | | | | Add response size metricsErik Johnston2018-04-061-0/+7
|/ / / / / / / / /
* / / / / / / / / use PUT instead of POST for federating groups/m.join_policyKrombel2018-04-063-3/+7
|/ / / / / / / /
* | | | | | | | more verbosity in synctlRichard van der Hoff2018-04-061-0/+1
* | | | | | | | Merge pull request #2986 from jplatte/join_reponse_room_idRichard van der Hoff2018-04-051-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add room_id to the response of `rooms/{roomId}/join`Jonas Platte2018-03-131-1/+6
* | | | | | | | | Merge pull request #3068 from matrix-org/rav/fix_cache_invalidationRichard van der Hoff2018-04-051-26/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix overzealous cache invalidationRichard van der Hoff2018-04-051-26/+38
* | | | | | | | | | Merge pull request #3066 from matrix-org/rav/remove_redundant_metricsRichard van der Hoff2018-04-052-51/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove redundant metrics which were deprecated in 0.27.0.Richard van der Hoff2018-04-042-51/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3045 from matrix-org/dbkr/group_joinableLuke Barnard2018-04-058-0/+157
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | NON NULL -> NOT NULLLuke Barnard2018-04-051-1/+1
| * | | | | | | | | | Use "/settings/" (plural)Luke Barnard2018-04-053-3/+3
| * | | | | | | | | | Use DEFAULT join_policy of "invite" in dbLuke Barnard2018-04-051-1/+1
| * | | | | | | | | | Document set_group_join_policyLuke Barnard2018-04-051-0/+6
| * | | | | | | | | | Use join_policy API instead of joinableLuke Barnard2018-04-037-23/+58
| * | | | | | | | | | This should probably be a PUTDavid Baker2018-03-281-1/+1
| * | | | | | | | | | OK, smallint it is thenDavid Baker2018-03-281-1/+1
| * | | | | | | | | | Grr. Copy the definition from is_adminDavid Baker2018-03-281-1/+1
| * | | | | | | | | | pep8David Baker2018-03-281-2/+1
| * | | | | | | | | | Make column definition that works on both dbsDavid Baker2018-03-281-1/+1
| * | | | | | | | | | Add schema delta fileDavid Baker2018-03-281-0/+16
| * | | | | | | | | | Add joinability for groupsDavid Baker2018-03-287-1/+102
* | | | | | | | | | | Merge pull request #3041 from matrix-org/r30_statsNeil Johnson2018-04-055-7/+115
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Review commentsNeil Johnson2018-04-052-5/+6
| * | | | | | | | | | | pep8Neil Johnson2018-03-291-2/+4
| * | | | | | | | | | | Remove need for sqlite specific queryNeil Johnson2018-03-291-30/+57
| * | | | | | | | | | | fix pep8 errorsNeil Johnson2018-03-281-3/+0
| * | | | | | | | | | | remove twisted deferral cruftNeil Johnson2018-03-281-6/+3
| * | | | | | | | | | | bump schema versionNeil Johnson2018-03-281-1/+1
| * | | | | | | | | | | Support multi client R30 for psqlNeil Johnson2018-03-282-9/+31
| * | | | | | | | | | | rename stat to future proofNeil Johnson2018-03-281-1/+1
| * | | | | | | | | | | Add user_ips last seen indexNeil Johnson2018-03-282-0/+24
| * | | | | | | | | | | No need to cast in count_daily_usersNeil Johnson2018-03-281-2/+2
| * | | | | | | | | | | query and call for r30 statsNeil Johnson2018-03-282-0/+38
| * | | | | | | | | | | count_daily_users failed if db was sqlite due to type failure - presumably th...Neil Johnson2018-03-281-1/+1
* | | | | | | | | | | | Merge pull request #3060 from matrix-org/rav/kill_event_contentRichard van der Hoff2018-04-053-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove uses of events.contentRichard van der Hoff2018-03-293-7/+12
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | phone home cache size configurationsJan Christian Grünhage2018-04-041-0/+3
* | | | | | | | | | | Revert "improve mxid check performance"Richard van der Hoff2018-04-041-4/+3
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3000 from NotAFile/change-except-styleRichard van der Hoff2018-04-042-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | replace old style error catching with 'as' keywordNotAFile2018-03-152-5/+5
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3044 from matrix-org/michaelk/performance_statsRichard van der Hoff2018-04-041-0/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle review commentsMichael Kaye2018-03-281-6/+9
| * | | | | | | | | | As daemonizing will make a new process, defer call to init.Michael Kaye2018-03-281-13/+23
| * | | | | | | | | | Include coarse CPU and Memory use in stats callbacks.Michael Kaye2018-03-271-0/+20
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3053 from NotAFile/speedup-mxid-checkRichard van der Hoff2018-04-041-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | improve mxid check performance ~4xAdrian Tschira2018-03-311-3/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3049 from matrix-org/rav/use_staticjsonRichard van der Hoff2018-04-034-20/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix json encoding bug in replicationRichard van der Hoff2018-04-031-1/+1
| * | | | | | | | | Use static JSONEncodersRichard van der Hoff2018-03-294-20/+34
| |/ / / / / / / /
* / / / / / / / / Use simplejson throughoutRichard van der Hoff2018-03-293-5/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #3043 from matrix-org/erikj/measure_state_group_creationErik Johnston2018-03-281-27/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Measure time it takes to calculate state group IDErik Johnston2018-03-281-27/+28
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #3034 from matrix-org/rav/fix_key_claim_errorsRichard van der Hoff2018-03-281-28/+28
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Stringify exceptions for keys/{query,claim}Richard van der Hoff2018-03-271-1/+4
| * | | | | | | factor out exception handling for keys/claim and keys/queryRichard van der Hoff2018-03-271-28/+25
| | |/ / / / / | |/| | | | |
* | | | | | | Fix search_user_dir multiple sqlite versions do different thingsNeil Johnson2018-03-281-2/+2
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_idErik Johnston2018-03-282-7/+11
|\ \ \ \ \ \
| * | | | | | Also do check inside linearizerErik Johnston2018-03-271-3/+4
| * | | | | | PEP8Erik Johnston2018-03-261-1/+3
| * | | | | | Don't use _cursor_to_dict in find_next_generated_user_id_localpartErik Johnston2018-03-261-3/+1
| * | | | | | Linearize calls to _generate_user_idErik Johnston2018-03-261-4/+7
* | | | | | | Merge pull request #3030 from matrix-org/erikj/no_ujsonErik Johnston2018-03-282-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove last usage of ujsonErik Johnston2018-03-262-2/+1
* | | | | | | | Merge pull request #3033 from matrix-org/erikj/calculate_state_metricsErik Johnston2018-03-281-1/+38
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | CommentErik Johnston2018-03-271-4/+5
| * | | | | | | Fix indentErik Johnston2018-03-271-1/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-26 06:55:32 +0000