summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* 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 #2500 from matrix-org/dbkr/fix_word_boundary_mentionsDavid Baker2017-10-051-2/+14
|\
| * Use better method for word boundary searchingDavid Baker2017-10-051-11/+3
| * pep8David Baker2017-10-051-0/+1
| * Fix notif kws that start/end with non-word charsDavid Baker2017-10-051-2/+21
|/
* Merge pull request #2495 from matrix-org/dbkr/spam_check_room_creationDavid Baker2017-10-043-0/+73
|\
| * spam check room publishingDavid Baker2017-10-042-0/+26
| * un-double indentDavid Baker2017-10-041-1/+1
| * Add room creation checks to spam checkerDavid Baker2017-10-043-0/+47
|/
* Merge pull request #2492 from matrix-org/dbkr/spam_check_invitesDavid Baker2017-10-033-2/+39
|\
| * s/roomid/room_id/David Baker2017-10-031-2/+2
| * pass room id tooDavid Baker2017-10-033-4/+6
| * Federation was passing strings anywayDavid Baker2017-10-031-1/+1
| * this shouldn't be debugDavid Baker2017-10-031-2/+2
| * better loggingDavid Baker2017-10-031-4/+9
| * Actually write warpper functionDavid Baker2017-10-031-0/+16
| * Skip spam check for admin usersDavid Baker2017-10-031-8/+8
| * Fix param name & lintDavid Baker2017-10-031-2/+4
| * Allow spam checker to reject invites tooDavid Baker2017-10-032-6/+18
|/
* Merge pull request #2491 from matrix-org/rav/port_db_fixesRichard van der Hoff2017-10-031-4/+7
|\
| * Drop search values with nul charactersRichard van der Hoff2017-10-021-4/+7
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-025-13/+37
|\ \
| * | Bump version and changelog v0.23.1Erik Johnston2017-10-022-1/+9
| * | Make 'affinity' package optionalErik Johnston2017-10-022-2/+17
| * | Move quit_with_errorErik Johnston2017-10-022-10/+11
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-023-3/+10
|\| |
| * | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse v0.23.0Erik Johnston2017-10-0252-859/+1833
| |\ \
| | * | Bump version and change log release-v0.23.0Erik Johnston2017-10-022-1/+7
| * | | Merge pull request #2464 from rnbdsh/patch-4Richard van der Hoff2017-09-251-2/+3
| |\ \ \
| | * | | Start traditionally, stop synctlrnbdsh2017-09-241-1/+2
| | * | | Remove non-existing files, add stop, use synctlrnbdsh2017-09-241-2/+2
| |/ / /
* | | | 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
* | | 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 #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 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix caching error in the push evaluatorRichard van der Hoff2017-07-051-1/+3
* | | | | Merge pull request #2330 from matrix-org/erikj/cache_size_factorErik Johnston2017-07-048-30/+12
|\ \ \ \ \
| * | | | | Update testErik Johnston2017-07-041-1/+1
| * | | | | Update READMEErik Johnston2017-07-041-7/+4
| * | | | | Increase default cache factor size.Erik Johnston2017-07-041-1/+1
| * | | | | Define CACHE_SIZE_FACTOR onceErik Johnston2017-07-045-21/+6
* | | | | | Merge pull request #2323 from matrix-org/markjh/invite_checksMark Haines2017-07-041-2/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improve the error handling for bad invites received over federationMark Haines2017-06-301-2/+17
|/ / / / /
* | | | | Merge pull request #2321 from matrix-org/erikj/prefill_forwardErik Johnston2017-06-302-2/+13
|\ \ \ \ \
| * | | | | Make into listErik Johnston2017-06-291-1/+1
| * | | | | Prefill forward extrems and event to state groupsErik Johnston2017-06-292-2/+13
|/ / / / /
* | | | | Merge pull request #2320 from matrix-org/erikj/cache_macaroon_parseErik Johnston2017-06-291-13/+60
|\ \ \ \ \
| * | | | | Cache macaroon parse and validationErik Johnston2017-06-291-13/+60
|/ / / / /
* | | | | Merge pull request #2319 from matrix-org/erikj/prune_sessionsErik Johnston2017-06-292-11/+13
|\ \ \ \ \
| * | | | | Use an ExpiringCache for storing registration sessionsErik Johnston2017-06-292-11/+13
|/ / / / /
* | | | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into developErik Johnston2017-06-272-1/+35
|\ \ \ \ \
| * | | | | Update version and changelog v0.22.0-rc1Erik Johnston2017-06-262-1/+35
* | | | | | Merge pull request #2308 from matrix-org/erikj/user_ip_replErik Johnston2017-06-279-8/+111
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Make workers report to master for user ip updatesErik Johnston2017-06-279-8/+111
* | | | | | Merge pull request #2307 from matrix-org/erikj/user_ip_batchErik Johnston2017-06-275-48/+101
|\| | | | |
| * | | | | Fix up client ips to read from pending dataErik Johnston2017-06-274-27/+62
| * | | | | Batch upsert user ipsErik Johnston2017-06-272-21/+39
| |/ / / /
* | | | | Merge pull request #2290 from matrix-org/erikj/ensure_round_tripErik Johnston2017-06-261-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused variablesErik Johnston2017-06-261-1/+1
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_rou...Erik Johnston2017-06-2626-58/+535
| |\ \ \ \
| * | | | | Reject local events that don't round trip the DBErik Johnston2017-06-191-0/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2304 from matrix-org/erikj/users_share_fixErik Johnston2017-06-261-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix up indices for users_who_share_roomsErik Johnston2017-06-261-1/+2
|/ / / /
* | | | Merge pull request #2301 from xwiki-labs/push-redact-contentErik Johnston2017-06-243-2/+48
|\ \ \ \
| * | | | Change the config file generator to more descriptive explanation of push.reda...Caleb James DeLisle2017-06-241-3/+11
| * | | | Fix TravisCI tests for PR #2301 - Fat finger mistakeCaleb James DeLisle2017-06-231-0/+0
| * | | | Fix TravisCI tests for PR #2301Caleb James DeLisle2017-06-233-5/+2
| * | | | Add configuration parameter to allow redaction of content from push messages ...Caleb James DeLisle2017-06-233-2/+43
* | | | | Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloadsErik Johnston2017-06-237-20/+94
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Store URL cache preview downloads seperatelyErik Johnston2017-06-237-20/+94
|/ / / /
* | | | Merge pull request #2297 from matrix-org/erikj/user_dir_fixErik Johnston2017-06-221-7/+10
|\ \ \ \
| * | | | Make some more params configurableErik Johnston2017-06-221-5/+8
| * | | | Typo. ARGH.Erik Johnston2017-06-221-1/+1
| * | | | Fix thinko in unhandled user spamErik Johnston2017-06-221-2/+2
|/ / / /
* | | | Merge branch 'master' into developMatthew Hodgson2017-06-222-1/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #2282 from matrix-org/release-v0.21.1 v0.21.1Erik Johnston2017-06-157-218/+97
| |\ \ \
| | * | | Bump version and changelogErik Johnston2017-06-152-1/+9
* | | | | Add descErik Johnston2017-06-221-0/+1
* | | | | Merge pull request #2296 from matrix-org/erikj/dont_appserver_sharErik Johnston2017-06-214-18/+37
|\ \ \ \ \
| * | | | | Initialise exclusive_user_regexErik Johnston2017-06-212-15/+22
| * | | | | Fix for workersErik Johnston2017-06-212-1/+4
| * | | | | Don't work out users who share room with appservice usersErik Johnston2017-06-211-2/+11
* | | | | | Merge pull request #2219 from krombel/avoid_duplicate_filtersErik Johnston2017-06-211-1/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'develop' into avoid_duplicate_filtersKrombel2017-06-2175-593/+3545
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #2292 from matrix-org/erikj/quarantine_mediaErik Johnston2017-06-197-5/+121
|\ \ \ \ \ \
| * | | | | | Handle thumbnail urlsErik Johnston2017-06-191-12/+14
| * | | | | | Add API to quarantine mediaErik Johnston2017-06-197-5/+119
* | | | | | | Merge pull request #2291 from matrix-org/erikj/shutdown_roomErik Johnston2017-06-197-5/+205
|\| | | | | | | |_|_|_|/ / |/| | | | |
| * | | | | Handle all cases of sending membership eventsErik Johnston2017-06-191-0/+5
| * | | | | Remove unused importErik Johnston2017-06-191-1/+1
| * | | | | Change to create new room and join other usersErik Johnston2017-06-192-10/+70
| * | | | | Forget roomErik Johnston2017-06-191-0/+2
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 15:33:07 +0000