summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Fix error when running synapse with no logfileRichard van der Hoff2017-10-261-1/+5
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-252-1/+9
|\
| * Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1Erik Johnston2017-10-2464-159/+219
| |\
| | * Bump version and changelog github/release-v0.24.1 release-v0.24.1Erik Johnston2017-10-242-1/+9
* | | tip for generating tls_fingerprintsMatthew Hodgson2017-10-241-0/+6
| |/ |/|
* | Merge pull request #2567 from matrix-org/erikj/group_fed_update_profileErik Johnston2017-10-242-11/+31
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_...Erik Johnston2017-10-2457-135/+171
| |\ \ | |/ / |/| |
* | | Merge pull request #2568 from matrix-org/rav/pep8Richard van der Hoff2017-10-2355-100/+97
|\ \ \
| * | | fix vars named `l`Richard van der Hoff2017-10-232-7/+4
| * | | replace 'except:' with 'except Exception:'Richard van der Hoff2017-10-2354-93/+93
|/ / /
* | | Merge pull request #2566 from matrix-org/rav/media_logcontext_leakRichard van der Hoff2017-10-231-1/+4
|\ \ \
| * | | Fix a logcontext leak in the media repoRichard van der Hoff2017-10-231-1/+4
* | | | Merge pull request #2561 from matrix-org/rav/id_checkingRichard van der Hoff2017-10-234-34/+70
|\ \ \ \ | |/ / / |/| | |
| * | | Validate group ids when parsingRichard van der Hoff2017-10-213-17/+45
| * | | Allow = in mxids and groupidsRichard van der Hoff2017-10-203-5/+4
| * | | Disallow capital letters in useridsRichard van der Hoff2017-10-203-16/+25
| | * | Correctly wire in update group profile over federationErik Johnston2017-10-232-11/+31
| |/ / |/| |
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-233-1/+45
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0Erik Johnston2017-10-2383-571/+6538
| |\ \
| | * | Bump version and changelog github/release-v0.24.0 release-v0.24.0Erik Johnston2017-10-232-1/+7
| | * | Correctly bump version v0.24.0-rc1Erik Johnston2017-10-191-1/+1
| | * | Update changelogErik Johnston2017-10-191-0/+1
| | * | Bump version and changelogErik Johnston2017-10-192-1/+36
| | |/
| * | Merge pull request #2540 from 4nd3r/patch-1Richard van der Hoff2017-10-161-0/+2
| |\ \
| | * | make it absolutely clear that Purge History API does not remove all traces of...Ander Punnar2017-10-141-0/+2
| |/ /
* | | Merge pull request #2560 from matrix-org/rav/kill_pointless_methodRichard van der Hoff2017-10-236-12/+8
|\ \ \ | |_|/ |/| |
| * | Remove pointless create() methodRichard van der Hoff2017-10-206-12/+8
|/ /
* | Merge pull request #2559 from matrix-org/erikj/group_id_validationErik Johnston2017-10-193-3/+46
|\ \
| * | Flake8Erik Johnston2017-10-192-6/+4
| * | Add missing file...Erik Johnston2017-10-191-0/+36
| * | Add config to enable group creationErik Johnston2017-10-192-3/+12
* | | Merge pull request #2558 from matrix-org/erikj/group_id_validationErik Johnston2017-10-191-1/+19
|\| |
| * | Enforce sensible group IDsErik Johnston2017-10-191-1/+19
|/ /
* | Fix typoErik Johnston2017-10-191-1/+1
* | Fix typo in group attestation handlingErik Johnston2017-10-192-2/+3
* | Merge pull request #2557 from matrix-org/erikj/media_tumbnailsErik Johnston2017-10-191-2/+5
|\ \
| * | Fix typo in thumbnail generationErik Johnston2017-10-191-2/+5
|/ /
* | Fix typoErik Johnston2017-10-191-1/+1
* | Merge pull request #2553 from matrix-org/rav/fix_500_on_event_sendRichard van der Hoff2017-10-181-1/+0
|\ \
| * | Fix 500 error when we get an error handling a PDURichard van der Hoff2017-10-171-1/+0
* | | Merge pull request #2552 from matrix-org/rav/fix_500_on_dodgy_powerlevelsRichard van der Hoff2017-10-171-3/+3
|\ \ \ | |/ / |/| |
| * | Fix 500 error when fields missing from power_levels eventRichard van der Hoff2017-10-171-3/+3
* | | Doc some more dynamic Homeserver methodsRichard van der Hoff2017-10-171-0/+8
* | | Merge pull request #2550 from krombel/fix_thumbnail_2548Erik Johnston2017-10-171-2/+2
|\ \ \ | |/ / |/| |
| * | fix thumbnailing (#2548)Krombel2017-10-171-2/+2
* | | Improve error handling for missing files (#2551)Richard van der Hoff2017-10-173-17/+33
* | | Merge pull request #2546 from matrix-org/rav/remove_dead_event_injectorRichard van der Hoff2017-10-171-76/+0
|\ \ \
| * | | Remove dead classRichard van der Hoff2017-10-171-76/+0
| |/ /
* | | Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldableRichard van der Hoff2017-10-171-0/+38
|\ \ \
| * | | Fix name of test_logcontextRichard van der Hoff2017-10-171-0/+0
| * | | Add some tests for make_deferred_yieldableRichard van der Hoff2017-10-171-0/+38
| |/ /
* | | Merge pull request #2549 from matrix-org/rav/event_persist_logcontextsRichard van der Hoff2017-10-172-7/+22
|\ \ \
| * | | Fix logcontext handling for persist_eventsRichard van der Hoff2017-10-172-7/+22
| |/ /
* | | Merge pull request #2545 from matrix-org/dbkr/auto_join_roomsDavid Baker2017-10-173-0/+42
|\ \ \ | |/ / |/| |
| * | Fix testDavid Baker2017-10-171-0/+1
| * | pep8David Baker2017-10-171-1/+2
| * | Add config option to auto-join new users to roomsDavid Baker2017-10-162-0/+40
* | | Merge pull request #2544 from matrix-org/luke/groups-invited-usersLuke Barnard2017-10-166-1/+102
|\ \ \
| * | | DelintLuke Barnard2017-10-163-1/+3
| * | | Make it work. Warn about lack of user profileLuke Barnard2017-10-161-2/+2
| * | | _create_rererouter for get_invited_users_in_groupLuke Barnard2017-10-161-17/+2
| * | | Merge branch 'develop' into luke/groups-invited-usersLuke Barnard2017-10-161-1/+1
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2543 from matrix-org/luke/fix-on-group-invite-no-profileLuke Barnard2017-10-161-2/+5
|\ \ \ \ | |_|/ / |/| | |
* | | | Merge pull request #2542 from matrix-org/dbkr/room_notif_no_globDavid Baker2017-10-161-1/+1
|\ \ \ \
| * | | | Omit the *s for @room notificationsDavid Baker2017-10-161-1/+1
|/ / / /
| | * / Implement GET /groups/$groupId/invited_usersLuke Barnard2017-10-166-1/+115
| |/ /
| * / Log a warning when no profile for invited memberLuke Barnard2017-10-161-2/+5
|/ /
* | Merge pull request #2538 from matrix-org/erikj/media_backupErik Johnston2017-10-136-200/+309
|\ \
| * | Add try/finally block to close t_byte_sourceErik Johnston2017-10-131-24/+41
| * | Remove old commentErik Johnston2017-10-131-1/+0
| * | Don't reuse source but instead copy from primary media store to backupErik Johnston2017-10-132-22/+9
| * | PEP8Erik Johnston2017-10-131-1/+1
| * | Move type into keyErik Johnston2017-10-131-3/+3
| * | CommentErik Johnston2017-10-131-1/+1
| * | Remove spurious additionErik Johnston2017-10-131-4/+0
| * | Don't needlessly rename variableErik Johnston2017-10-131-13/+13
| * | Add paths back in...Erik Johnston2017-10-131-4/+4
| * | Remove unnecessary diffErik Johnston2017-10-131-3/+1
| * | Make things be absolute paths againErik Johnston2017-10-131-7/+7
| * | s/write_to_file/write_to_file_and_backup/Erik Johnston2017-10-131-5/+5
| * | Fix upErik Johnston2017-10-132-43/+32
| * | Fix up thumbnailing functionErik Johnston2017-10-133-75/+73
| * | Fix typoErik Johnston2017-10-131-1/+1
| * | Fix up commentsErik Johnston2017-10-131-2/+26
| * | Move makedirs to threadErik Johnston2017-10-131-2/+1
| * | Use make_deferred_yieldableErik Johnston2017-10-131-7/+7
| * | Fix commentsErik Johnston2017-10-122-1/+4
| * | Don't close prematurely..Erik Johnston2017-10-121-2/+5
| * | getvalue closes bufferErik Johnston2017-10-121-11/+10
| * | Get len before closeErik Johnston2017-10-121-6/+11
| * | Don't close file prematurelyErik Johnston2017-10-122-8/+18
| * | Copy everything to backupErik Johnston2017-10-125-77/+151
| * | TypoErik Johnston2017-10-121-1/+1
| * | Remove dead codeErik Johnston2017-10-121-3/+0
| * | Fix typosErik Johnston2017-10-121-20/+26
| * | Fix typoErik Johnston2017-10-121-1/+1
| * | Basic implementation of backup media storeErik Johnston2017-10-124-126/+131
* | | oopsMatthew Hodgson2017-10-131-1/+1
* | | fix copyright to companies which actually exist(ed)Matthew Hodgson2017-10-131-1/+1
|/ /
* | log when we get an exception handling replication updateshera2017-10-121-1/+5
* | Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messagesDavid Baker2017-10-121-2/+6
|\ \
| * | fix isinstanceDavid Baker2017-10-111-1/+1
| * | Allow error strings from spam checkerDavid Baker2017-10-111-2/+6
* | | Merge pull request #2532 from matrix-org/rav/fix_linearizerRichard van der Hoff2017-10-112-6/+46
|\ \ \
| * | | Fix stackoverflow and logcontexts from linearizerRichard van der Hoff2017-10-112-6/+46
* | | | Merge pull request #2529 from matrix-org/rav/fix_transaction_failure_handlingRichard van der Hoff2017-10-111-2/+3
|\ \ \ \
| * | | | log pdu_failures from incoming transactionsRichard van der Hoff2017-10-111-2/+3
| |/ / /
* | | | Merge pull request #2515 from matrix-org/rav/fix_receipt_logcontextRichard van der Hoff2017-10-111-0/+51
|\ \ \ \
| * | | | logformatter: fix AttributeErrorRichard van der Hoff2017-10-111-3/+11
| * | | | Fancy logformatter to format exceptions betterRichard van der Hoff2017-10-091-0/+43
* | | | | Fix fetching remote summariesErik Johnston2017-10-111-2/+2
* | | | | Merge pull request #2533 from matrix-org/erikj/fix_group_replErik Johnston2017-10-111-7/+7
|\ \ \ \ \
| * | | | | peeeeeeeeep8888888888888888888888888888Erik Johnston2017-10-111-1/+1
| * | | | | Fix group stream replicationErik Johnston2017-10-111-7/+7
|/ / / / /
* | | | | Merge pull request #2530 from matrix-org/rav/fix_receipt_logcontextRichard van der Hoff2017-10-111-0/+4
|\ \ \ \ \
| * | | | | fix a logcontext leak in read receipt handlingRichard van der Hoff2017-10-111-0/+4
| | |/ / / | |/| | |
* | | | | Fix typo in invite to groupErik Johnston2017-10-111-1/+1
* | | | | Fix typoErik Johnston2017-10-111-1/+1
* | | | | Fix attestations to check correct server nameErik Johnston2017-10-111-10/+20
| |_|/ / |/| | |
* | | | Fix schema delta versionsErik Johnston2017-10-113-1/+1
* | | | Merge pull request #2466 from matrix-org/erikj/groups_mergedErik Johnston2017-10-1135-66/+4793
|\ \ \ \
| * | | | Validate room idsErik Johnston2017-10-111-1/+5
| * | | | Don't corrupt cacheErik Johnston2017-10-051-0/+1
| * | | | Merge branch 'develop' into erikj/groups_mergedDavid Baker2017-10-0231-299/+1177
| |\ \ \ \
| * \ \ \ \ Merge pull request #2472 from matrix-org/erikj/groups_roomsErik Johnston2017-09-267-4/+73
| |\ \ \ \ \
| | * | | | | Add remove room APIErik Johnston2017-09-266-1/+72
| | * | | | | Add unique index to group_rooms tableErik Johnston2017-09-262-3/+1
| |/ / / / /
| * | | | | Merge pull request #2471 from matrix-org/erikj/group_summary_publicisedErik Johnston2017-09-261-25/+31
| |\ \ \ \ \
| | * | | | | Add is_publicised to group summaryErik Johnston2017-09-261-25/+31
| |/ / / / /
| * | | | | Remove user from group summary when the leave the groupErik Johnston2017-09-211-0/+8
| * | | | | Revert: Keep room_id's in group summaryErik Johnston2017-09-211-0/+1
| * | | | | Keep room_id's in group summaryErik Johnston2017-09-211-1/+0
| * | | | | Correctly return next tokenErik Johnston2017-09-201-1/+2
| * | | | | Fix initial syncErik Johnston2017-09-201-1/+9
| * | | | | Merge pull request #2454 from matrix-org/erikj/groups_sync_creatorErik Johnston2017-09-192-4/+31
| |\ \ \ \ \
| | * | | | | Ensure that creator of group sees group down /syncErik Johnston2017-09-192-4/+31
| |/ / / / /
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_mergedErik Johnston2017-09-1939-592/+1313
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2430 from matrix-org/erikj/groups_profile_cacheErik Johnston2017-08-253-2/+30
| |\ \ \ \ \ \
| | * | | | | | Add user profiles to summary from group serverErik Johnston2017-08-253-2/+30
| * | | | | | | Merge pull request #2429 from matrix-org/erikj/groups_profile_cacheErik Johnston2017-08-2515-47/+292
| |\| | | | | |
| | * | | | | | Fix typos and reinheritErik Johnston2017-08-251-12/+6
| | * | | | | | Split out profile handler to fix testsErik Johnston2017-08-2511-29/+35
| | * | | | | | Add remote profile cacheErik Johnston2017-08-255-5/+237
| | * | | | | | Add _simple_updateErik Johnston2017-08-251-19/+32
| |/ / / / / /
| * | | | | | Merge pull request #2410 from matrix-org/erikj/groups_publiciseErik Johnston2017-08-216-0/+197
| |\ \ \ \ \ \
| | * | | | | | Use BOOLEAN rather than TEXT typeErik Johnston2017-08-211-1/+1
| | * | | | | | FixupErik Johnston2017-08-112-9/+14
| | * | | | | | Add bulk group publicised lookup APIErik Johnston2017-08-095-0/+142
| | * | | | | | Allow update group publicityErik Johnston2017-08-082-0/+43
| | * | | | | | Store whether the user wants to publicise their membership of a groupErik Johnston2017-08-083-0/+7
| * | | | | | | Merge pull request #2426 from matrix-org/erikj/groups_fix_syncErik Johnston2017-08-211-1/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Groups: Fix mising json.load in initial syncErik Johnston2017-08-211-1/+7
| |/ / / / / /
| * | | | | | Remove stale TODO commentsErik Johnston2017-08-041-10/+0
| * | | | | | Merge pull request #2382 from matrix-org/erikj/group_privilegeErik Johnston2017-07-242-1/+85
| |\ \ \ \ \ \
| | * | | | | | Update commentErik Johnston2017-07-241-2/+2
| | * | | | | | Use join rather than joined, etc.Erik Johnston2017-07-241-2/+2
| | * | | | | | Fix all the typosErik Johnston2017-07-241-8/+7
| | * | | | | | Include users membership in group in summary APIErik Johnston2017-07-242-0/+60
| | * | | | | | Check users/rooms are in group before adding to summaryErik Johnston2017-07-241-0/+25
| |/ / / / / /
| * | | | | | Correctly add joins to correct segmentErik Johnston2017-07-241-1/+1
| * | | | | | Merge pull request #2378 from matrix-org/erikj/group_sync_supportErik Johnston2017-07-2112-12/+283
| |\ \ \ \ \ \
| | * | | | | | Add notifierErik Johnston2017-07-201-0/+1
| | * | | | | | Fix replication. And notifyErik Johnston2017-07-205-4/+119
| | * | | | | | Remember to cast to boolErik Johnston2017-07-201-1/+1
| | * | | | | | Fix bug in generating current tokenErik Johnston2017-07-201-0/+2
| | * | | | | | Add groups to sync streamErik Johnston2017-07-208-8/+161
| * | | | | | | Merge pull request #2377 from matrix-org/erikj/group_profile_updateErik Johnston2017-07-205-0/+55
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove spurious content paramErik Johnston2017-07-201-1/+1
| | * | | | | | Check values are stringsErik Johnston2017-07-201-1/+4
| | * | | | | | Fix a storage descErik Johnston2017-07-201-1/+1
| | * | | | | | Add update group profile APIErik Johnston2017-07-205-0/+52
| * | | | | | | Merge pull request #2374 from matrix-org/erikj/group_server_localErik Johnston2017-07-2011-34/+1457
| |\ \ \ \ \ \ \
| | * | | | | | | Fix typoErik Johnston2017-07-201-1/+1
| | |/ / / / / /
| | * | | | | | CommentsErik Johnston2017-07-184-13/+24
| | * | | | | | CommentsErik Johnston2017-07-182-103/+88
| | * | | | | | Fix permissionsErik Johnston2017-07-181-2/+6
| | * | | | | | Add DELETEErik Johnston2017-07-181-0/+46
| | * | | | | | Add 'args' param to post_jsonErik Johnston2017-07-181-9/+15
| | * | | | | | Fix typosErik Johnston2017-07-183-12/+22
| | * | | | | | Correctly parse query paramsErik Johnston2017-07-181-19/+19
| | * | | | | | Update federation client pokesErik Johnston2017-07-181-13/+22
| | * | | | | | Add client apisErik Johnston2017-07-182-10/+188
| | * | | | | | CommentsErik Johnston2017-07-182-15/+22
| | * | | | | | Use transport client directlyErik Johnston2017-07-181-18/+25
| | * | | | | | CommentErik Johnston2017-07-181-0/+14
| | * | | | | | Remove sync stuffErik Johnston2017-07-182-29/+1
| | * | | | | | Add GroupID typeErik Johnston2017-07-181-0/+5
| | * | | | | | Remove unused tablesErik Johnston2017-07-181-7/+0
| | * | | | | | Remove sync stuffErik Johnston2017-07-182-70/+0
| | * | | | | | Add local group server supportErik Johnston2017-07-1710-2/+1248
| |/ / / / / /
| * | | | | | Merge pull request #2363 from matrix-org/erikj/group_server_summaryErik Johnston2017-07-174-22/+1131
| |\ \ \ \ \ \
| | * | | | | | Ensure category and role ids are non-nullErik Johnston2017-07-141-0/+24
| | * | | | | | Add DEFAULT_ROLE_IDErik Johnston2017-07-141-4/+5
| | * | | | | | Correctly increment ordersErik Johnston2017-07-141-2/+2
| | * | | | | | Remove unused functionsErik Johnston2017-07-131-152/+0
| | * | | | | | CommentsErik Johnston2017-07-132-12/+32
| | * | | | | | Remove TODOErik Johnston2017-07-131-1/+0
| | * | | | | | Add summary APIs to federationErik Johnston2017-07-131-11/+223
| | * | | | | | raise NotImplementedErrorErik Johnston2017-07-131-5/+2
| | * | | | | | CommentsErik Johnston2017-07-123-5/+79
| | * | | | | | Simplify checking if adminErik Johnston2017-07-121-53/+19
| | * | | | | | Add group summary APIsErik Johnston2017-07-124-2/+970
| |/ / / / / /
| * | | | | | Merge pull request #2352 from matrix-org/erikj/group_server_splitErik Johnston2017-07-1211-11/+1206
| |\ \ \ \ \ \
| | * | | | | | CommentErik Johnston2017-07-121-1/+1
| | * | | | | | Move commentErik Johnston2017-07-111-2/+2
| | * | | | | | Add federation API for adding room to groupErik Johnston2017-07-111-0/+18
| | * | | | | | CommentErik Johnston2017-07-111-5/+8
| | * | | | | | TypoErik Johnston2017-07-111-1/+1
| | * | | | | | Rename column to attestation_jsonErik Johnston2017-07-112-5/+5
| | * | | | | | CommentsErik Johnston2017-07-113-5/+9
| | * | | | | | CommentErik Johnston2017-07-112-0/+26
| | * | | | | | Remove u/ requirementErik Johnston2017-07-111-2/+3
| | * | | | | | Lift out visibility parsingErik Johnston2017-07-111-20/+21
| | * | | | | | CommentsErik Johnston2017-07-114-43/+132
| | * | | | | | Initial group server implementationErik Johnston2017-07-1011-11/+1064
* | | | | | | | Merge pull request #2501 from matrix-org/dbkr/channel_notificationsErik Johnston2017-10-113-7/+85
|\ \ \ \ \ \ \ \
| * | | | | | | | pep8David Baker2017-10-102-3/+5
| * | | | | | | | Don't KeyError if no power_levels eventDavid Baker2017-10-101-1/+3
| * | | | | | | | Use notification levels in power_levelsDavid Baker2017-10-103-12/+22
| * | | | | | | | There was already a constant for thisDavid Baker2017-10-101-3/+4
| * | | | | | | | More optimisationDavid Baker2017-10-101-6/+9
| * | | | | | | | What year is it!? Who's the president!?David Baker2017-10-101-1/+1
| * | | | | | | | Merge branch 'develop' into dbkr/channel_notificationsDavid Baker2017-10-107-107/+183
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Make be fasterDavid Baker2017-10-051-3/+3
| * | | | | | | | | Add fastpath optimisationDavid Baker2017-10-051-3/+9
| * | | | | | | | | pep8David Baker2017-10-051-0/+3
| * | | | | | | | | They're called roomsDavid Baker2017-10-051-4/+4
| * | | | | | | | | Get rule type rightDavid Baker2017-10-051-1/+1
| * | | | | | | | | Support for channel notificationsDavid Baker2017-10-053-8/+59
* | | | | | | | | | Merge pull request #2483 from jeremycline/unfreeze-ujson-dumpErik Johnston2017-10-111-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Unfreeze event before serializing with ujsonJeremy Cline2017-09-301-1/+2
* | | | | | | | | | | Merge pull request #2490 from matrix-org/erikj/drop_left_room_eventsErik Johnston2017-10-103-0/+65
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix up commentErik Johnston2017-10-091-1/+2
| * | | | | | | | | | Invalidate cacheErik Johnston2017-10-031-0/+3
| * | | | | | | | | | Update commentsErik Johnston2017-10-032-1/+8
| * | | | | | | | | | Remove spurious line feedErik Johnston2017-10-031-1/+0
| * | | | | | | | | | Ignore incoming events for rooms that we have leftErik Johnston2017-10-032-0/+55
* | | | | | | | | | | Merge pull request #2520 from matrix-org/rav/process_incoming_rooms_in_parallelRichard van der Hoff2017-10-101-19/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fed server: process PDUs for different rooms in parallelRichard van der Hoff2017-10-091-19/+34
* | | | | | | | | | | | Merge pull request #2518 from matrix-org/rav/linearize_incoming_transactionsRichard van der Hoff2017-10-101-1/+29
|\| | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Fed server: use a linearizer for ongoing transactionsRichard van der Hoff2017-10-091-1/+29
* | | | | | | | | | | Merge pull request #2517 from matrix-org/rav/fed_server_refactorRichard van der Hoff2017-10-091-24/+29
|\| | | | | | | | | |
| * | | | | | | | | | fed server: refactor on_incoming_transactionRichard van der Hoff2017-10-091-24/+29
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2516 from matrix-org/rav/fix_fed_server_origin_checkRichard van der Hoff2017-10-091-24/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fed server: Move origin-check code to _handle_received_pduRichard van der Hoff2017-10-091-24/+24
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2508 from matrix-org/rav/federation_queue_logcontextsRichard van der Hoff2017-10-091-16/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix up logcontext handling in (federation) TransactionQueueRichard van der Hoff2017-10-061-16/+32
* | | | | | | | | | Merge pull request #2507 from matrix-org/rav/execute_concurrently_log_contextsRichard van der Hoff2017-10-091-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix logcontext handling for concurrently_executeRichard van der Hoff2017-10-061-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2506 from matrix-org/rav/unhandled_failureRichard van der Hoff2017-10-091-24/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-02 16:39:57 +0000