summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse v0.17.1Erik Johnston2016-08-2498-1434/+3281
|\
| * 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
| | |\ | | | | | | | | Preserve some logcontexts
| | | * Remove tracerErik Johnston2016-08-241-2/+1
| | | |
| | | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-08-241-2/+2
| | | |\ | | | |/ | | |/| | | | | erikj/preserve_log_contexts
| | * | Merge pull request #1040 from matrix-org/erikj/paginationErik Johnston2016-08-241-2/+2
| | |\ \ | | | | | | | | | | Add None checks to backfill
| | | * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginationErik Johnston2016-08-242-2/+13
| | | |\ \ | | | |/ / | | |/| |
| | | * | Add None checks to backfillErik Johnston2016-08-241-2/+2
| | | | |
| | | | * Preserve some logcontextsErik Johnston2016-08-2418-99/+136
| | | |/ | | |/|
| | * | Merge pull request #1039 from matrix-org/kegan/join-with-custom-contentKegsay2016-08-232-2/+13
| | |\ \ | | | |/ | | |/| Pass through user-supplied content in /join/$room_id
| | | * Pass through user-supplied content in /join/$room_idKegan Dougal2016-08-232-2/+13
| | |/ | | | | | | | | | | | | | | | | | | It was always intended to allow custom keys on the join event, but this has at some point been lost. Restore it. If the user specifies keys like "avatar_url" then they will be clobbered.
| | * Merge pull request #1038 from matrix-org/erikj/receved_txn_purgeErik Johnston2016-08-232-4/+45
| | |\ | | | | | | | | Delete old received_transactions rows
| | | * Delete old received_transactionsErik Johnston2016-08-222-4/+45
| | | |
| * | | Bump changelog and version v0.17.1-rc1Erik Johnston2016-08-222-1/+34
| |/ /
| * | Merge pull request #1028 from matrix-org/dbkr/notifications_apiErik Johnston2016-08-224-0/+156
| |\ \ | | | | | | | | Add the Notifications API
| | * \ 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
| | | | | | | | | | | | | | | | | | | | Hopefully easier to read
| | * | | 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
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Add usage stats to prometheus monitoring
| | * | | | | 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 more Measure blocks
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Matthew/workerdoc
| | * | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | | Add concept of cache contexts
| | * | | | 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 indices
| | * | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | | 3rd party entity lookup
| | * | | Move validation logic for AS 3PE query response into ApplicationServiceApi ↵Paul "LeoNerd" Evans2016-08-182-45/+44
| | | | | | | | | | | | | | | | | | | | class, to keep the handler logic neater
| | * | | 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 ↵Paul "LeoNerd" Evans2016-08-184-42/+34
| | | | | | | | | | | | | | | | | | | | ThirdPartyEntityKind enumeration
| | * | | 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 ↵Paul "LeoNerd" Evans2016-08-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | failures as exceptions
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Add appservice worker
| | * | | | | 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 ↵Erik Johnston2016-08-181-0/+1
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | erikj/appservice_stream
| * | | | | | Jenkins: tox install setuptoolsErik Johnston2016-08-181-0/+1
| | |_|/ / / | |/| | | |
| * | | | | Merge pull request #1025 from matrix-org/erikj/appservice_streamErik Johnston2016-08-185-25/+113
| |\ \ \ \ \ | | | | | | | | | | | | | | Make AppserviceHandler stream events from database
| | | * | | | Add appservice workerErik Johnston2016-08-187-123/+369
| | |/ / / /
| | * / / / Make AppserviceHandler stream events from databaseErik Johnston2016-08-185-25/+113
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for two reasons: 1. Suppresses duplicates correctly, as the notifier doesn't do any duplicate suppression. 2. Makes it easier to connect the AppserviceHandler to the replication stream.
| * | | | 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 worker
| | * | | | 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 faster
| | * | | | | 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 update
| | * | | | | | 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 repo
| | * | | | | Set `Content-Security-Policy` on media repoErik Johnston2016-08-171-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This is to inform browsers that they should sandbox the returned media. This is particularly cruical for javascript/HTML files.
| * | | | | Merge pull request #1011 from matrix-org/dbkr/contains_display_name_overrideDavid Baker2016-08-172-16/+37
| |\ \ \ \ \ | | |/ / / / | |/| | | | Move display name rule
| | * | | | Empty commit to trigger re-testDavid Baker2016-08-170-0/+0
| | | | | |
| | * | | | Add migration scriptDavid Baker2016-08-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | To port existing rule actions & enable entries to the new name
| | * | | | Merge remote-tracking branch 'origin/develop' into ↵David Baker2016-08-1611-212/+324
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | dbkr/contains_display_name_override
| | * | | | | s/underride/override/ in the rule_id tooDavid Baker2016-08-161-1/+1
| | | | | | |
| | * | | | | Move display name ruleDavid Baker2016-08-151-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/373 and comment
| * | | | | | 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 _ServiceQueuer
| | * | | | | | 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 code
| | * | | | | | Remove dead appservice codeErik Johnston2016-08-171-39/+2
| |/ / / / / /
| * | | | | | Merge pull request #1017 from matrix-org/erikj/appservice_measureErik Johnston2016-08-172-19/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Measure notify_interested_services
| | * | | | | | 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
| |\| | | | | | | | |_|/ / / / | |/| | | | | Don't update caches replication stream if tokens haven't advanced
| | * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix up preview URL API. Add tests.
| | * | | | | 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
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes: - Splitting out methods of a class into stand alone functions, to make them easier to test. - Adding unit tests to split out functions, testing HTML -> preview. - Handle the fact that elements in lxml may have tail text.
| * | | | | Merge pull request #1012 from matrix-org/erikj/limit_backfill_uriErik Johnston2016-08-161-4/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | Limit number of extremeties in backfill request
| | * | | | | Limit number of extremeties in backfill requestErik Johnston2016-08-161-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works around a bug where if we make a backfill request with too many extremeties it causes the request URI to be too long.
| * | | | | | Merge pull request #1010 from matrix-org/erikj/refactor_deletionsErik Johnston2016-08-166-47/+42
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.
| | * | | | | 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 ↵Erik Johnston2016-08-153-45/+39
| | |/ / / / | | | | | | | | | | | | | | | | | | slaves.
| * | | | | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ↵Erik Johnston2016-08-161-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Ralith-fix_integrity_retry
| | * | | | Add missing database corruption recovery caseBenjamin Saunders2016-08-141-1/+2
| |/ / / / |/| | | | | | | | | | | | | | Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
| * | | | Merge pull request #1009 from matrix-org/erikj/event_splitErik Johnston2016-08-1524-92/+367
| |\ \ \ \ | | |/ / / | |/| | | Split out /events to synchrotron
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hs.get_handlers() can not be invoked from split out processes. Moving the invocations down a level means that we can slowly split out individual servlets.
| * | | | Merge pull request #1007 from sargon/developErik Johnston2016-08-141-2/+2
| |\ \ \ \ | | | | | | | | | | | | Fix some bugs in the auth/ldap handler
| | * | | | Log the value which is observed in the first place.Daniel Ehlers2016-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name 'result' is of bool type and has no len property, resulting in a TypeError. Futhermore in the flow control conn.response is observed and hence should be reported. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
| | * | | | Fix AttributeError when bind_dn is not defined.Daniel Ehlers2016-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case one does not define bind_dn in ldap configuration, filter attribute is not declared. Since auth code only uses ldap_filter attribute when according LDAP mode is selected, it is safe to only declare the attribute in that case. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
| * | | | | 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 time
| | * | | 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
| |\ \ \ | | |_|/ | |/| | Don't change status_msg on /sync
| | * | 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 events
| | * | | 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
| |\ \ \ | | | | | | | | | | Clean up TransactionQueue
| | * | | 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 resources
| | * | | 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
| |\ \ \ | | |/ / | |/| | Various federation /event/ improvements
| | * | 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 keys
| | * | 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 code
| | * | Clean up CAS login codeRichard van der Hoff2016-08-081-125/+33
| |/ / |/| | | | | | | | | | | | | | | | | Remove some apparently unused code. Clean up parse_cas_response, mostly to catch the exception if the CAS response isn't valid XML.
| * | Merge pull request #994 from matrix-org/rav/fix_cas_loginDavid Baker2016-08-081-0/+1
| |\ \ | | | | | | | | Fix CAS login
| | * | Fix CAS loginRichard van der Hoff2016-08-081-0/+1
| |/ / |/| | | | | | | | Attempting to log in with CAS was giving a 500 error.
| * | Merge pull request #993 from matrix-org/rav/fix_token_loginRichard van der Hoff2016-08-084-31/+87
|/| | | | | | | | Fix token login
| * | PEP8Richard van der Hoff2016-08-081-0/+1
| | |
| * | Fix login with m.login.tokenRichard van der Hoff2016-08-084-32/+87
| | | | | | | | | | | | | | | login with token (as used by CAS auth) was broken by 067596d, such that it always returned a 401.
* | | 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 optional
| | | * | Make psutil optionalErik Johnston2016-08-083-6/+16
| | |/ /
| | * | Merge pull request #991 from matrix-org/erikj/retry_makeErik Johnston2016-08-051-11/+24
| | |\ \ | | | | | | | | | | Retry joining via other servers if first one failed. Fix some other bugs.
| | | * | 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 API
| | | * | 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 event
| | | * | | 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 description
| | | * | 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 events
| | | * | 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
| | |\ \ | | | | | | | | | | Check if we already have the events returned by /state/
| | | * | 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
| | |\| | | | | | | | | | | | Tweak integrity error recovery to work as intended
| | | * | 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
| | |\ \ | | | | | | | | | | Change the way we summarize URLs
| | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using XPath is slow on some machines (for unknown reasons), so use a different approach to get a list of text nodes. Try to generate a summary that respect paragraph and then word boundaries, adding ellipses when appropriate.
| | * | | | Merge pull request #983 from matrix-org/erikj/retry_on_integrity_errorErik Johnston2016-08-041-4/+66
| | |\ \ \ \ | | | |_|/ / | | |/| | | Retry event persistence on IntegrityError
| | | * | | Fix typoErik Johnston2016-08-041-3/+4
| | | | | |
| | | * | | Retry event persistence on IntegrityErrorErik Johnston2016-08-041-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in the porting script some backfilled events were not correctly persisted, causing irrecoverable IntegrityErrors on future attempts to persist those events. This commit adds a retry mechanism invoked upon IntegrityError, where when retried the tables are purged for all references to the events being persisted.
| | * | | | Merge pull request #979 from matrix-org/erikj/state_ids_apiErik Johnston2016-08-044-1/+151
| | |\ \ \ \ | | | |/ / / | | |/| | | Add /state_ids federation API
| | | * | | 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
| | |\ \ \ \ | | | | | | | | | | | | | | Port script: Handle the fact that some tables have negative rowid rows
| | | * | | | 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 null
| | | * | | | | keys/query: Omit device displayname if nullRichard van der Hoff2016-08-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... which makes it more consistent with user displaynames.
| | * | | | | | Factor out more common code from the jenkins scripts (#980)Mark Haines2016-08-044-138/+44
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Factor out more common code from the jenkins scripts * Fix install_and_run path * Poke jenkins * Poke jenkins
| | * | | | | Merge pull request #978 from matrix-org/rav/device_name_in_e2e_devicesRichard van der Hoff2016-08-033-20/+141
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Include device name in /keys/query response
| | | * | | | | PEP8Richard van der Hoff2016-08-032-12/+10
| | | | | | | |
| | | * | | | | Include device name in /keys/query responseRichard van der Hoff2016-08-033-20/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an 'unsigned' section which includes the device display name.
| | * | | | | | 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 for
| | | * | | | keys/query: return all users which were asked forRichard van der Hoff2016-08-032-3/+52
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the situation where all of a user's devices get deleted, we want to indicate this to a client, so we want to return an empty dictionary, rather than nothing at all.
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that it's more useful to return a null device display name (and let clients decide how to handle it: eg, falling back to device_id) than using a constant string like "unknown device".
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR feedback
| | | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the e2e query handler to separate out the local query, and then make the federation handler use it.
| | | * | | | | 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
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ensure we only persist an event once at a time
| | | * | | | | | 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
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | The new API only returns the event_ids for the state, as most requesters will already have the vast majority of the events already.
| | * | | | | 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
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Factor out some of the code shared between the different sytest jenkins scripts * Exclude jenkins from the MANIFEST * Fix dendron build * Missing new line * Poke jenkins * Export the PORT_BASE and PORT_COUNT * Poke jenkins
| * | | | 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
| | |\ \ \ | | | | | | | | | | | | Fix response cache
| | | * | | 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 responses
| | | * | | Cache federation state responsesErik Johnston2016-07-215-32/+60
| | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 07:26:31 +0000