summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* add pydocMatthew Hodgson2018-05-292-27/+67
* merge developMatthew Hodgson2018-05-29186-2989/+5608
|\
| * fix up testsAmber Brown2018-05-281-3/+3
| * update to more consistently use seconds in any metrics or loggingAmber Brown2018-05-284-38/+38
| * invalid syntax :(Amber Brown2018-05-281-2/+1
| * add comment about why unregAmber Brown2018-05-281-0/+2
| * update metrics to be in secondsAmber Brown2018-05-284-37/+38
| * Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2842-174/+353
| |\
| | * Fix default for send_server_notice_to_guestsRichard van der Hoff2018-05-251-1/+1
| | * Avoid sending consent notice to guest usersRichard van der Hoff2018-05-252-1/+12
| | * Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_roomRichard van der Hoff2018-05-251-10/+14
| | |\
| | | * Let users leave the server notice room after joiningRichard van der Hoff2018-05-251-10/+14
| | * | Merge pull request #3283 from NotAFile/py3-stateAmber Brown2018-05-241-23/+25
| | |\ \
| | | * | py3-ize state.pyAdrian Tschira2018-05-241-23/+25
| | * | | Merge pull request #3279 from NotAFile/py3-more-iteritemsAmber Brown2018-05-241-4/+6
| | |\ \ \
| | | * | | more iteritemsAdrian Tschira2018-05-241-4/+6
| | | |/ /
| | * / / Misc. py3 fixesAdrian Tschira2018-05-245-11/+13
| | |/ /
| | * | Merge pull request #3278 from NotAFile/py3-storage-baseAmber Brown2018-05-241-17/+22
| | |\ \
| | | * | Py3 storage/_base.pyAdrian Tschira2018-05-241-17/+22
| | * | | Merge pull request #3244 from NotAFile/py3-six-4Amber Brown2018-05-2415-49/+69
| | |\ \ \
| | | * | | replace some iteritems with sixAdrian Tschira2018-05-1915-49/+69
| | * | | | Merge pull request #3246 from NotAFile/py3-repr-stringAmber Brown2018-05-241-1/+1
| | |\ \ \ \
| | | * | | | use repr, not strAdrian Tschira2018-05-191-1/+1
| | | |/ / /
| | * | | | Merge pull request #3247 from NotAFile/py3-miscAmber Brown2018-05-243-5/+18
| | |\ \ \ \
| | | * | | | use stand-in value if maxint is not availableAdrian Tschira2018-05-191-1/+7
| | | * | | | fix py3 intern and remove unnecessary py3 encodeAdrian Tschira2018-05-191-1/+6
| | | * | | | py3-ize url previewAdrian Tschira2018-05-191-3/+5
| | | |/ / /
| | * | | | Merge pull request #3245 from NotAFile/batch-iterAmber Brown2018-05-241-0/+18
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Add batch_iter to utilsAdrian Tschira2018-05-191-0/+18
| | | |/ /
| | * | | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dirDavid Baker2018-05-242-0/+11
| | |\ \ \
| | | * | | Remove users from user directory on deactivateDavid Baker2018-05-242-0/+11
| | * | | | Merge pull request #3243 from NotAFile/py3-six-3Erik Johnston2018-05-246-11/+23
| | |\ \ \ \
| | | * | | | Replace some more comparisons with sixAdrian Tschira2018-05-196-11/+23
| | | | |/ / | | | |/| |
| | * | | | Merge branch 'master' into developNeil Johnson2018-05-241-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | bump versionNeil Johnson2018-05-241-1/+1
| | | | |/ | | | |/|
| | * | | Merge pull request #3261 from matrix-org/erikj/pagination_fixesErik Johnston2018-05-241-9/+22
| | |\ \ \
| | | * | | Use iter* methodsErik Johnston2018-05-221-7/+7
| | | * | | Fix that states is a dict of dictsErik Johnston2018-05-221-1/+4
| | | * | | get_domains_from_state returns list of tuplesErik Johnston2018-05-221-2/+12
| | * | | | Merge pull request #3267 from matrix-org/erikj/iter_filterErik Johnston2018-05-241-5/+5
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | s/values/itervalues/Erik Johnston2018-05-231-1/+1
| | | * | | Use iter* methods for _filter_events_for_serverErik Johnston2018-05-231-4/+4
| | * | | | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_urlRichard van der Hoff2018-05-242-6/+26
| | |\ \ \ \
| | | * | | | Allow overriding the server_notices user's avatarRichard van der Hoff2018-05-232-6/+26
| | * | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uriRichard van der Hoff2018-05-234-8/+55
| | |\| | | |
| | | * | | | Merge pull request #3271 from matrix-org/rav/consent_uri_in_messagesRichard van der Hoff2018-05-233-7/+50
| | | |\ \ \ \
| | | | * | | | Support for putting %(consent_uri)s in messagesRichard van der Hoff2018-05-233-7/+50
| | | * | | | | fix typoRichard van der Hoff2018-05-231-1/+1
| | | * | | | | Block attempts to send server notices to remote usersRichard van der Hoff2018-05-231-0/+4
| | | |/ / / /
| | * / / / / Use the localpart in the consent uriRichard van der Hoff2018-05-231-1/+3
| | |/ / / /
| | * / / / bump version and changelogNeil Johnson2018-05-231-1/+1
| | |/ / /
| | * | | Remove unused string formatting paramErik Johnston2018-05-221-1/+0
| | * | | Don't support limitless paginationErik Johnston2018-05-221-8/+6
| | * | | fix synchrotronhera2018-05-221-1/+1
| | * | | custom error code for not leaving server notices roomRichard van der Hoff2018-05-222-0/+2
| | * | | comment typoDavid Baker2018-05-221-1/+1
| * | | | pepeighttttAmber Brown2018-05-231-0/+1
| * | | | add back CPU metricsAmber Brown2018-05-231-1/+35
| * | | | fixesAmber Brown2018-05-233-13/+13
| * | | | more cleanupAmber Brown2018-05-223-9/+11
| * | | | cleanupAmber Brown2018-05-229-29/+64
| * | | | cleanup pep8 errorsAmber Brown2018-05-225-37/+114
| * | | | fixesAmber Brown2018-05-227-24/+52
| * | | | fix the test failuresAmber Brown2018-05-221-1/+1
| * | | | cleanups, self-registrationAmber Brown2018-05-223-19/+12
| * | | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2246-203/+1633
| |\| | |
| | * | | Merge pull request #3262 from matrix-org/rav/has_already_consentedRichard van der Hoff2018-05-221-4/+18
| | |\ \ \
| | | * | | Add a 'has_consented' template var to consent formsRichard van der Hoff2018-05-221-3/+14
| | | * | | Enable auto-escaping for the consent templatesRichard van der Hoff2018-05-221-1/+4
| | * | | | Fix dependency on jinja2Richard van der Hoff2018-05-221-1/+1
| | |/ / /
| | * / / Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-225-2/+178
| | |/ /
| | * | Merge pull request #3236 from matrix-org/rav/consent_noticeRichard van der Hoff2018-05-2213-18/+322
| | |\ \
| | | * | Stub out ServerNoticesSender on the workersRichard van der Hoff2018-05-226-8/+66
| | | * | Move consent config parsing into ConsentConfigRichard van der Hoff2018-05-223-14/+20
| | | * | Send users a server notice about consentRichard van der Hoff2018-05-229-8/+246
| | | * | Rename 'version' param on user consent configRichard van der Hoff2018-05-222-5/+7
| | * | | CommentErik Johnston2018-05-221-1/+1
| | * | | Fix logcontext resource usage trackingErik Johnston2018-05-221-11/+27
| | * | | Merge pull request #3252 from matrix-org/erikj/in_flight_requestsErik Johnston2018-05-222-2/+162
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Don't store contextErik Johnston2018-05-221-8/+5
| | | * | Move in_flight_requests_count to be a callback metricErik Johnston2018-05-221-10/+21
| | | * | Add in flight request metricsErik Johnston2018-05-212-2/+154
| | | |/
| | * | Merge pull request #3255 from matrix-org/rav/fix_transactionsRichard van der Hoff2018-05-211-21/+21
| | |\ \
| | | * | Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-211-25/+21
| | | * | Stop the transaction cache caching failuresRichard van der Hoff2018-05-211-9/+13
| | | |/
| | * / Tighter filtering for user_daily_visitsNeil Johnson2018-05-181-1/+5
| | |/
| | * fix psql compatability bugNeil Johnson2018-05-181-1/+1
| | * Merge branch 'master' into developNeil Johnson2018-05-181-1/+1
| | |\
| | * \ Merge pull request #3232 from matrix-org/rav/server_notices_roomRichard van der Hoff2018-05-1810-7/+309
| | |\ \
| | | * | Better docstringsRichard van der Hoff2018-05-181-0/+16
| | | * | Make sure we reject attempts to invite the notices userRichard van der Hoff2018-05-183-0/+20
| | | * | Replace inline docstrings with "Attributes" in class docstringRichard van der Hoff2018-05-181-23/+15
| | | * | fix missing yield for server_notices_roomRichard van der Hoff2018-05-171-3/+4
| | | * | Infrastructure for a server notices roomRichard van der Hoff2018-05-179-7/+280
| | * | | Merge pull request #3235 from matrix-org/rav/fix_receipts_deferredRichard van der Hoff2018-05-181-7/+11
| | |\ \ \
| | | * | | Fix error in handling receiptsRichard van der Hoff2018-05-181-7/+11
| | | |/ /
| | * | | Merge pull request #3233 from matrix-org/rav/remove_dead_codeRichard van der Hoff2018-05-181-55/+0
| | |\ \ \
| | | * | | Remove unused `update_external_syncs`Richard van der Hoff2018-05-171-55/+0
| | | |/ /
| | * | | Merge pull request #3221 from matrix-org/erikj/purge_tokenErik Johnston2018-05-183-37/+69
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Clarify commentErik Johnston2018-05-161-1/+2
| | | * | CommentsErik Johnston2018-05-161-0/+8
| | | * | Move and rename variableErik Johnston2018-05-161-3/+3
| | | * | Make purge_history operate on tokensErik Johnston2018-05-153-21/+25
| | | * | Use events_to_purge table rather than tokenErik Johnston2018-05-151-15/+34
| | * | | Merge pull request #3225 from matrix-org/rav/move_creation_handlerRichard van der Hoff2018-05-176-11/+19
| | |\ \ \
| | | * | | Move RoomCreationHandler out of synapse.handlers.HandlersRichard van der Hoff2018-05-176-11/+19
| | * | | | Merge pull request #3212 from matrix-org/erikj/epa_streamErik Johnston2018-05-172-38/+16
| | |\ \ \ \
| | | * | | | Use stream rather depth ordering for push actionsErik Johnston2018-05-112-38/+16
| | * | | | | Merge branch 'master' into developNeil Johnson2018-05-161-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #3163 from matrix-org/cohort_analyticsNeil Johnson2018-05-166-5/+121
| | |\ \ \ \ \
| | | * | | | | remove empty lineNeil Johnson2018-05-161-1/+0
| | | * | | | | remove unused method recurring_user_daily_visit_statsNeil Johnson2018-05-161-3/+0
| | | * | | | | style and further contraining queryNeil Johnson2018-05-161-8/+12
| | | * | | | | pep8Neil Johnson2018-05-151-1/+0
| | | * | | | | Limit query load of generate_user_daily_visitsNeil Johnson2018-05-152-27/+54
| | | * | | | | instead of inserting user daily visit data at the end of the day, instead ins...Neil Johnson2018-05-142-43/+30
| | | * | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_a...Neil Johnson2018-05-1495-1117/+1616
| | | |\ \ \ \ \
| | | * | | | | | remove user agent from data model, will just join on user_ipsNeil Johnson2018-05-011-12/+11
| | | * | | | | | add inidexes based on usageNeil Johnson2018-05-011-6/+2
| | | * | | | | | 10 mins seems more reasonable that every minuteNeil Johnson2018-05-011-1/+1
| | | * | | | | | pep8Neil Johnson2018-04-251-3/+4
| | | * | | | | | Generate user daily statsNeil Johnson2018-04-256-5/+112
| | * | | | | | | Merge pull request #3213 from matrix-org/rav/consent_handlerRichard van der Hoff2018-05-1611-5/+395
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-1511-5/+395
| * | | | | | | | rest of the changesAmber Brown2018-05-216-145/+68
| * | | | | | | | replacing portionsAmber Brown2018-05-2122-414/+265
| * | | | | | | | don't need the resource portionAmber Brown2018-05-211-23/+0
| * | | | | | | | look at the Prometheus metrics insteadAmber Brown2018-05-211-5/+3
| * | | | | | | | remove old metrics libsAmber Brown2018-05-212-450/+0
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | bump version, change logNeil Johnson2018-05-171-1/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | bump version and changelog for 0.29.0 v0.29.0Neil Johnson2018-05-161-1/+1
| * | | | | | v0.29.0-rc1: bump version and change log v0.29.0-rc1Neil Johnson2018-05-141-1/+1
| |/ / / / /
| * | | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivateDavid Baker2018-05-143-2/+143
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Catch failure to part user from roomDavid Baker2018-05-101-7/+13
| | * | | | Many docstringsDavid Baker2018-05-102-0/+36
| | * | | | Oops, don't call function passed to run_in_backgroundDavid Baker2018-05-101-1/+1
| | * | | | Prefix internal functionsDavid Baker2018-05-091-7/+7
| | * | | | Add the schema fileDavid Baker2018-05-091-0/+25
| | * | | | Indent failDavid Baker2018-05-091-1/+1
| | * | | | Part deactivated users in the backgroundDavid Baker2018-05-092-1/+61
| | * | | | Part user from rooms on account deactivateDavid Baker2018-05-081-1/+15
| * | | | | Merge pull request #3208 from matrix-org/rav/more_refactor_request_handlerRichard van der Hoff2018-05-1123-27/+28
| |\ \ \ \ \
| | * | | | | Set Server header in SynapseRequestRichard van der Hoff2018-05-1023-27/+28
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #3209 from damir-manapov/masterRichard van der Hoff2018-05-111-2/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | transaction_id, destination twiceDamir Manapov2018-05-101-2/+0
| * | | | | Remove redundant request_handler decoratorRichard van der Hoff2018-05-107-38/+42
| * | | | | Factor wrap_request_handler_with_logging out of wrap_request_handlerRichard van der Hoff2018-05-101-54/+66
| * | | | | Remove include_metrics paramRichard van der Hoff2018-05-101-17/+7
| * | | | | Move outgoing_responses_counter handling to RequestMetricsRichard van der Hoff2018-05-102-4/+2
| * | | | | Bump requests_counter in wrapped_request_handlerRichard van der Hoff2018-05-101-4/+11
| * | | | | Move RequestMetrics handling into SynapseRequest.processing()Richard van der Hoff2018-05-102-24/+64
| * | | | | Make RequestMetrics take a raw time rather than a clockRichard van der Hoff2018-05-102-6/+6
| * | | | | Move request_id management into SynapseRequestRichard van der Hoff2018-05-102-15/+25
| * | | | | Move RequestsMetrics to its own fileRichard van der Hoff2018-05-092-124/+151
| | |_|_|/ | |/| | |
| * | | | Merge pull request #3199 from matrix-org/erikj/pagination_syncErik Johnston2018-05-092-45/+54
| |\ \ \ \
| | * | | | Add comment to sync as to why code path is splitErik Johnston2018-05-091-0/+5
| | * | | | Refactor sync APIs to reuse pagination APIErik Johnston2018-05-092-44/+48
| | * | | | Don't unnecessarily require token to be stream tokenErik Johnston2018-05-091-1/+1
| * | | | | Merge pull request #3198 from matrix-org/erikj/fixup_return_paginationErik Johnston2018-05-093-8/+22
| |\ \ \ \ \
| | * | | | | Fix returned token is no longer a tupleErik Johnston2018-05-091-1/+1
| | * | | | | Fix up commentErik Johnston2018-05-091-1/+1
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_retu...Erik Johnston2018-05-093-8/+10
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Refactor get_recent_events_for_room return typeErik Johnston2018-05-093-7/+21
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_mem...Erik Johnston2018-05-093-8/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #3196 from matrix-org/erikj/pagination_returnErik Johnston2018-05-091-28/+49
| | |\ \ \ \ \
| | | * | | | | Update commentsErik Johnston2018-05-091-5/+6
| | | |/ / / /
| | * | | | | Merge pull request #3195 from matrix-org/erikj/pagination_refactorErik Johnston2018-05-091-51/+27
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #3193 from matrix-org/erikj/pagination_refactorErik Johnston2018-05-091-110/+99
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge pull request #3190 from mujx/notif-token-fixRichard van der Hoff2018-05-081-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | notifications: Convert next_token to string according to the specKonstantinos Sideris2018-05-051-1/+1
| | * | | | | | | Note that label values can be anythingErik Johnston2018-05-031-1/+2
| | * | | | | | | Fix metrics that have integer value labelsErik Johnston2018-05-031-1/+1
| | |/ / / / / /
| * | | | / / / Remove unused code path from member change DB funcErik Johnston2018-05-091-24/+10
| | |_|_|/ / / | |/| | | | |
| * | | | | | Refactor pagination DB API to return concrete typeErik Johnston2018-05-091-28/+48
| | |_|/ / / | |/| | | |
| * | | | | Remove unused from_token paramErik Johnston2018-05-091-7/+4
| * | | | | Refactor recent events func to use pagination funcErik Johnston2018-05-091-48/+27
| | |/ / / | |/| | |
| * | | | Fix up comments and make function privateErik Johnston2018-05-091-7/+7
| * | | | Reuse existing pagination code for context APIErik Johnston2018-05-081-75/+15
| * | | | Parse tokens before calling DB functionErik Johnston2018-05-081-14/+18
| * | | | Only fetch required fields from databaseErik Johnston2018-05-081-1/+2
| * | | | Split paginate_room_events storage functionErik Johnston2018-05-081-28/+72
| |/ / /
| * | | Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_failRichard van der Hoff2018-05-03137-1294/+2609
| |\ \ \
| | * \ \ Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaksRichard van der Hoff2018-05-031-3/+14
| | |\ \ \
| | | * | | Fix logcontext leaks in rate limiterRichard van der Hoff2018-05-031-3/+14
| | * | | | Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdownRichard van der Hoff2018-05-031-3/+8
| | |\ \ \ \
| | | * | | | Don't abortConnection() if the transport connection has already closed.Will Hunt2018-05-031-3/+8
| | * | | | | Merge pull request #3178 from matrix-org/rav/fix_request_timeoutsRichard van der Hoff2018-05-031-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | add missing param to cancelled_to_request_timed_out_errorRichard van der Hoff2018-05-021-1/+1
| | * | | | | Merge pull request #3141 from matrix-org/erikj/fixup_stateErik Johnston2018-05-031-37/+67
| | |\ \ \ \ \
| | | * | | | | Fix up grammarErik Johnston2018-05-031-3/+3
| | | * | | | | Refactor event storage to not require stateErik Johnston2018-04-271-37/+67
| | * | | | | | 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
| | | |\ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 00:00:23 +0000