summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into dbkr/notifications_apiMatthew Hodgson2016-08-2024-91/+750
|\
| * 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
* | | | 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 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 remote-tracking branch 'origin/develop' into dbkr/notifications_apiDavid Baker2016-08-11208-3563/+9806
|\| | |
| * | | 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
| | | |\
| | | | * Fix a couple of python bugsErik Johnston2016-08-051-6/+8
| | | | * Retry joining via other servers if first one failedErik Johnston2016-08-051-5/+16
| | | * | Merge pull request #990 from matrix-org/erikj/fed_versErik Johnston2016-08-056-49/+80
| | | |\ \ | | | | |/ | | | |/|
| | | | * Add federation /version APIErik Johnston2016-08-056-9/+25
| | | | * Change the way we specify if we require auth or notErik Johnston2016-08-051-40/+55
| | | * | Print newline after result in federation_client scriptErik Johnston2016-08-051-0/+1
| | | * | Merge pull request #989 from matrix-org/erikj/raise_404Erik Johnston2016-08-051-1/+1
| | | |\ \
| | | | * | Raise 404 when couldn't find eventErik Johnston2016-08-051-1/+1
| | | | |/
| | | * | Merge pull request #988 from matrix-org/erikj/ignore_comments_previewErik Johnston2016-08-051-1/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * Don't include html comments in descriptionErik Johnston2016-08-051-1/+2
| | | |/
| | * | Update changelog v0.17.0-rc4Erik Johnston2016-08-051-2/+2
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-08-051-21/+50
| | |\|
| | | * Merge pull request #987 from matrix-org/erikj/fix_backfill_authErik Johnston2016-08-051-21/+50
| | | |\
| | | | * Fix backfill auth eventsErik Johnston2016-08-051-21/+50
| | | |/
| | * | Bump version and changelogErik Johnston2016-08-052-1/+17
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-08-0525-369/+1070
| | |\|
| | | * Merge pull request #986 from matrix-org/erikj/stateErik Johnston2016-08-051-2/+16
| | | |\
| | | | * Fix typoErik Johnston2016-08-051-1/+1
| | | | * Check if we already have the events returned by /state/Erik Johnston2016-08-051-2/+16
| | | * | Merge pull request #985 from matrix-org/erikj/fix_integrity_retryErik Johnston2016-08-052-1/+9
| | | |\|
| | | | * Delete more tablesErik Johnston2016-08-051-0/+5
| | | | * Fallback to /state/ on both 400 and 404Erik Johnston2016-08-051-1/+1
| | | | * Tweak integrity error recovery to work as intendedBenjamin Saunders2016-08-042-1/+4
| | | |/
| | | * Merge pull request #973 from matrix-org/erikj/xpath_fixErik Johnston2016-08-042-14/+211
| | | |\
| | | | * TypoErik Johnston2016-08-041-1/+1
| | | | * Test summarizationErik Johnston2016-08-042-52/+193
| | | | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fixErik Johnston2016-08-0423-349/+769
| | | | |\
| | | | * | Don't infer paragrahs from newlinesErik Johnston2016-08-021-2/+1
| | | | * | Comment on why we cloneErik Johnston2016-08-021-0/+1
| | | | * | Spelling.Erik Johnston2016-08-021-3/+3
| | | | * | Make it actually compileErik Johnston2016-08-021-1/+1
| | | | * | Change the way we summarize URLsErik Johnston2016-08-021-11/+67
| | | * | | Merge pull request #983 from matrix-org/erikj/retry_on_integrity_errorErik Johnston2016-08-041-4/+66
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Fix typoErik Johnston2016-08-041-3/+4
| | | | * | Retry event persistence on IntegrityErrorErik Johnston2016-08-041-4/+65
| | | * | | Merge pull request #979 from matrix-org/erikj/state_ids_apiErik Johnston2016-08-044-1/+151
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix typos.Erik Johnston2016-08-041-3/+3
| | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_apiErik Johnston2016-08-0418-305/+572
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | Merge pull request #982 from matrix-org/erikj/fix_port_scriptErik Johnston2016-08-041-43/+132
| | | |\ \ \
| | | | * | | Allow upgrading from old port_from_sqlite3 formatErik Johnston2016-08-041-0/+21
| | | | * | | Handle the fact that some tables have negative rowid rowsErik Johnston2016-08-041-43/+111
| | | * | | | Merge pull request #981 from matrix-org/rav/omit_device_displayname_if_nullRichard van der Hoff2016-08-041-3/+4
| | | |\ \ \ \
| | | | * | | | keys/query: Omit device displayname if nullRichard van der Hoff2016-08-041-3/+4
| | | * | | | | Factor out more common code from the jenkins scripts (#980)Mark Haines2016-08-044-138/+44
| | | |/ / / /
| | | * | | | Merge pull request #978 from matrix-org/rav/device_name_in_e2e_devicesRichard van der Hoff2016-08-033-20/+141
| | | |\ \ \ \
| | | | * | | | PEP8Richard van der Hoff2016-08-032-12/+10
| | | | * | | | Include device name in /keys/query responseRichard van der Hoff2016-08-033-20/+143
| | | * | | | | Merge pull request #977 from matrix-org/rav/return_all_devicesRichard van der Hoff2016-08-032-3/+52
| | | |\| | | | | | | | |/ / / | | | |/| | |
| | | | * | | keys/query: return all users which were asked forRichard van der Hoff2016-08-032-3/+52
| | | |/ / /
| | | * | | Merge branch 'rav/null_default_device_displayname' into developRichard van der Hoff2016-08-034-5/+23
| | | |\ \ \
| | | | * | | PEP8Richard van der Hoff2016-08-031-1/+1
| | | | * | | Default device_display_name to nullRichard van der Hoff2016-08-034-5/+23
| | | * | | | Merge branch 'rav/refactor_device_query' into developRichard van der Hoff2016-08-036-82/+167
| | | |\ \ \ \
| | | | * | | | E2eKeysHandler: minor tweaksRichard van der Hoff2016-08-031-5/+3
| | | | * | | | Merge branch 'develop' into rav/refactor_device_queryMark Haines2016-08-0322-139/+507
| | | | |\| | |
| | | | * | | | E2E keys: Make federation query share code with client queryRichard van der Hoff2016-08-023-47/+92
| | | | * | | | Move e2e query logic into a handlerRichard van der Hoff2016-08-014-60/+102
| | | * | | | | Merge pull request #975 from matrix-org/erikj/multi_event_persistErik Johnston2016-08-031-20/+18
| | | |\ \ \ \ \
| | | | * | | | | Remove other bit of deduplicationErik Johnston2016-08-031-19/+0
| | | | * | | | | Ensure we only persist an event once at a timeErik Johnston2016-08-031-1/+18
| | | | | |_|_|/ | | | | |/| | |
| | | | | | | * Tidy up get_eventsErik Johnston2016-08-041-12/+10
| | | | | | | * Rename fields to _idsErik Johnston2016-08-032-4/+4
| | | | | | | * Fix copy + paste failsErik Johnston2016-08-032-6/+11
| | | | | | | * Actually call get_room_stateErik Johnston2016-08-031-0/+4
| | | | | | | * Fix syntax errorErik Johnston2016-08-031-1/+8
| | | | | | | * CommentErik Johnston2016-08-031-0/+14
| | | | | | | * Add /state_ids federation APIErik Johnston2016-08-034-3/+125
| | | | |_|_|/ | | | |/| | |
| | | * | | | Print status code in federation_client.pyErik Johnston2016-08-031-0/+1
| | | | |_|/ | | | |/| |
| | | * | | Factor out some of the code shared between the sytest scripts (#974)Mark Haines2016-08-026-69/+71
| | | |/ /
| | * | | Bump version and changelog v0.17.0-rc3Erik Johnston2016-08-022-2/+8
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-08-0227-122/+745
| | |\| |
| | | * | Merge pull request #971 from matrix-org/erikj/fed_stateErik Johnston2016-08-021-3/+3
| | | |\ \
| | | | * | Don't double wrap 200Erik Johnston2016-08-021-2/+2
| | | | * | Fix response cacheErik Johnston2016-08-021-1/+1
| | | |/ /
| | | * | Merge pull request #940 from matrix-org/erikj/fed_state_cacheErik Johnston2016-08-025-32/+60
| | | |\ \
| | | | * | Cache federation state responsesErik Johnston2016-07-215-32/+60
| | | * | | Print authorization header for federation_client.pyErik Johnston2016-08-021-5/+6
| | | * | | Merge pull request #967 from matrix-org/erikj/fed_readerErik Johnston2016-08-0210-24/+350
| | | |\ \ \
| | | | * | | Change default jenkins port base and countErik Johnston2016-08-023-6/+7
| | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-08-024-4/+24
| | | | |\ \ \
| | | | * | | | Make jenkins dendron test federation read apisErik Johnston2016-07-291-0/+1
| | | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-07-291-4/+31
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-07-2954-345/+1250
| | | | |\ \ \ \ \
| | | | * | | | | | Add destination retry to slave storeErik Johnston2016-07-282-0/+32
| | | | * | | | | | Add slace storage functions for public room listErik Johnston2016-07-283-0/+48
| | | | * | | | | | Add get_auth_chain to slave storeErik Johnston2016-07-281-0/+4
| | | | * | | | | | Add more key storage funcs into slave storeErik Johnston2016-07-282-24/+26
| | | | * | | | | | Split out a FederationReader processErik Johnston2016-07-214-0/+238
| | | * | | | | | | Merge pull request #968 from matrix-org/dbkr/fix_add_email_on_registerDavid Baker2016-08-021-9/+7
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | | * | | | | | Merge branch 'develop' into dbkr/fix_add_email_on_registerMark Haines2016-08-024-4/+24
| | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge pull request #970 from matrix-org/erikj/clockErik Johnston2016-08-022-3/+16
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | * | | | | | Ignore AlreadyCalled errors on timer cancelErik Johnston2016-07-312-3/+16
| | | * | | | | | | missing --upgradeMatthew Hodgson2016-08-011-1/+1
| | | |/ / / / / /
| | | * | | | | | Merge pull request #958 from matrix-org/paul/SYN-738Paul Evans2016-07-291-0/+7
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | | * | | | | Forbid non-ASes from registering users whose names begin with '_' (SYN-738)Paul "LeoNerd" Evans2016-07-271-0/+7
| | | | | * | | | Fix adding emails on registrationDavid Baker2016-07-291-9/+7
| | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge pull request #964 from matrix-org/erikj/fed_join_fixErik Johnston2016-07-291-4/+31
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | Mention that func will fetch auth eventsErik Johnston2016-07-291-0/+2
| | | | * | | | Update docstringErik Johnston2016-07-291-0/+6
| | | | * | | | Handle the case of missing auth events when joining a roomErik Johnston2016-07-281-4/+23
| | | * | | | | Merge pull request #966 from matrix-org/markjh/fix_pushMark Haines2016-07-295-52/+205
| | | |\ \ \ \ \
| | | | * | | | | Fix SQL to supply arguments in the same orderMark Haines2016-07-291-1/+1
| | | | * | | | | Create separate methods for getting messages to pushMark Haines2016-07-285-51/+204
| | | |/ / / / /
| | | * | | | | Merge pull request #965 from matrix-org/kegan/comment-push-actions-fnKegsay2016-07-281-2/+26
| | | |\ \ \ \ \
| | | | * | | | | Comment get_unread_push_actions_for_user_in_range functionKegan Dougal2016-07-281-2/+26
| | | |/ / / / /
| | | * | | | | Merge pull request #963 from matrix-org/erikj/admin_docsErik Johnston2016-07-283-0/+46
| | | |\ \ \ \ \
| | | | * | | | | Use correct pathErik Johnston2016-07-281-1/+1
| | | | * | | | | Add some basic admin API docsErik Johnston2016-07-283-0/+46
| | | | |/ / / /
| | | * | | | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into developErik Johnston2016-07-282-1/+65
| | | |\| | | |
| | | * | | | | Merge pull request #962 from matrix-org/markjh/retryMark Haines2016-07-281-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Fix retry utils to check if the exception is a subclass of CMEMark Haines2016-07-281-1/+1
| | | * | | | | | Merge pull request #941 from matrix-org/erikj/key_client_fixErik Johnston2016-07-281-3/+9
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-19 20:51:21 +0000