summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add edu.type as part of key. Remove debug loggingErik Johnston2016-09-091-2/+3
* Clobber EDUs in send queueErik Johnston2016-09-095-20/+58
* Drop replication log levelsErik Johnston2016-09-092-3/+2
* Deduplicate presence in _update_statesErik Johnston2016-09-091-0/+6
* Merge pull request #1092 from matrix-org/erikj/transaction_queue_checkErik Johnston2016-09-091-15/+16
|\
| * Check if destination is ready for retry earlierErik Johnston2016-09-091-15/+16
* | Merge pull request #1089 from matrix-org/markjh/direct_to_device_streamMark Haines2016-09-094-4/+38
|\ \ | |/ |/|
| * Use the previous MAX value if any to set the stream_idMark Haines2016-09-091-1/+2
| * Track the max_stream_device_id in a separate table, since we delete from the ...Mark Haines2016-09-094-4/+37
* | Fix tightloop on sending transactionErik Johnston2016-09-091-122/+134
* | Merge pull request #1088 from matrix-org/erikj/transaction_queue_checkErik Johnston2016-09-091-38/+41
|\ \ | |/ |/|
| * Correctly guard against multiple concurrent transactionsErik Johnston2016-09-091-38/+41
* | Merge pull request #1087 from matrix-org/markjh/reapply_deltaMark Haines2016-09-091-1/+4
|\ \ | |/ |/|
| * Just move the schema and add some DROPsMark Haines2016-09-092-35/+4
| * Only catch databas errorsMark Haines2016-09-081-1/+1
| * Add a stub run_upgradeMark Haines2016-09-081-0/+4
| * Reapply 34/device_outbox in 35/device_outbox_again.py since the schema was bu...Mark Haines2016-09-081-0/+30
* | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse into developErik Johnston2016-09-092-2/+2
|\ \
| * | Bump changelog and versionErik Johnston2016-09-091-1/+1
| * | Reduce batch size to be under SQL limitErik Johnston2016-09-091-1/+1
* | | Update last_device_stream_id_by_dest if there is nothing to sendErik Johnston2016-09-091-0/+1
* | | Merge pull request #1081 from matrix-org/dbkr/notifications_only_highlightMatthew Hodgson2016-09-092-2/+10
|\ \ \
| * | | Implement `only=highlight` on `/notifications`David Baker2016-09-082-2/+10
* | | | Merge pull request #1080 from matrix-org/dbkr/fix_notifications_api_with_fromDavid Baker2016-09-081-1/+1
|\ \ \ \
| * | | | Fix /notifications API when used with `from` paramDavid Baker2016-09-081-1/+1
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reindex_st...Erik Johnston2016-09-083-24/+63
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcardMark Haines2016-09-081-18/+36
| |\ \ \ \
| | * | | | Support wildcard device_ids for direct to device messagesMark Haines2016-09-081-18/+36
| * | | | | Merge pull request #1082 from matrix-org/erikj/remote_public_roomsErik Johnston2016-09-082-6/+27
| |\ \ \ \ \
| | * | | | | Use parse_stringErik Johnston2016-09-081-2/+2
| | * | | | | Add server param to /publicRoomsErik Johnston2016-09-082-5/+26
* | | | | | | Add delta fileErik Johnston2016-09-081-0/+20
* | | | | | | Reindex state_groups_state after pruningErik Johnston2016-09-082-2/+37
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-09-081-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Bump version and changelogErik Johnston2016-09-081-1/+1
| * | | | | Bump changelog and versionErik Johnston2016-09-051-1/+1
* | | | | | Check the user_id for presence/typing matches originErik Johnston2016-09-082-1/+15
| |_|/ / / |/| | | |
* | | | | Merge branch 'develop' into markjh/direct_to_device_federationMark Haines2016-09-0813-132/+542
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Log delta files we're applyingErik Johnston2016-09-081-2/+2
| | |/ / | |/| |
| * | | Temporarily disable sequential scans for state fetchingErik Johnston2016-09-081-0/+4
| | |/ | |/|
| * | Merge pull request #1077 from matrix-org/markjh/device_loggingMark Haines2016-09-071-2/+6
| |\ \
| | * | Log the types and values when failing to store devicesMark Haines2016-09-071-2/+6
| | |/
| * | CommentErik Johnston2016-09-071-0/+4
| * | Add appopriate framing clauseErik Johnston2016-09-071-0/+1
| * | Use windowing function to make use of indexErik Johnston2016-09-071-5/+5
| * | Merge pull request #1065 from matrix-org/erikj/state_storageErik Johnston2016-09-078-73/+482
| |\ \
| | * | Scale the batch size so that we're not bitten by the minimumErik Johnston2016-09-051-1/+5
| | * | Correctly handle reindexing state groups that already have an edgeErik Johnston2016-09-051-0/+19
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storageErik Johnston2016-09-055-60/+35
| | |\ \
| | * | | Take value in a better wayErik Johnston2016-09-052-3/+3
| | * | | Comment about sqlite and WITH RECURSIVEErik Johnston2016-09-051-0/+4
| | * | | Correctly delete old state groups in purge history APIErik Johnston2016-09-052-20/+80
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storageErik Johnston2016-09-053-4/+12
| | |\ \ \
| | * | | | Add commentsErik Johnston2016-09-052-41/+43
| | * | | | Add upgrade script that will slowly prune state_groups_state entriesErik Johnston2016-09-053-75/+223
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storageErik Johnston2016-09-026-15/+59
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storageErik Johnston2016-09-0213-84/+224
| | |\ \ \ \ \
| | * | | | | | Limit the length of state chainsErik Johnston2016-09-022-43/+106
| | * | | | | | Move to storing state_groups_state as deltasErik Johnston2016-09-015-62/+172
| * | | | | | | Record counts of state changesErik Johnston2016-09-061-0/+4
| * | | | | | | Merge pull request #1072 from matrix-org/erikj/presence_fiddleErik Johnston2016-09-061-12/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Short circuit if presence is the sameErik Johnston2016-09-061-0/+3
| | * | | | | | | Fiddle should_notify to better report statsErik Johnston2016-09-061-12/+7
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Add quotes and be explicity about script-srcErik Johnston2016-09-051-1/+2
| * | | | | | | Allow PDF to be rendered from media repoErik Johnston2016-09-051-1/+7
| |/ / / / / /
| * | | | | | Merge pull request #1070 from matrix-org/erikj/presence_statsErik Johnston2016-09-051-0/+8
| |\ \ \ \ \ \
| | * | | | | | Record why we have chosen to notifyErik Johnston2016-09-051-0/+8
| | | |_|_|_|/ | | |/| | | |
| * / | | | | Use get_joined_users_from_context instead of manually looking up hostsErik Johnston2016-09-052-46/+17
| |/ / / / /
* | | | | | Add a new method to enqueue the device messages rather than sending a dummy EDUMark Haines2016-09-073-7/+20
* | | | | | Fix the stream change cache to work over replicationMark Haines2016-09-072-1/+12
* | | | | | Move the check for federated device_messages.Mark Haines2016-09-071-11/+15
* | | | | | Add stream change caches for device messagesMark Haines2016-09-073-1/+53
* | | | | | Comment the add_messages storage functionsMark Haines2016-09-071-8/+16
* | | | | | Send device messages over federationMark Haines2016-09-067-48/+179
* | | | | | Add storage methods for federated device messagesMark Haines2016-09-061-7/+132
* | | | | | Add tables for federated device messagesMark Haines2016-09-061-0/+38
* | | | | | Move _add_messages_to_device_inbox_txn into a separate methodMark Haines2016-09-061-37/+32
|/ / / / /
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/bulk_pushErik Johnston2016-09-051-0/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #1067 from matrix-org/markjh/idempotentMark Haines2016-09-051-0/+6
| |\ \ \ \
| | * | | | Fix membership changes to be idempotentMark Haines2016-09-021-0/+6
* | | | | | Remove unused importsErik Johnston2016-09-051-1/+0
* | | | | | Only fetch local pushersErik Johnston2016-09-051-1/+3
* | | | | | Make bulk_get_push_rules_for_room use get_joined_users_from_context cacheErik Johnston2016-09-052-13/+8
|/ / / / /
* | | | | Merge pull request #1066 from matrix-org/markjh/direct_to_device_lowerboundMark Haines2016-09-022-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Only return new device messages in /syncMark Haines2016-09-022-4/+6
| |/ / /
* | | | Explicitly specify state_key for history_visibility fetchingErik Johnston2016-09-021-1/+2
* | | | Merge pull request #1064 from matrix-org/erikj/on_receive_checkErik Johnston2016-09-021-6/+18
|\ \ \ \
| * | | | Comment on when auth chain and state are NoneErik Johnston2016-09-021-0/+3
| * | | | CommentErik Johnston2016-09-021-0/+3
| * | | | Only check if host is in room if we have state and auth_chainErik Johnston2016-09-021-6/+12
| | |_|/ | |/| |
* | | | DocstringsErik Johnston2016-09-021-0/+4
* | | | Merge pull request #1063 from matrix-org/erikj/pull_out_ids_onlyErik Johnston2016-09-022-6/+30
|\ \ \ \
| * | | | Only pull out IDs from DB for /state_ids/ requestErik Johnston2016-09-022-6/+30
| |/ / /
* | / / Bump max_entries on get_destination_retry_timingsErik Johnston2016-09-021-1/+1
| |/ / |/| |
* | | Merge branch 'develop' into markjh/direct_to_device_synchrotronMark Haines2016-09-0223-199/+357
|\| |
| * | Linearize state resolution to help cachesErik Johnston2016-09-011-56/+59
| * | Fix typo in log lineErik Johnston2016-09-011-1/+1
| * | Merge branch 'erikj/pdu_check' of github.com:matrix-org/synapse into developErik Johnston2016-09-011-5/+5
| |\ \
| | * | Ensure we only return a validated pdu in get_pduErik Johnston2016-09-011-5/+5
| * | | Merge pull request #1060 from matrix-org/erikj/state_idsErik Johnston2016-09-0113-141/+197
| |\ \ \ | | | |/ | | |/|
| | * | Use state_groups table to test existenceErik Johnston2016-08-311-1/+1
| | * | Handle the fact that workers can't generate state groupsErik Johnston2016-08-312-27/+60
| | * | Always specify state_group so that its in the cacheErik Johnston2016-08-311-0/+2
| | * | Add storage function to SlaveStoreErik Johnston2016-08-311-0/+1
| | * | Correctly handle the difference between prev and current stateErik Johnston2016-08-319-37/+82
| | * | Generate state group ids in state layerErik Johnston2016-08-313-19/+24
| | * | Make _state_groups_id_gen a normal IdGeneratorErik Johnston2016-08-303-48/+40
| | * | Remove state replication streamErik Johnston2016-08-301-23/+1
| * | | Lower get_linearized_receipts_for_room cache sizeErik Johnston2016-08-311-1/+1
| * | | Merge pull request #1059 from matrix-org/erikj/sent_transaction_deleteErik Johnston2016-08-312-0/+34
| |\ \ \
| | * | | Clean up old sent transactionsErik Johnston2016-08-312-0/+34
| * | | | Merge pull request #1057 from matrix-org/erikj/fix_email_nameErik Johnston2016-08-311-1/+1
| |\ \ \ \
| | * | | | Fix email notifs by adding missing paramErik Johnston2016-08-301-1/+1
| | |/ / /
| * | | | Merge pull request #1058 from matrix-org/markjh/direct_to_device_synchrotronMark Haines2016-08-314-4/+81
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | flake8Kegan Dougal2016-08-301-2/+3
| * | | | Use None instead of the empty stringKegan Dougal2016-08-302-9/+16
| * | | | Flake8Kegan Dougal2016-08-302-1/+3
| * | | | Allow application services to have an optional 'url'Kegan Dougal2016-08-302-0/+17
| | |/ / | |/| |
| * | | Merge pull request #1055 from matrix-org/erikj/occaisonally_persistErik Johnston2016-08-301-0/+28
| |\ \ \
| | * | | Check correct variableErik Johnston2016-08-301-1/+1
| | * | | Occaisonally persist unpersisted presence updatesErik Johnston2016-08-301-0/+28
| * | | | Don't notify for online -> online transitions.Erik Johnston2016-08-301-1/+6
| |/ / /
| * | | Merge pull request #1051 from matrix-org/erikj/fix_push_namesErik Johnston2016-08-301-1/+1
| |\ \ \
| | * | | Fix push room names for rooms with only an aliasErik Johnston2016-08-301-1/+1
| * | | | Comment about message deletionErik Johnston2016-08-301-0/+3
| * | | | Fix checkErik Johnston2016-08-301-2/+1
| * | | | Noop get_new_messages_for_device if token hasn't changedErik Johnston2016-08-301-9/+12
| |/ / /
* | / / Fix up the calls to the notifier for device messagesMark Haines2016-09-012-1/+4
| |/ / |/| |
* | | Return the current stream position from add_messages_to_device_inboxMark Haines2016-08-311-1/+4
* | | Add a replication stream for direct to device messagesMark Haines2016-08-314-3/+77
|/ /
* | Merge pull request #1049 from matrix-org/erikj/presence_users_in_roomErik Johnston2016-08-3012-27/+49
|\ \
| * | Add to slave storeErik Johnston2016-08-301-0/+5
| * | Use state handler instead of get_users_in_room/get_joined_hostsErik Johnston2016-08-2612-27/+44
* | | Add new direct message storage functions to slave storeErik Johnston2016-08-302-0/+32
* | | Merge remote-tracking branch 'origin/develop' into markjh/direct_to_deviceMark Haines2016-08-2625-399/+788
|\| |
| * | Fix room name in email notifsErik Johnston2016-08-261-19/+20
| * | Add is_host_joined to slave storageErik Johnston2016-08-262-3/+6
| * | TypoErik Johnston2016-08-261-1/+0
| * | Make None optionalErik Johnston2016-08-261-1/+1
| * | Measure _filter_events_for_serverErik Johnston2016-08-261-0/+2
| * | Don't pull out full state for _filter_events_for_serverErik Johnston2016-08-261-1/+25
| * | Cache check_host_in_roomErik Johnston2016-08-262-14/+41
| * | Add measure on check_host_in_roomErik Johnston2016-08-261-11/+12
| * | Add new state storage funcs to replicationErik Johnston2016-08-261-0/+3
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_idsErik Johnston2016-08-268-15/+77
| |\ \
| | * \ Merge pull request #1043 from matrix-org/erikj/backfill_fixErik Johnston2016-08-261-1/+3
| | |\ \
| | | * | Fix None check in backfillErik Johnston2016-08-251-1/+3
| | | |/
| | * | Just sprintf the 'kind' argument into uri directlyPaul "LeoNerd" Evans2016-08-251-3/+1
| | * | Move ThirdPartyEntityKind into api.constants so the expectation becomes that ...Paul "LeoNerd" Evans2016-08-254-9/+7
| | * | Root the 3PE lookup API within /_matrix/app/unstable instead of at toplevelPaul "LeoNerd" Evans2016-08-251-3/+16
| | * | APP_SERVICE_PREFIX is never used; don't botherPaul "LeoNerd" Evans2016-08-251-1/+0
| * | | Make sync not pull out full stateErik Johnston2016-08-252-34/+74
| * | | Fix up push to use get_current_state_idsErik Johnston2016-08-254-57/+87
| * | | Pull out full state lessErik Johnston2016-08-252-10/+15
| * | | Add descErik Johnston2016-08-251-1/+2
| * | | Replace context.current_state with context.current_state_idsErik Johnston2016-08-2513-222/+401
| * | | Pull out event ids rather than full events for stateErik Johnston2016-08-254-55/+119
| | |/ | |/|
* | | Merge branch 'develop' into markjh/direct_to_deviceMark Haines2016-08-2521-103/+191
|\ \ \ | | |/ | |/|
| * | Merge pull request #1041 from matrix-org/paul/third-party-lookupPaul Evans2016-08-254-4/+56
| |\ \ | | |/ | |/|
| | * appease pep8Paul "LeoNerd" Evans2016-08-251-3/+2
| | * Don't need toplevel cache on 3PE lookup metadata any morePaul "LeoNerd" Evans2016-08-251-8/+0
| | * Implement a ResponseCache around 3PE lookup metadata lookupsPaul "LeoNerd" Evans2016-08-251-11/+21
| | * Kill PROTOCOL_META since I'm not using it any morePaul "LeoNerd" Evans2016-08-251-7/+0
| | * Actually query over AS API for 3PE lookup metadataPaul "LeoNerd" Evans2016-08-252-13/+21
| | * Move static knowledge of protocol metadata into AS handler; cache the resultPaul "LeoNerd" Evans2016-08-242-22/+25
| | * Declare 'gitter' known protocol, with user lookupPaul "LeoNerd" Evans2016-08-241-0/+3
| | * Initial hack at the 3PN protocols metadata lookup APIPaul "LeoNerd" Evans2016-08-243-0/+44
| | * Move 3PU/3PL lookup APIs into /thirdparty containing entityPaul "LeoNerd" Evans2016-08-242-4/+4
| * | Bump changelog and versionErik Johnston2016-08-241-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.1Erik Johnston2016-08-2421-106/+194
| |\ \
| | * | Remove tracerErik Johnston2016-08-241-2/+1
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_l...Erik Johnston2016-08-241-2/+2
| | |\|
| | * | Preserve some logcontextsErik Johnston2016-08-2418-99/+136
| * | | Bump changelog and version v0.17.1-rc1Erik Johnston2016-08-221-1/+1
* | | | Add some TODOsMark Haines2016-08-251-0/+4
* | | | Fix the deduplication of incoming direct-to-device messagesMark Haines2016-08-252-1/+16
* | | | Add store-and-forward direct-to-device messagingMark Haines2016-08-259-4/+288
| |_|/ |/| |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginationErik Johnston2016-08-242-2/+13
|\ \ \ | | |/ | |/|
| * | Pass through user-supplied content in /join/$room_idKegan Dougal2016-08-232-2/+13
* | | Add None checks to backfillErik Johnston2016-08-241-2/+2
|/ /
* | Merge pull request #1038 from matrix-org/erikj/receved_txn_purgeErik Johnston2016-08-232-4/+45
|\ \ | |/ |/|
| * Delete old received_transactionsErik Johnston2016-08-222-4/+45
* | Merge pull request #1028 from matrix-org/dbkr/notifications_apiErik Johnston2016-08-224-0/+156
|\ \
| * \ Merge branch 'develop' into dbkr/notifications_apiMatthew Hodgson2016-08-2020-89/+384
| |\ \
| * | | Explicit joinDavid Baker2016-08-181-2/+2
| * | | Use tuple comparisonDavid Baker2016-08-181-4/+3
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_apiDavid Baker2016-08-1847-571/+1405
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/notifications_apiDavid Baker2016-08-11152-3214/+8075
| |\ \ \ \
| * | | | | Include the ts the notif was received atDavid Baker2016-05-242-5/+8
| * | | | | Actually make the 'read' flag correctDavid Baker2016-05-231-4/+3
| * | | | | Add GET /notifications APIDavid Baker2016-05-234-0/+155
* | | | | | Update commentMark Haines2016-08-221-1/+2
* | | | | | Add usage stats to prometheus monitoringMark Haines2016-08-221-2/+25
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #1031 from matrix-org/erikj/measure_notifierErik Johnston2016-08-226-182/+186
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add exception logging. Fix typoErik Johnston2016-08-221-3/+3
| * | | | Allow request handlers to override metric nameErik Johnston2016-08-221-21/+31
| * | | | Use top level measureErik Johnston2016-08-221-15/+1
| * | | | Add a top level measureErik Johnston2016-08-191-45/+46
| * | | | Remove redundant measureErik Johnston2016-08-191-35/+34
| * | | | Only abort Measure on ExceptionsErik Johnston2016-08-191-1/+1
| * | | | defer.returnValue must not be called within MeasureErik Johnston2016-08-192-9/+8
| * | | | Move defer.returnValue out of MeasureErik Johnston2016-08-191-1/+1
| * | | | Update keyring MeasureErik Johnston2016-08-191-85/+85
| * | | | Measure http.server renderErik Johnston2016-08-191-28/+30
| * | | | Measure _get_event_from_rowErik Johnston2016-08-191-41/+43
| * | | | Measure keyringsErik Johnston2016-08-191-34/+36
| * | | | Add measure blocks to notifierErik Johnston2016-08-191-15/+18
* | | | | Merge pull request #1030 from matrix-org/erikj/cache_contextsErik Johnston2016-08-1912-86/+190
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ensure invalidation list does not grow unboundedlyErik Johnston2016-08-192-20/+16
| * | | | Rename to on_invalidateErik Johnston2016-08-192-19/+13
| * | | | Make cache_context an explicit optionErik Johnston2016-08-192-9/+28
| * | | | Move _bulk_get_push_rules_for_room to storage layerErik Johnston2016-08-193-34/+65
| * | | | Remove lru optionErik Johnston2016-08-198-32/+17
| * | | | Add concept of cache contextsErik Johnston2016-08-193-20/+99
* | | | | Make get_new_events_for_appservice use indicesErik Johnston2016-08-191-2/+5
|/ / / /
* | | | Merge pull request #1026 from matrix-org/paul/thirdpartylookupPaul Evans2016-08-187-1/+189
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move validation logic for AS 3PE query response into ApplicationServiceApi cl...Paul "LeoNerd" Evans2016-08-182-45/+44
| * | | More warnings about invalid results from AS 3PE queryPaul "LeoNerd" Evans2016-08-181-2/+7
| * | | Avoid so much copypasta between 3PU and 3PL query by unifying around a ThirdP...Paul "LeoNerd" Evans2016-08-184-42/+34
| * | | Minor syntax neateningsPaul "LeoNerd" Evans2016-08-182-16/+10
| * | | Appease pep8Paul "LeoNerd" Evans2016-08-181-0/+2
| * | | Authenticate 3PE lookup requestsPaul "LeoNerd" Evans2016-08-181-0/+6
| * | | Copypasta the 3PU support code to also do 3PLPaul "LeoNerd" Evans2016-08-183-3/+61
| * | | Remove TODO note about request fields being strings - they're always stringsPaul "LeoNerd" Evans2016-08-181-2/+0
| * | | Log a warning if an AS yields an invalid 3PU lookup resultPaul "LeoNerd" Evans2016-08-181-1/+6
| * | | Scattergather the call out to ASes; validate received resultsPaul "LeoNerd" Evans2016-08-181-7/+34
| * | | Filter 3PU lookups by only ASes that declare knowledge of that protocolPaul "LeoNerd" Evans2016-08-183-3/+22
| * | | Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookupPaul "LeoNerd" Evans2016-08-1842-476/+1063
| |\ \ \
| * | | | Since empty lookups now return 200/empty list not 404, we can safely log fail...Paul "LeoNerd" Evans2016-08-181-3/+2
| * | | | Ensure that 3PU lookup request fields actually get passed inPaul "LeoNerd" Evans2016-08-181-1/+5
| * | | | Extend individual list results into the main return list, don't appendPaul "LeoNerd" Evans2016-08-181-1/+1
| * | | | Don't catch the return-value-as-exception that @defer.inlineCallbacks will usePaul "LeoNerd" Evans2016-08-181-1/+1
| * | | | Actually make 3PU lookup calls out to ASesPaul "LeoNerd" Evans2016-08-181-1/+10
| * | | | Thread 3PU lookup through as far as the AS API object; which currently noƶps itPaul "LeoNerd" Evans2016-08-173-2/+33
| * | | | Initial empty implementation that just registers an API endpoint handlerPaul "LeoNerd" Evans2016-08-172-0/+40
* | | | | Remove log linesErik Johnston2016-08-181-2/+0
* | | | | Add appservice workerErik Johnston2016-08-187-123/+369
| |/ / / |/| | |
* | | | Make AppserviceHandler stream events from databaseErik Johnston2016-08-184-22/+107
* | | | Missed a s/federation reader/media repository/ in a log messageMark Haines2016-08-181-1/+1
* | | | Merge pull request #1024 from matrix-org/markjh/media_repositoryMark Haines2016-08-181-0/+212
|\ \ \ \
| * | | | Add a media repository workerMark Haines2016-08-181-0/+212
* | | | | Merge pull request #1022 from matrix-org/erikj/as_notify_perfErik Johnston2016-08-182-62/+50
|\ \ \ \ \
| * | | | | Make notify_interested_services fasterErik Johnston2016-08-172-62/+50
* | | | | | Fix push_display_name_rename schema updateErik Johnston2016-08-171-0/+3
* | | | | | Make push Measure finer grainedErik Johnston2016-08-171-4/+5
* | | | | | Merge pull request #1021 from matrix-org/erikj/mediasecurity_policyErik Johnston2016-08-171-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Set `Content-Security-Policy` on media repoErik Johnston2016-08-171-0/+1
| |/ / / /
* | | | | Merge pull request #1011 from matrix-org/dbkr/contains_display_name_overrideDavid Baker2016-08-172-16/+37
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add migration scriptDavid Baker2016-08-161-0/+17
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name...David Baker2016-08-169-211/+244
| |\ \ \ \