summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Readd entries to public_room_list_stream that were deletedErik Johnston2016-09-212-1/+23
* Fix _delete_old_forward_extrem_cache queryErik Johnston2016-09-211-5/+4
* Merge pull request #1131 from matrix-org/matthew/e2e-notifsErik Johnston2016-09-191-0/+49
|\
| * _id field must uniquely identify different conditionsErik Johnston2016-09-191-2/+2
| * proposal for notifying on e2e eventsMatthew Hodgson2016-09-171-0/+49
* | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pagErik Johnston2016-09-191-12/+25
|\ \
| * | PEP8Erik Johnston2016-09-171-1/+1
| * | Handle fact that _generate_room_entry may not return a room entryErik Johnston2016-09-171-12/+25
* | | Enable guest access to POST /publicRoomsErik Johnston2016-09-171-2/+2
| |/ |/|
* | Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pagErik Johnston2016-09-171-110/+123
|\|
| * SpellingErik Johnston2016-09-171-1/+1
| * Fix and clean up publicRooms paginationErik Johnston2016-09-171-110/+123
* | Merge pull request #1127 from matrix-org/dbkr/publicroom_search_case_insensitiveErik Johnston2016-09-171-4/+4
|\ \
| * | Make public room search case insensitiveDavid Baker2016-09-161-4/+4
| |/
* | mention client_reader workerMatthew Hodgson2016-09-171-0/+1
* | fix logger for client_reader workerMatthew Hodgson2016-09-171-1/+1
|/
* Fix public room pagination for client_reader appErik Johnston2016-09-161-0/+1
* Merge pull request #1126 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-167-24/+158
|\
| * CommentErik Johnston2016-09-161-0/+2
| * Make POST /publicRooms require authErik Johnston2016-09-161-2/+1
| * CommentErik Johnston2016-09-161-0/+2
| * Add remote reoom cacheErik Johnston2016-09-161-2/+23
| * Support filtering remote room listsErik Johnston2016-09-163-6/+18
| * Filter remote rooms lists locallyErik Johnston2016-09-162-11/+25
| * Don't cache searched in /publicRoomsErik Johnston2016-09-161-1/+5
| * Add new storage function to slave storeErik Johnston2016-09-161-0/+1
| * Add very basic filter API to /publicRoomsErik Johnston2016-09-151-5/+18
| * Change the way we calculate new_limit in /publicRooms and add POST APIErik Johnston2016-09-152-15/+62
| * Handling expiring stream extrems correctly.Erik Johnston2016-09-152-3/+22
|/
* Merge pull request #1125 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-152-6/+6
|\
| * Change get_pos_of_last_change to return upper boundErik Johnston2016-09-152-6/+6
* | Merge pull request #1124 from matrix-org/erikj/enable_state_caching_workersErik Johnston2016-09-156-0/+6
|\ \
| * | Enable state caches on workersErik Johnston2016-09-156-0/+6
* | | Merge pull request #1123 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-153-2/+19
|\ \ \ | |/ / |/| / | |/
| * Use stream_change cache to make get_forward_extremeties_for_room cache more e...Erik Johnston2016-09-153-2/+19
* | Merge pull request #1122 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-152-1/+2
|\|
| * Add cache to get_forward_extremeties_for_roomErik Johnston2016-09-152-1/+2
|/
* Remove default public rooms limitErik Johnston2016-09-151-1/+1
* Merge pull request #1120 from matrix-org/erikj/push_invite_cacheErik Johnston2016-09-151-9/+1
|\
| * Ensure we don't mutate the cache of push rulesErik Johnston2016-09-151-9/+1
* | Merge pull request #1121 from matrix-org/erikj/public_room_paginateErik Johnston2016-09-1518-139/+595
|\ \ | |/ |/|
| * By default limit /publicRooms to 100 entriesErik Johnston2016-09-151-1/+1
| * Stream public room changes down replicationErik Johnston2016-09-154-1/+74
| * Base public room list off of public_rooms streamErik Johnston2016-09-152-7/+79
| * Pass since/from parameters over federationErik Johnston2016-09-156-57/+63
| * Allow paginating both forwards and backwardsErik Johnston2016-09-152-24/+65
| * Remove support for aggregate room listsErik Johnston2016-09-153-65/+1
| * Accept optional token to public room listErik Johnston2016-09-152-7/+76
| * Calculate the public room list from a stream_orderingErik Johnston2016-09-142-3/+43
| * Refactor public rooms to not pull out the full state for each roomErik Johnston2016-09-142-16/+33
| * Add a room visibility streamErik Johnston2016-09-144-16/+100
| * Add a DB index to figure out past state at a stream ordering in a roomErik Johnston2016-09-142-0/+118
* | Merge pull request #1117 from matrix-org/erikj/fix_stateErik Johnston2016-09-143-20/+30
|\ \
| * | Amalgamate two identical consecutive if statementsErik Johnston2016-09-141-7/+5
| * | Fix reindexErik Johnston2016-09-141-15/+16
| * | Ensure we don't mutate state cache entriesErik Johnston2016-09-143-22/+33
* | | Merge pull request #1118 from matrix-org/erikj/public_rooms_splitoutErik Johnston2016-09-145-159/+403
|\ \ \ | |/ / |/| / | |/
| * Enable testing of client_readerErik Johnston2016-09-141-0/+2
| * Split out public room list into a worker processErik Johnston2016-09-141-0/+215
| * Move RoomListHandler into a separate fileErik Johnston2016-09-143-159/+186
|/
* Merge pull request #1111 from matrix-org/matthew/device-idsMatthew Hodgson2016-09-141-1/+1
|\
| * make device IDs more useful for human disambiguationMatthew Hodgson2016-09-131-1/+1
* | Merge pull request #1116 from matrix-org/paul/tiny-fixesPaul Evans2016-09-131-2/+2
|\ \
| * | Fix typo "persiting"Paul "LeoNerd" Evans2016-09-131-2/+2
* | | Merge pull request #1114 from matrix-org/markjh/limit_key_retriesMark Haines2016-09-131-11/+30
|\ \ \ | |/ / |/| |
| * | Limit how often we ask for keys from dead serversMark Haines2016-09-131-11/+30
|/ /
* | Merge pull request #1112 from matrix-org/markjh/e2e_key_handlerMark Haines2016-09-132-115/+118
|\ \
| * | Move the E2E key handling into the e2e handlerMark Haines2016-09-132-115/+118
|/ /
* | Merge pull request #1110 from matrix-org/markjh/e2e_timeoutMark Haines2016-09-135-55/+115
|\ \
| * | Add a timeout parameter for end2end key queries.Mark Haines2016-09-125-55/+115
* | | Merge pull request #1109 from matrix-org/erikj/partial_indicesErik Johnston2016-09-134-10/+41
|\ \ \
| * | | Remove where clauseErik Johnston2016-09-121-1/+0
| * | | Index contains_url for file search queriesErik Johnston2016-09-122-0/+25
| * | | Add WHERE clause support to index creationErik Johnston2016-09-122-10/+17
* | | | Merge pull request #1108 from matrix-org/erikj/create_dmErik Johnston2016-09-121-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Add is_direct param to /createRoomErik Johnston2016-09-121-0/+6
| |/ /
* | | Merge pull request #1107 from matrix-org/erikj/backfill_noneErik Johnston2016-09-121-1/+1
|\ \ \
| * | | Fix backfill when cannot find an event.Erik Johnston2016-09-121-1/+1
| |/ /
* | | Merge pull request #1106 from matrix-org/erikj/state_reindex_concurrentErik Johnston2016-09-121-1/+1
|\ \ \
| * | | Create new index concurrentlyErik Johnston2016-09-121-1/+1
| |/ /
* | | Merge pull request #1105 from matrix-org/erikj/make_notif_highlight_query_fastErik Johnston2016-09-122-1/+29
|\ \ \ | |/ / |/| |
| * | Change the index to be stream_ordering, highlightErik Johnston2016-09-121-1/+1
| * | Remove unused importErik Johnston2016-09-121-1/+0
| * | Use register_background_index_updateErik Johnston2016-09-121-24/+4
| * | Add back in query changeErik Johnston2016-09-121-1/+3
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_notif...Erik Johnston2016-09-1216-48/+133
| |\ \
| * | | Make reindex happen in bgErik Johnston2016-09-122-3/+32
* | | | Merge pull request #1104 from matrix-org/markjh/direct_to_device_federation_syncMark Haines2016-09-121-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix direct to device messages recieved over federation to notify syncMark Haines2016-09-121-0/+2
* | | | Merge pull request #1103 from matrix-org/markjh/comment_on_create_indexMark Haines2016-09-126-0/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Add comments to existing schema deltas that used "CREATE INDEX" directlyMark Haines2016-09-126-0/+24
|/ / /
* | | Merge pull request #1102 from matrix-org/revert-1099-dbkr/make_notif_highligh...Erik Johnston2016-09-122-21/+1
|\ \ \
| * | | Revert "Add index to event_push_actions"Erik Johnston2016-09-122-21/+1
|/ / /
* | | Merge pull request #1101 from matrix-org/erikj/state_types_idxErik Johnston2016-09-121-19/+35
|\ \ \
| * | | Change state fetch query for postgres to be fasterErik Johnston2016-09-121-19/+35
* | | | Merge pull request #1097 from matrix-org/erikj/replication_typing_restErik Johnston2016-09-122-1/+11
|\ \ \ \ | |/ / / |/| | |
| * | | CommentErik Johnston2016-09-091-0/+3
| * | | Correctly handle typing stream id resettingErik Johnston2016-09-091-1/+8
* | | | Merge pull request #1095 from matrix-org/erikj/batch_edusErik Johnston2016-09-125-20/+60
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edusErik Johnston2016-09-099-33/+148
| |\ \ \
| * | | | Fix incorrect attribute nameErik Johnston2016-09-091-1/+1
| * | | | CommentErik Johnston2016-09-091-0/+1
| * | | | 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
* | | | | Merge pull request #1100 from VShell/fix-casRichard van der Hoff2016-09-091-5/+2
|\ \ \ \ \
| * | | | | Conform better to the CAS protocol specificationShell Turner2016-09-091-5/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #1099 from matrix-org/dbkr/make_notif_highlight_query_fastDavid Baker2016-09-092-1/+21
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_...David Baker2016-09-0932-256/+967
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1096 from matrix-org/markjh/get_access_tokenMark Haines2016-09-096-27/+67
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add helper function for getting access_tokens from requestsMark Haines2016-09-096-27/+67
* | | | Merge pull request #1091 from matrix-org/paul/third-party-lookupPaul Evans2016-09-093-4/+72
|\ \ \ \
| * | | | Log if rejecting 3PE query metadata result due to type checkPaul "LeoNerd" Evans2016-09-091-4/+11
| * | | | Reject malformed 3PE query metadata results earlier in AS API handling codePaul "LeoNerd" Evans2016-09-092-11/+15
| * | | | Minor fixes from PR commentsPaul "LeoNerd" Evans2016-09-091-2/+2
| * | | | appease pep8Paul "LeoNerd" Evans2016-09-091-1/+2
| * | | | Python isn't JavaScript; have to quote dict keysPaul "LeoNerd" Evans2016-09-091-1/+1
| * | | | Efficiency fix for lookups of a single protocolPaul "LeoNerd" Evans2016-09-092-2/+7
| * | | | Allow lookup of a single 3PE protocol query metadataPaul "LeoNerd" Evans2016-09-091-0/+21
| * | | | Don't corrupt shared cache on subsequent protocol requestsPaul "LeoNerd" Evans2016-09-091-0/+2
| * | | | Collect up all the "instances" lists of individual AS protocol results into o...Paul "LeoNerd" Evans2016-09-081-1/+29
* | | | | Merge pull request #1094 from matrix-org/paul/get-state-whole-eventPaul Evans2016-09-091-2/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Filter returned events for client-facing formatPaul "LeoNerd" Evans2016-09-091-2/+3
| * | | | Allow clients to specify the format a room state event is returned inPaul "LeoNerd" Evans2016-09-091-1/+7
| | |/ / | |/| |
* | | | Drop replication log levelsErik Johnston2016-09-092-3/+2
* | | | Merge pull request #1093 from matrix-org/erikj/dedupe_presenceErik Johnston2016-09-091-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | 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
* | | | | Merge pull request #1090 from matrix-org/erikj/transaction_queue_checkErik Johnston2016-09-091-122/+134
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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-093-3/+10
|\ \ \ \
| * | | | Bump changelog and versionErik Johnston2016-09-092-2/+9
| * | | | 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
|\ \ \ \ \
* \ \ \ \ \ 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 pull request #1085 from matrix-org/erikj/reindex_state_groupsErik Johnston2016-09-083-2/+57
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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-082-1/+38
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'release-v0.17.2' of github.com:matrix-org/synapse v0.17.2Erik Johnston2016-09-0860-673/+1836
| |\ \ \ \ \ \
| | * | | | | | Bump version and changelogErik Johnston2016-09-082-1/+10
| | * | | | | | Mention get_pdu bug v0.17.2-rc1Erik Johnston2016-09-051-0/+2
| | * | | | | | TypoErik Johnston2016-09-051-1/+1
| | * | | | | | Bump changelog and versionErik Johnston2016-09-052-1/+27
* | | | | | | | Merge pull request #1083 from matrix-org/erikj/check_originErik Johnston2016-09-082-1/+15
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Check the user_id for presence/typing matches originErik Johnston2016-09-082-1/+15
|/ / / / / / /
* | | | | | | Merge pull request #1074 from matrix-org/markjh/direct_to_device_federationMark Haines2016-09-0811-71/+456
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into markjh/direct_to_device_federationMark Haines2016-09-0813-132/+542
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
| * | | | | | | Fix unit testsMark Haines2016-09-061-0/+8
| * | | | | | | 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
| | |/ / / / / | |/| | | | |
| | | | | | * Add index to event_push_actionsDavid Baker2016-09-092-1/+21
| | | | | |/
| | | | | * Implement `only=highlight` on `/notifications`David Baker2016-09-082-2/+10
| |_|_|_|/ |/| | | |
* | | | | Log delta files we're applyingErik Johnston2016-09-081-2/+2
| |_|/ / |/| | |
* | | | Merge pull request #1079 from matrix-org/erikj/state_seqscanErik Johnston2016-09-081-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
| |/ /
* | | Merge pull request #1076 from matrix-org/erikj/state_storageErik Johnston2016-09-071-5/+10
|\ \ \
| * | | 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-0214-84/+230
| |\ \ \ \ \ \
| * | | | | | | Limit the length of state chainsErik Johnston2016-09-022-43/+106
| * | | | | | | Move to storing state_groups_state as deltasErik Johnston2016-09-015-62/+172
* | | | | | | | Merge pull request #1073 from matrix-org/erikj/presence_fiddleErik Johnston2016-09-061-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #1071 from matrix-org/erikj/pdf_fixErik Johnston2016-09-051-1/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #1069 from matrix-org/erikj/host_findErik Johnston2016-09-052-46/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use get_joined_users_from_context instead of manually looking up hostsErik Johnston2016-09-052-46/+17
|/ / / / / /
* | | | | | Merge pull request #1068 from matrix-org/erikj/bulk_pushErik Johnston2016-09-052-14/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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 pull request #1062 from matrix-org/markjh/direct_to_device_synchrotronMark Haines2016-09-022-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'develop' into markjh/direct_to_device_synchrotronMark Haines2016-09-0228-234/+430
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1061 from matrix-org/erikj/linearize_resolutionErik Johnston2016-09-011-56/+59
|\ \ \ \
| * | | | 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 branch 'release-v0.17.1' of github.com:matrix-org/synapse v0.17.1Erik Johnston2016-08-2498-1434/+3281
| |\ \ \
* | \ \ \ Merge pull request #1060 from matrix-org/erikj/state_idsErik Johnston2016-09-0116-173/+217
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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-3112-69/+102
| * | | | 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 #1053 from Takios/developErik Johnston2016-08-311-0/+6
|\ \ \ \ \