summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1053 from Takios/developErik Johnston2016-08-311-0/+6
|\
| * Add prerequisites to install on openSUSE to READMEFabian Niepelt2016-08-301-0/+6
* | 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
|\ \ \ | |/ / |/| |
| * | 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 #1056 from matrix-org/kegan/appservice-url-is-optionalKegsay2016-08-302-1/+28
|\ \ \
| * | | 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
| | |/ | |/|
* | | Merge pull request #1054 from matrix-org/erikj/presence_noop_onlineErik Johnston2016-08-302-1/+53
|\ \ \
| * | | Don't notify for online -> online transitions.Erik Johnston2016-08-302-1/+53
| |/ /
* / / Remove FUD over psqlMatthew Hodgson2016-08-301-3/+0
|/ /
* | 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
| |/
* | Merge pull request #1052 from matrix-org/erikj/noop_new_device_messageErik Johnston2016-08-301-10/+15
|\ \ | |/ |/|
| * 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
|/
* Merge pull request #1049 from matrix-org/erikj/presence_users_in_roomErik Johnston2016-08-3014-68/+55
|\
| * Add to slave storeErik Johnston2016-08-301-0/+5
| * Fix unit testsErik Johnston2016-08-262-41/+6
| * Use state handler instead of get_users_in_room/get_joined_hostsErik Johnston2016-08-2612-27/+44
* | Merge pull request #1050 from matrix-org/erikj/fix_device_syncErik Johnston2016-08-302-0/+32
|\ \
| * | Add new direct message storage functions to slave storeErik Johnston2016-08-302-0/+32
|/ /
* | warn people to avoid running a HS media repository on the same domain as anot...Matthew Hodgson2016-08-271-0/+15
* | Merge pull request #1046 from matrix-org/markjh/direct_to_deviceMark Haines2016-08-2610-6/+309
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/develop' into markjh/direct_to_deviceMark Haines2016-08-2627-450/+866
| |\ | |/ |/|
* | Merge pull request #1048 from matrix-org/erikj/fix_mail_nameErik Johnston2016-08-261-19/+20
|\ \
| * | Fix room name in email notifsErik Johnston2016-08-261-19/+20
|/ /
* | Merge pull request #1047 from matrix-org/erikj/state_idsErik Johnston2016-08-2622-417/+822
|\ \
| * | 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
| * | Fix testsErik Johnston2016-08-261-5/+46
| * | 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
* | | | Merge pull request #1044 from matrix-org/paul/third-party-lookupPaul Evans2016-08-255-13/+21
|\ \ \ \
| * | | | 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-2515-270/+435
| | * | Pull out event ids rather than full events for stateErik Johnston2016-08-254-55/+119
| |/ /
| | * More 0_0 in testsMark Haines2016-08-251-2/+2
| | * Merge branch 'develop' into markjh/direct_to_deviceMark Haines2016-08-2522-103/+238
| | |\ | |_|/ |/| |
* | | 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
* | | Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse into developErik Johnston2016-08-242-1/+48
|\ \ \
| * | | Bump changelog and versionErik Johnston2016-08-242-1/+15
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.1Erik Johnston2016-08-2421-106/+194
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1042 from matrix-org/erikj/preserve_log_contextsErik Johnston2016-08-2417-98/+134
|\ \ \ \ | |_|/ / |/| | |
| * | | 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-222-1/+34
| | | * 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 pull request #1040 from matrix-org/erikj/paginationErik Johnston2016-08-241-2/+2
|\ \ \ | |/ / |/| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginationErik Johnston2016-08-242-2/+13
| |\ \ | |/ / |/| |
* | | Merge pull request #1039 from matrix-org/kegan/join-with-custom-contentKegsay2016-08-232-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-2024-91/+750
| |\ \
| * | | 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-1853-644/+1549
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/notifications_apiDavid Baker2016-08-11208-3563/+9806
| |\ \ \ \
| * | | | | 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
* | | | | | Merge pull request #1037 from matrix-org/markjh/add_stats_to_prometheusMark Haines2016-08-221-2/+26
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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 #1032 from matrix-org/matthew/workerdocMatthew Hodgson2016-08-192-1/+98
|\ \ \ \ \
| * | | | | PR feedbackMatthew Hodgson2016-08-191-5/+9
| * | | | | quick guide to synapse scalability via workersMatthew Hodgson2016-08-191-0/+93
| * | | | | increase RAM reqsMatthew Hodgson2016-08-191-1/+1
|/ / / / /
* | | | | Merge pull request #1030 from matrix-org/erikj/cache_contextsErik Johnston2016-08-1914-87/+458
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ensure invalidation list does not grow unboundedlyErik Johnston2016-08-194-20/+104
| * | | | Rename to on_invalidateErik Johnston2016-08-193-21/+15
| * | | | Make cache_context an explicit optionErik Johnston2016-08-193-11/+30
| * | | | Move _bulk_get_push_rules_for_room to storage layerErik Johnston2016-08-193-34/+65
| * | | | Remove lru optionErik Johnston2016-08-199-33/+18
| * | | | Add concept of cache contextsErik Johnston2016-08-195-20/+278
* | | | | Merge pull request #1029 from matrix-org/erikj/appservice_streamErik Johnston2016-08-191-2/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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-1847-549/+1206
| |\ \ \
| * | | | 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
* | | | | Merge pull request #1027 from matrix-org/erikj/appservice_streamErik Johnston2016-08-187-123/+367
|\ \ \ \ \
| * | | | | Remove log linesErik Johnston2016-08-181-2/+0
| * | | | | Empty commitErik Johnston2016-08-180-0/+0
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/appservice...Erik Johnston2016-08-181-0/+1
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Jenkins: tox install setuptoolsErik Johnston2016-08-181-0/+1
| |_|/ / / |/| | | |
* | | | | Merge pull request #1025 from matrix-org/erikj/appservice_streamErik Johnston2016-08-185-25/+113
|\ \ \ \ \
| | * | | | Add appservice workerErik Johnston2016-08-187-123/+369
| |/ / / /
| * / / / Make AppserviceHandler stream events from databaseErik Johnston2016-08-185-25/+113
|/ / / /
* | | | 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-184-130/+104
|\ \ \ \ \
| * | | | | Make notify_interested_services fasterErik Johnston2016-08-174-130/+104
* | | | | | Merge pull request #1023 from matrix-org/erikj/update_fixErik Johnston2016-08-181-0/+3
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Empty commit to trigger re-testDavid Baker2016-08-170-0/+0
| * | | | Add migration scriptDavid Baker2016-08-161-0/+17
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name...David Baker2016-08-1611-212/+324
| |\ \ \ \
| * | | | | s/underride/override/ in the rule_id tooDavid Baker2016-08-161-1/+1
| * | | | | Move display name ruleDavid Baker2016-08-151-16/+20
* | | | | | Add None check to _iterate_over_textErik Johnston2016-08-171-1/+1
* | | | | | Change name of metricMatrix2016-08-171-1/+1
* | | | | | Move Measure block inside loopErik Johnston2016-08-171-9/+9
* | | | | | Merge pull request #1019 from matrix-org/erikj/appservice_cleanErik Johnston2016-08-172-32/+31
|\ \ \ \ \ \
| * | | | | | Clean up _ServiceQueuerErik Johnston2016-08-172-32/+31
* | | | | | | Merge pull request #1018 from matrix-org/erikj/dead_appserviceErik Johnston2016-08-171-39/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove dead appservice codeErik Johnston2016-08-171-39/+2
|/ / / / / /
* | | | | | Merge pull request #1017 from matrix-org/erikj/appservice_measureErik Johnston2016-08-172-19/+24
|\ \ \ \ \ \
| * | | | | | Update unit testsErik Johnston2016-08-171-0/+2
| * | | | | | Measure notify_interested_servicesErik Johnston2016-08-171-19/+22
* | | | | | | Merge pull request #1016 from matrix-org/erikj/short_circuit_cacheErik Johnston2016-08-171-0/+3
|\| | | | | | | |_|/ / / / |/| | | | |
| * | | | | Do it in storage functionErik Johnston2016-08-162-1/+4
| * | | | | Don't update caches replication stream if tokens haven't advancedErik Johnston2016-08-161-1/+1
|/ / / / /
* | | | | Merge pull request #1015 from matrix-org/erikj/preview_url_fixesErik Johnston2016-08-163-160/+275
|\ \ \ \ \
| * | | | | Add lxml to jenkins-unittests.shErik Johnston2016-08-161-0/+1
| * | | | | Flake8Erik Johnston2016-08-161-4/+1
| * | | | | Fix up preview URL API. Add tests.Erik Johnston2016-08-162-158/+275
|/ / / / /
* | | | | Merge pull request #1012 from matrix-org/erikj/limit_backfill_uriErik Johnston2016-08-161-4/+5
|\ \ \ \ \
| * | | | | Limit number of extremeties in backfill requestErik Johnston2016-08-161-4/+5
* | | | | | Merge pull request #1010 from matrix-org/erikj/refactor_deletionsErik Johnston2016-08-166-47/+42
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use cached get_user_by_access_token in slavesErik Johnston2016-08-163-2/+3
| * | | | | Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to sl...Erik Johnston2016-08-153-45/+39
| |/ / / /
* | | | | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ...Erik Johnston2016-08-161-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing database corruption recovery caseBenjamin Saunders2016-08-141-1/+2
* | | | | Merge pull request #1009 from matrix-org/erikj/event_splitErik Johnston2016-08-1524-92/+367
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Doc get_next() context manager usageErik Johnston2016-08-151-0/+4
| * | | | Rename table. Add docs.Erik Johnston2016-08-154-6/+16
| * | | | Remove broken cache stuffErik Johnston2016-08-152-21/+0
| * | | | Use cached version of get_aliases_for_roomErik Johnston2016-08-151-1/+1
| * | | | Implement cache replication streamErik Johnston2016-08-155-30/+92
| * | | | Add some invalidations to a cache_streamErik Johnston2016-08-157-31/+117
| * | | | Always run txn.after_callbacksErik Johnston2016-08-151-7/+8
| * | | | Make synchrotron accept /eventsErik Johnston2016-08-125-18/+66
| * | | | Dont invoke get_handlers fromClientV1RestServletErik Johnston2016-08-129-1/+86
* | | | | Merge pull request #1007 from sargon/developErik Johnston2016-08-141-2/+2
|\ \ \ \ \
| * | | | | Log the value which is observed in the first place.Daniel Ehlers2016-08-141-1/+1
| * | | | | Fix AttributeError when bind_dn is not defined.Daniel Ehlers2016-08-141-1/+1
* | | | | | Merge pull request #1005 from matrix-org/erikj/linearize_joinsErik Johnston2016-08-121-1/+1
|\| | | | | | |/ / / / |/| | | |
| * | | | Only process one local membership event per room at a timeErik Johnston2016-08-121-1/+1
|/ / / /
* | | | Merge pull request #997 from Half-Shot/developErik Johnston2016-08-113-5/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Synced up synchrotron set_state with PresenceHandler set_stateWill Hunt2016-08-111-1/+1
| * | | Don't change status_msg on /syncWill Hunt2016-08-102-4/+7
* | | | Merge pull request #1003 from matrix-org/erikj/redaction_prev_contentErik Johnston2016-08-111-0/+2
|\ \ \ \
| * | | | Include prev_content in redacted state eventsErik Johnston2016-08-111-0/+2
|/ / / /
* | | | Merge pull request #1000 from matrix-org/erikj/contextsErik Johnston2016-08-114-221/+164
|\ \ \ \
| * | | | PEP8Erik Johnston2016-08-101-1/+3
| * | | | Clean up TransactionQueueErik Johnston2016-08-104-221/+162
|/ / / /
* | | | Merge pull request #999 from matrix-org/erikj/measure_moreErik Johnston2016-08-102-5/+21
|\ \ \ \
| * | | | Measure federation send transaction resourcesErik Johnston2016-08-102-5/+21
| |/ / /
* | | | Merge pull request #998 from matrix-org/erikj/pdu_fail_cacheErik Johnston2016-08-102-21/+53
|\ \ \ \ | |/ / / |/| | |
| * | | Don't stop on 4xx series errorsErik Johnston2016-08-101-11/+1
| * | | Also check if server is in the roomErik Johnston2016-08-101-2/+7
| * | | Also pull out rejected eventsErik Johnston2016-08-101-1/+1
| * | | Correctly auth /event/ requestsErik Johnston2016-08-101-5/+6
| * | | Only resign our own eventsErik Johnston2016-08-101-9/+10
| * | | Store if we fail to fetch an event from a destinationErik Johnston2016-08-101-1/+36
|/ / /
* | | Merge pull request #996 from matrix-org/erikj/tls_errorErik Johnston2016-08-102-13/+19
|\ \ \
| * | | Don't print stack traces when failing to get remote keysErik Johnston2016-08-102-13/+19
* | | | /login: Respond with a 403 when we get an invalid m.login.tokenRichard van der Hoff2016-08-091-3/+3
|/ / /
* | | Merge pull request #995 from matrix-org/rav/clean_up_cas_loginDavid Baker2016-08-091-125/+33
|\ \ \
| * | | Clean up CAS login codeRichard van der Hoff2016-08-081-125/+33
| |/ /
* | | Merge pull request #994 from matrix-org/rav/fix_cas_loginDavid Baker2016-08-081-0/+1
|\ \ \
| * | | Fix CAS loginRichard van der Hoff2016-08-081-0/+1
| |/ /
* | | Merge pull request #993 from matrix-org/rav/fix_token_loginRichard van der Hoff2016-08-084-31/+87
|\ \ \ | |/ / |/| |
| * | PEP8Richard van der Hoff2016-08-081-0/+1
| * | Fix login with m.login.tokenRichard van der Hoff2016-08-084-32/+87
* | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse v0.17.0Erik Johnston2016-08-08136-1642/+5931
|\ \ \
| * | | Capatailize HTMLErik Johnston2016-08-081-1/+1
| * | | Be bolderErik Johnston2016-08-081-1/+1
| * | | Update changelogErik Johnston2016-08-081-3/+7
| * | | Update changelogErik Johnston2016-08-081-1/+1
| * | | Bump changelog and versionErik Johnston2016-08-082-1/+16
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-08-0813-68/+124
| |\| |
| | * | Merge pull request #992 from matrix-org/erikj/psutil_conditionalErik Johnston2016-08-083-6/+16
| | |\ \
| | | * | Make psutil optionalErik Johnston2016-08-083-6/+16
| | |/ /
| | * | Merge pull request #991 from matrix-org/erikj/retry_makeErik Johnston2016-08-051-11/+24
| | |\ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 12:53:14 +0000