summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Don't corrupt cacheErik Johnston2017-10-051-0/+1
* Merge branch 'develop' into erikj/groups_mergedDavid Baker2017-10-0231-299/+1177
|\
| * Merge pull request #2480 from matrix-org/rav/federation_client_loggingRichard van der Hoff2017-09-291-7/+6
| |\
| | * Improve logging of failures in matrixfederationclientRichard van der Hoff2017-09-281-7/+6
| * | Only log if we've removed mediaErik Johnston2017-09-281-2/+4
| |/
| * Handle SERVFAILs when doing AAAA lookups for federation (#2477)Richard van der Hoff2017-09-281-5/+17
| * Up the limits on number of url cache entries to delete at one timeErik Johnston2017-09-281-2/+2
| * Add old indicesErik Johnston2017-09-281-0/+2
| * Clear up expired url cache every 10sErik Johnston2017-09-281-1/+1
| * Actually assign result to variableErik Johnston2017-09-281-1/+1
| * Only pull out local media that were for url cacheErik Johnston2017-09-281-1/+1
| * Fix typo in url cache expiry timerErik Johnston2017-09-281-1/+1
| * Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnailsErik Johnston2017-09-281-31/+81
| |\
| | * Support new and old style media id formatsErik Johnston2017-09-281-31/+81
| * | Fix typoErik Johnston2017-09-281-3/+3
| * | Merge pull request #2478 from matrix-org/erikj/expire_url_cache_thumbnailsErik Johnston2017-09-285-12/+234
| |\|
| | * Change expires column to expires_tsErik Johnston2017-09-283-10/+29
| | * More bracketsErik Johnston2017-09-281-1/+1
| | * Delete expired url cache dataErik Johnston2017-09-285-5/+208
| |/
| * Merge pull request #2476 from matrix-org/erikj/joined_members_authErik Johnston2017-09-282-13/+26
| |\
| | * Fix /joined_members to work with AS usersErik Johnston2017-09-282-13/+26
| * | Merge pull request #2475 from matrix-org/erikj/joined_members_authErik Johnston2017-09-272-10/+38
| |\|
| | * Fix bug where /joined_members didn't check user was in roomErik Johnston2017-09-272-10/+38
| |/
| * Merge pull request #2474 from matrix-org/dbkr/spam_check_moduleDavid Baker2017-09-276-23/+74
| |\
| | * Don't test is spam_checker not NoneDavid Baker2017-09-271-1/+7
| | * Remove unintentional debuggingDavid Baker2017-09-271-1/+0
| | * pep8David Baker2017-09-272-0/+2
| | * Forgot the new file again :(David Baker2017-09-271-0/+35
| | * Make the spam checker a moduleDavid Baker2017-09-265-23/+33
| * | pep8David Baker2017-09-261-0/+1
| |/
| * Merge pull request #2473 from matrix-org/dbkr/factor_out_module_loadingDavid Baker2017-09-262-12/+51
| |\
| | * unnecessary parensDavid Baker2017-09-261-1/+1
| | * Add module_loader.pyDavid Baker2017-09-261-0/+41
| | * Factor out module loading to a separate placeDavid Baker2017-09-261-12/+10
| |/
| * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0 v0.23.0-rc2Erik Johnston2017-09-263-19/+39
| |\
| | * Merge pull request #2470 from matrix-org/erikj/sync_speed_fixErik Johnston2017-09-251-5/+18
| | |\
| | | * Refactor to speed up incremental syncsErik Johnston2017-09-251-5/+18
| | |/
| | * Merge pull request #2468 from maxidor/developRichard van der Hoff2017-09-251-13/+20
| | |\
| | | * Include review feedbackMax Dor2017-09-251-5/+3
| | | * Clarify recommended network setupMax Dor2017-09-251-15/+24
| | |/
| | * Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse into developErik Johnston2017-09-252-1/+33
| | |\
| | * \ Merge pull request #2390 from r3dey3/developRichard van der Hoff2017-09-251-1/+1
| | |\ \
| | | * \ Merge branch 'develop' into developRichard van der Hoff2017-09-2548-805/+1855
| | | |\ \ | | | |/ / | | |/| |
| | | * | Fix iteration of requests_missing_keys; list doesn't have .values()Kenny Keslar2017-07-261-1/+1
| * | | | Bump changelog and versionErik Johnston2017-09-262-1/+9
| | |_|/ | |/| |
| * | | Update CHANGES v0.23.0-rc1Erik Johnston2017-09-251-3/+11
| * | | Bump version and changesErik Johnston2017-09-252-1/+25
| |/ /
| * | Fix logcontxt leak in keyclient (#2465)Richard van der Hoff2017-09-251-12/+5
| * | Do an AAAA lookup on SRV record targets (#2462)Richard van der Hoff2017-09-222-24/+118
| * | fix thinko'd docstringMatthew Hodgson2017-09-221-1/+1
| * | Fix device list when rejoining room (#2461)Erik Johnston2017-09-221-2/+14
| * | Merge pull request #2459 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2017-09-205-214/+353
| |\ \
| | * | Fix logcontexts in _check_sigs_and_hashesRichard van der Hoff2017-09-202-60/+62
| | * | Add some more tests for KeyringRichard van der Hoff2017-09-201-37/+140
| | * | Fix logcontext handling in verify_json_objects_for_serverRichard van der Hoff2017-09-201-8/+12
| | * | Turn _start_key_lookups into an inlineCallbacks functionRichard van der Hoff2017-09-201-40/+37
| | * | Fix potential race in _start_key_lookupsRichard van der Hoff2017-09-201-5/+8
| | * | Add some comments to _start_key_lookupsRichard van der Hoff2017-09-201-0/+8
| | * | Consistency for how verify_request.deferred is calledRichard van der Hoff2017-09-201-13/+17
| | * | Factor out _start_key_lookupsRichard van der Hoff2017-09-201-7/+17
| | * | Replace `server_and_json` with `verify_requests`Richard van der Hoff2017-09-201-3/+3
| | * | pull out handle_key_deferred to top levelRichard van der Hoff2017-09-201-43/+44
| | * | Fix incorrect key_ids in error messageRichard van der Hoff2017-09-201-1/+1
| | * | Invalidate signing key cache when we gat an updateRichard van der Hoff2017-09-201-17/+24
| | * | Remove redundant `preserve_fn`Richard van der Hoff2017-09-201-2/+2
| |/ /
| * | Fix concurrent server_key requests (#2458)Richard van der Hoff2017-09-192-4/+58
| * | Add a config option to block all room invites (#2457)Richard van der Hoff2017-09-195-0/+44
| * | add some comments to on_exchange_third_party_invite_requestRichard van der Hoff2017-09-191-0/+11
| * | PoC for filtering spammy events (#2456)Richard van der Hoff2017-09-193-17/+69
* | | 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
|\| |
| * | Fix overzealous kicking of guest users (#2453)Richard van der Hoff2017-09-191-1/+1
| * | Clean up and document handling of logcontexts in Keyring (#2452)Richard van der Hoff2017-09-182-28/+110
| * | Merge pull request #2451 from matrix-org/erikj/add_state_to_timelineErik Johnston2017-09-182-3/+18
| |\ \
| | * | Don't filter out current state events from timelineErik Johnston2017-09-182-3/+18
| * | | Merge pull request #2450 from matrix-org/dbkr/push_event_id_onlyDavid Baker2017-09-181-0/+20
| |\ \ \ | | |/ / | |/| |
| | * | Also include the room_idDavid Baker2017-09-181-0/+1
| | * | Use .get - it's much shorterDavid Baker2017-09-181-1/+1
| | * | Add support for event_id_only push formatDavid Baker2017-09-181-0/+19
| * | | Merge pull request #2449 from matrix-org/erikj/rejoin_device_listsErik Johnston2017-09-181-13/+12
| |\ \ \ | | |/ / | |/| |
| | * | Correctly handle leaving room in /key/changesErik Johnston2017-09-181-13/+12
| * | | Merge pull request #2443 from matrix-org/erikj/rejoin_device_listsErik Johnston2017-09-184-29/+153
| |\| |
| | * | Fix typoErik Johnston2017-09-151-1/+1
| | * | Actually hook leave notifs upErik Johnston2017-09-141-2/+3
| | * | Handle joining/leaving rooms in /keys/changesErik Johnston2017-09-131-1/+38
| | * | Get left roomsErik Johnston2017-09-131-3/+32
| | * | In sync handle device lists for newly joined/left roomsErik Johnston2017-09-121-2/+10
| | * | Add left section to /keys/changesErik Johnston2017-09-083-11/+19
| | * | Send down device list change notif when member leaves/rejoins roomErik Johnston2017-09-073-14/+55
| |/ /
| * | Merge pull request #2439 from matrix-org/rav/tox_tweaksRichard van der Hoff2017-09-061-5/+29
| |\ \
| | * | do tox install with pip -eRichard van der Hoff2017-09-051-5/+29
| * | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2017-09-053-0/+3
| |\ \ \
| | * | | Exclude the github issue template from our sdist (#2440)Richard van der Hoff2017-09-052-0/+1
| | * | | Merge pull request #2433 from ptman/patch-1Erik Johnston2017-09-011-0/+2
| | |\ \ \
| | | * | | Document known to work postgres versionPaul Tötterman2017-09-011-0/+2
| | |/ / /
| * | / / Merge branch 'master' into developRichard van der Hoff2017-09-054-0/+483
| |\| | | | | |/ / | |/| |
| | * | Set --python when running sytestRichard van der Hoff2017-09-014-0/+4
| | * | Merge pull request #2416 from matrix-org/rav/prometheus_configRichard van der Hoff2017-08-223-0/+436
| | |\ \
| | | * | Add prometheus configRichard van der Hoff2017-08-163-0/+436
| | * | | Merge pull request #2413 from matrix-org/toml-issue-templateTom Lant2017-08-211-0/+47
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Update ISSUE_TEMPLATE.mdTom Lant2017-08-171-1/+5
| | | * | Update ISSUE_TEMPLATE.mdTom Lant2017-08-171-3/+10
| | | * | Update ISSUE_TEMPLATE.mdTom Lant2017-08-141-2/+2
| | | * | Update ISSUE_TEMPLATE.mdTom Lant2017-08-141-1/+1
| | | * | Create ISSUE_TEMPLATE.mdTom Lant2017-08-141-0/+36
| | |/ /
| * | | fix python path in jenkins scriptsRichard van der Hoff2017-09-014-4/+4
| * | | Set --python when running sytestRichard van der Hoff2017-09-014-0/+4
| * | | Merge pull request #2428 from matrix-org/rav/update_upgradeRichard van der Hoff2017-08-241-33/+42
| |\ \ \
| | * | | Tweaks to the upgrade instructionsRichard van der Hoff2017-08-231-33/+42
| |/ / /
| * | | Merge pull request #2417 from matrix-org/rav/federation_clientRichard van der Hoff2017-08-231-8/+79
| |\ \ \
| | * | | test federation client: Allow server-name and key-file as optionsRichard van der Hoff2017-08-221-8/+28
| | * | | Improvements to the federation test clientRichard van der Hoff2017-08-171-7/+58
| * | | | Merge pull request #2288 from kyrias/bcryptRichard van der Hoff2017-08-231-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | python_dependencies: Use bcrypt module instead of py-bcryptJohannes Löthberg2017-06-171-1/+1
| * | | | Fix user_dir startupRichard van der Hoff2017-08-161-1/+1
| * | | | Fix process startupRichard van der Hoff2017-08-161-10/+13
| * | | | explain why CPU affinity is a good ideaMatthew Hodgson2017-08-151-0/+8
| * | | | Merge pull request #2415 from matrix-org/rav/synctl_cpu_affinityRichard van der Hoff2017-08-1514-465/+271
| |\ \ \ \
| | * | | | Allow configuration of CPU affinityRichard van der Hoff2017-08-155-1/+23
| | * | | | Factor out common application startRichard van der Hoff2017-08-1511-464/+248
| |/ / / /
| * | | | fix englishhera2017-08-041-7/+7
| * | | | typohera2017-08-041-1/+1
| * | | | Reduce spammy log line in synchrotronsErik Johnston2017-08-021-1/+1
| | |_|/ | |/| |
| * | | Merge pull request #2375 from matrix-org/erikj/port_scriptErik Johnston2017-07-201-0/+19
| |\ \ \
| | * | | Extend commentErik Johnston2017-07-201-1/+2
| | * | | Fix port script for user directory tablesErik Johnston2017-07-201-0/+18
| |/ / /
| * | | Merge pull request #2371 from matrix-org/erikj/push_cache_hitErik Johnston2017-07-171-0/+8
| |\ \ \
| | * | | Increase cache hit ratio for pushErik Johnston2017-07-141-0/+8
| |/ / /
| * | | Merge pull request #2366 from matrix-org/erikj/push_metricsErik Johnston2017-07-141-2/+42
| |\ \ \
| | * | | Add more metrics to push rule evaluationErik Johnston2017-07-131-2/+42
| |/ / /
| * | | Merge pull request #2365 from matrix-org/erikj/push_skip_lockErik Johnston2017-07-131-0/+4
| |\ \ \
| | * | | Push: Don't acquire lock unless necessaryErik Johnston2017-07-131-0/+4
| |/ / /
| * | | Merge pull request #2362 from matrix-org/erikj/sync_user_users_who_shareErik Johnston2017-07-121-8/+7
| |\ \ \
| | * | | Use less DB for device list handling in syncErik Johnston2017-07-121-8/+7
| |/ / /
* | | | 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 #2354 from krombel/reduce_static_sync_replyErik Johnston2017-07-111-16/+25
|\ \ \ \
| * | | | split out reducing stuff; just make encode_* staticKrombel2017-07-111-35/+27
| * | | | fix testKrombel2017-07-101-1/+3
| * | | | encode sync-response statically; omit empty objects from sync-responseKrombel2017-07-101-33/+48
* | | | | Merge pull request #2357 from matrix-org/erikj/pushErik Johnston2017-07-111-1/+1
|\ \ \ \ \
| * | | | | Don't compute push actions for backfilled eventsErik Johnston2017-07-111-1/+1
| | |/ / / | |/| | |
* / | | | Reduce log levels in tcp replicationErik Johnston2017-07-111-2/+2
|/ / / /
* | | | Include registration and as stores in frontend proxyErik Johnston2017-07-071-0/+4
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-072-1/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse v0.22.1Erik Johnston2017-07-065-11/+21
| |\ \ \
| | * | | Bump version and changelogErik Johnston2017-07-062-1/+10
* | | | | Merge pull request #2344 from matrix-org/erikj/frontend_proxyErik Johnston2017-07-072-0/+269
|\ \ \ \ \
| * | | | | Add a frontend proxyErik Johnston2017-07-072-0/+269
|/ / / / /
* | | | | Merge pull request #2343 from matrix-org/erikj/fastpushErik Johnston2017-07-073-36/+21
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Perf: Don't filter events for pushErik Johnston2017-07-073-36/+21
|/ / / /
* | | | Merge pull request #2342 from matrix-org/erikj/pusher_pool_instantiateErik Johnston2017-07-063-10/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Fix bug where pusherpool didn't start and broke some roomsErik Johnston2017-07-063-10/+11
| |/ /
* | | Merge pull request #2309 from matrix-org/erikj/user_ip_replErik Johnston2017-07-066-17/+18
|\ \ \
| * | | Serialize user ip command as jsonErik Johnston2017-06-271-5/+9
| * | | Fix upErik Johnston2017-06-275-12/+9
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-062-1/+23
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0Erik Johnston2017-07-0691-488/+3929
| |\ \ \
| | * | | Bump version and changelog github/release-v0.22.0 release-v0.22.0Erik Johnston2017-07-062-1/+7
| | * | | Bump version and changelog v0.22.0-rc2Erik Johnston2017-07-042-1/+17
* | | | | Merge pull request #2334 from matrix-org/erikj/refactor_transport_serverErik Johnston2017-07-051-8/+16
|\ \ \ \ \
| * | | | | Separate federation servlet into different listsErik Johnston2017-07-051-8/+16
| | |/ / / | |/| | |
* | | | | Merge pull request #2332 from matrix-org/rav/fix_pushesRichard van der Hoff2017-07-051-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |