summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert to putting it around the entire blockErik Johnston2016-02-091-124/+124
* Don't create new logging contextErik Johnston2016-02-091-12/+15
* Fix bug in util.metrics.MeasureErik Johnston2016-02-091-1/+3
* Create new context when measuringErik Johnston2016-02-091-2/+5
* Don't measure across event stream call, as it lasts for a long time.Erik Johnston2016-02-091-124/+124
* Change logcontext warns to debugErik Johnston2016-02-091-3/+3
* Merge pull request #564 from matrix-org/erikj/logcontextErik Johnston2016-02-0831-229/+356
|\
| * Fix up logcontextsErik Johnston2016-02-0831-229/+356
* | Merge pull request #562 from matrix-org/erikj/push_metricErik Johnston2016-02-083-31/+149
|\|
| * Add metrics to pushersErik Johnston2016-02-083-31/+149
* | Reject additional path segmentsDaniel Wagner-Hall2016-02-083-6/+6
|/
* Allocate guest user IDs numericcallyDaniel Wagner-Hall2016-02-052-19/+72
* Host /media/r0 as well as /media/v1Daniel Wagner-Hall2016-02-052-3/+6
* Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-054-23/+57
* Merge pull request #557 from matrix-org/dbkr/profile_dont_return_nullDavid Baker2016-02-041-6/+17
|\
| * No braces hereDavid Baker2016-02-031-1/+1
| * Don't return null if profile display name / avatar url isn't set: omit them i...David Baker2016-02-031-6/+17
* | Actually return something sensibleErik Johnston2016-02-031-1/+1
* | Remove old log lineErik Johnston2016-02-031-2/+0
* | We return dicts now.Erik Johnston2016-02-031-1/+1
* | Add descriptionsErik Johnston2016-02-034-1/+5
* | Preserve log context over when deferring to thread pool in media repoErik Johnston2016-02-031-4/+7
* | Merge pull request #555 from matrix-org/erikj/logcontextErik Johnston2016-02-033-16/+42
|\ \
| * | Allowing tagging log contextsErik Johnston2016-02-033-16/+42
* | | Merge pull request #554 from matrix-org/erikj/event_pushErik Johnston2016-02-035-21/+67
|\ \ \ | |_|/ |/| |
| * | Change event_push_actions_rm_tokens schemaErik Johnston2016-02-035-21/+67
| |/
* | Merge pull request #556 from matrix-org/daniel/configDaniel Wagner-Hall2016-02-033-6/+6
|\ \
| * | Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-033-6/+6
| |/
* | Simplify get_roomsErik Johnston2016-02-032-79/+9
* | PEP8Erik Johnston2016-02-031-1/+1
* | Remove unused methodErik Johnston2016-02-031-8/+0
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_roo...Erik Johnston2016-02-0335-238/+215
|\|
| * Log more diagnostics for unrecognised access tokensDaniel Wagner-Hall2016-02-021-0/+2
| * Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-0233-66/+72
| * s/get_room_changes_for_user/get_membership_changes_for_user/Erik Johnston2016-02-023-4/+4
| * Fetch events in a separate transaction.Erik Johnston2016-02-021-26/+29
| * Merge pull request #545 from matrix-org/erikj/syncErik Johnston2016-02-022-141/+99
| |\
| | * CommentsErik Johnston2016-02-011-5/+6
| | * Move state calculations from rest to handlerErik Johnston2016-02-012-141/+98
| * | Pass make_guest whne we autogen a user IDDavid Baker2016-02-021-1/+3
| * | WARN if we get a topo token instead of stream.Erik Johnston2016-02-021-1/+6
| * | Merge pull request #547 from matrix-org/dbkr/fix_guest_upgradeDavid Baker2016-02-021-0/+1
| |\ \
| | * | Pull guest access token out of the auth session params, otherwise it will bre...David Baker2016-02-011-0/+1
| | |/
* | | Unused importErik Johnston2016-02-031-1/+1
* | | Change the way we do public room list fetchingErik Johnston2016-02-023-24/+80
|/ /
* | Order things correctlyErik Johnston2016-02-012-1/+5
* | Switch over /events to use per room cachesErik Johnston2016-02-012-7/+22
|/
* Merge pull request #543 from matrix-org/erikj/syncErik Johnston2016-02-013-0/+15
|\
| * Cache get_room_changes_for_userErik Johnston2016-01-293-0/+15
* | Only use room_ids if in get_room_events_stream if is_guestErik Johnston2016-02-011-5/+0
* | Don't use before_token. Its wrong. Use actual limit.Erik Johnston2016-01-311-6/+3
|/
* Invalidate _account_data_stream_cache correctlyErik Johnston2016-01-291-0/+4
* If stream pos is greater then earliest known key and entity hasn't changed, t...Erik Johnston2016-01-291-8/+3
* Merge pull request #540 from matrix-org/erikj/syncErik Johnston2016-01-294-19/+56
|\
| * Comment. Remove superfluous order byErik Johnston2016-01-291-1/+3
| * Don't prefill account dataErik Johnston2016-01-291-8/+1
| * Actually use cacheErik Johnston2016-01-291-7/+13
| * Max is not a functionErik Johnston2016-01-291-1/+1
| * Convert param styleErik Johnston2016-01-291-0/+3
| * Prefill stream change cachesErik Johnston2016-01-294-19/+52
* | Merge pull request #541 from matrix-org/erikj/fixsomeofpushErik Johnston2016-01-291-9/+14
|\ \
| * | Deal with None limitErik Johnston2016-01-291-1/+5
| * | Make /events always return a newer token, if one existsErik Johnston2016-01-291-9/+10
| |/
* | Add missing param to the log lineMark Haines2016-01-291-1/+2
* | Merge remote-tracking branch 'origin/develop' into markjh/3pidMark Haines2016-01-2913-336/+557
|\|
| * Bump AccountDataAndTagsChangeCache sizeErik Johnston2016-01-291-1/+1
| * Don't work out unread_notifs_for_room_id unless neededErik Johnston2016-01-291-11/+12
| * Merge pull request #536 from matrix-org/erikj/syncErik Johnston2016-01-299-316/+500
| |\
| | * Amalgamate tags and account data stream cachesErik Johnston2016-01-282-12/+9
| | * If the same as the earliest key, assume nothing has changed.Erik Johnston2016-01-281-0/+5
| | * Correctly update _entity_to_keyErik Johnston2016-01-281-4/+5
| | * Fix inequalitiesErik Johnston2016-01-281-2/+2
| | * Don't use defer.returnValueErik Johnston2016-01-281-1/+1
| | * Include cache hits with has_entity_changedErik Johnston2016-01-281-0/+4
| | * Add events indexErik Johnston2016-01-281-0/+16
| | * Change name and doc has_entity_changedErik Johnston2016-01-284-4/+6
| | * Cache tags and account dataErik Johnston2016-01-287-102/+137
| | * Ensure keys to RoomStreamChangeCache are intsErik Johnston2016-01-282-5/+12
| | * Invalidate caches properly. Remove unused argErik Johnston2016-01-284-10/+15
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-283-26/+18
| | |\
| | * | Change load limit paramsErik Johnston2016-01-281-2/+2
| | * | Amalgamate incremental and full sync for userErik Johnston2016-01-281-40/+16
| | * | Allow paginating backwards from stream tokenErik Johnston2016-01-282-8/+23
| | * | Return correct type of tokenErik Johnston2016-01-281-3/+6
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-282-23/+22
| | |\ \
| | * | | No chdirErik Johnston2016-01-271-1/+0
| | * | | PEP8Erik Johnston2016-01-273-6/+9
| | * | | Use the same path for incremental with gap or without gapErik Johnston2016-01-273-212/+147
| | * | | Add cache to room streamErik Johnston2016-01-275-74/+254
| | * | | Don't turn on profilingErik Johnston2016-01-271-1/+1
| * | | | Merge pull request #538 from matrix-org/erikj/fix_lru_cacheErik Johnston2016-01-292-8/+38
| |\ \ \ \
| | * | | | Directly set self.valueErik Johnston2016-01-291-1/+1
| | * | | | Remove spurious self.sizeErik Johnston2016-01-291-1/+0
| | * | | | Correctly bookkeep the size of TreeCacheErik Johnston2016-01-291-3/+28
| | * | | | Make TreeCache keep track of its own size.Erik Johnston2016-01-292-6/+10
| | * | | | Reset size on clearErik Johnston2016-01-291-0/+2
| * | | | | Fix testErik Johnston2016-01-281-0/+5
| * | | | | Cache filtersErik Johnston2016-01-281-1/+2
| |/ / / /
* | | | | Add config option for setting the trusted id servers, disabling checking the ...Mark Haines2016-01-292-8/+24
* | | | | Allow three_pid_creds as well as threePidCreds in /account/3pidMark Haines2016-01-291-2/+3
|/ / / /
* | | / Pin pynacl to 0.3.0Daniel Wagner-Hall2016-01-281-1/+1
| |_|/ |/| |
* | | Merge pull request #534 from matrix-org/erikj/setupErik Johnston2016-01-289-115/+111
|\ \ \ | |_|/ |/| |
| * | Clean up a bit. Add commentErik Johnston2016-01-283-26/+18
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-271-1/+1
| |\ \ | | |/ | |/|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-274-9/+27
| |\ \
| * | | PEP 8Erik Johnston2016-01-271-1/+0
| * | | Add a Homeserver.setup method.Erik Johnston2016-01-269-116/+121
* | | | Up get_rooms_for_user cache sizeErik Johnston2016-01-281-1/+1
* | | | Merge pull request #535 from matrix-org/rav/paginate_from_stream_tokenRichard van der Hoff2016-01-281-22/+21
|\ \ \ \
| * | | | Make it possible to paginate forwards from stream tokensRichard van der Hoff2016-01-271-22/+21
| | |/ / | |/| |
* | | | Remove chdirErik Johnston2016-01-281-1/+0
| |_|/ |/| |
* | | Merge pull request #530 from matrix-org/erikj/server_refactorErik Johnston2016-01-277-230/+160
|\ \ \ | |/ / |/| |
| * | Don't turn on profilingErik Johnston2016-01-261-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/server_ref...Erik Johnston2016-01-262-2/+8
| |\ \ | | |/ | |/|
| * | Remove redundated BaseHomeServerErik Johnston2016-01-267-231/+161
* | | Merge pull request #533 from matrix-org/rav/hashtest_federationRichard van der Hoff2016-01-271-1/+7
|\ \ \
| * | | Federation: drop events which cause SynapseErrorsRichard van der Hoff2016-01-271-1/+7
| | |/ | |/|
* | | Merge pull request #531 from matrix-org/markjh/relative_push_rulesMark Haines2016-01-272-6/+12
|\ \ \ | |/ / |/| |
| * | Fix adding push rules relative to other rulesMark Haines2016-01-272-6/+12
* | | Only notify for messages in one to one rooms, not every eventDavid Baker2016-01-261-0/+6
|/ /
* | Merge pull request #528 from matrix-org/markjh/missing_yieldMark Haines2016-01-251-2/+2
|\ \ | |/ |/|
| * Add missing yield in push_rules set enabledMark Haines2016-01-251-2/+2
* | Merge pull request #524 from matrix-org/erikj/syncErik Johnston2016-01-253-87/+174
|\ \
| * | PEP8Erik Johnston2016-01-251-1/+0
| * | Remove weird stuffErik Johnston2016-01-251-6/+0
| * | Fix testsErik Johnston2016-01-251-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-251-3/+7
| |\|
| * | Move logic from rest/ to handlers/Erik Johnston2016-01-253-87/+181
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-226-19/+189
| |\ \
* | \ \ Merge pull request #525 from matrix-org/erikj/select_manyErik Johnston2016-01-253-60/+110
|\ \ \ \
| * | | | Guard against empty iterablesErik Johnston2016-01-251-0/+6
| * | | | Correct docstringErik Johnston2016-01-251-1/+0
| * | | | Implement a _simple_select_many_batchErik Johnston2016-01-253-60/+105
| | |_|/ | |/| |
* | | | Merge pull request #527 from matrix-org/erikj/push_cacheErik Johnston2016-01-252-17/+14
|\ \ \ \
| * | | | Push: Use storage apis that are cachedErik Johnston2016-01-252-17/+14
| |/ / /
* | | | Merge pull request #526 from matrix-org/erikj/push_indexErik Johnston2016-01-251-0/+1
|\ \ \ \
| * | | | Add index to event_push_actionsErik Johnston2016-01-251-0/+1
| |/ / /
* | | | Merge pull request #521 from matrix-org/erikj/underscoresErik Johnston2016-01-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Underscores are allowed in user idsErik Johnston2016-01-221-1/+1
* | | | Merge branch 'erikj/filters' of github.com:matrix-org/synapse into developErik Johnston2016-01-253-34/+40
|\ \ \ \ | | |/ / | |/| |
| * | | Sanitize filtersErik Johnston2016-01-223-34/+40
* | | | Merge pull request #523 from matrix-org/dbkr/no_push_unless_notifyDavid Baker2016-01-221-9/+1
|\ \ \ \
| * | | | Better fix for actions with both dont_notify and tweaksDavid Baker2016-01-221-1/+1
| * | | | Revert b4a41aa542203c03bb8a6c93097b94bc5d167265 as it's just broken.David Baker2016-01-221-9/+1
* | | | | Merge pull request #522 from matrix-org/dbkr/no_push_unless_notifyDavid Baker2016-01-221-1/+9
|\| | | |
| * | | | Don't add notifications to the table unless there's actually a 'notify' actionDavid Baker2016-01-221-1/+9
| | |_|/ | |/| |
* / | | Don't mutate cached valuesErik Johnston2016-01-221-2/+6
|/ / /
* | | Don't crash if a user has no push rule enabled entriesDavid Baker2016-01-221-0/+3
* | | Overlay the push_rules_enabled map for users, otherwise they won't be able to...David Baker2016-01-222-0/+43
| |/ |/|
* | Don't add the member functiopn if we're not using treecacheDavid Baker2016-01-221-1/+4
* | docsDavid Baker2016-01-221-1/+5
* | Revert all the bits changing keys of eeverything that used LRUCaches to tuplesDavid Baker2016-01-223-9/+9
* | Make LRU cache not default to treecache & add options to use itDavid Baker2016-01-223-11/+20
* | Add __contains__David Baker2016-01-221-0/+3
* | Docs for treecacheDavid Baker2016-01-221-0/+5
* | Use new invalidate_many cache invalidation to invalidate the event_push_actio...David Baker2016-01-221-4/+15
* | Add invalidate_many here tooDavid Baker2016-01-221-0/+1
* | peppateDavid Baker2016-01-211-2/+2
* | Change LRUCache to be tree-based so we can delete subtrees.David Baker2016-01-215-17/+105
|/
* Only fetch events for rooms and receiptsErik Johnston2016-01-213-7/+8
* Cache get_unread_event_push_actions_by_room_for_userErik Johnston2016-01-211-1/+2
* Only compute badge count when necessary.Erik Johnston2016-01-211-4/+15
* Fix AttributeErrorErik Johnston2016-01-211-1/+1
* Merge pull request #515 from matrix-org/erikj/syn-606Erik Johnston2016-01-211-1/+3
|\
| * SYN-606: Peeking does not wake up /eventsErik Johnston2016-01-211-1/+3
* | Merge pull request #509 from matrix-org/erikj/dns_cacheErik Johnston2016-01-211-30/+71
|\ \
| * | Cache dns lookups, and use the cache if we fail to lookup servers laterErik Johnston2016-01-201-30/+71
* | | Remove member event rule as per SYN-607David Baker2016-01-211-17/+19
| |/ |/|
* | Merge pull request #507 from matrix-org/push_badge_countsDavid Baker2016-01-215-66/+108
|\ \
| * | peppateDavid Baker2016-01-201-3/+2
| * | Add index by user id on receipts_linearizedDavid Baker2016-01-201-0/+18
| * | Add storage function to get all receipts for a user. Also add some cache inva...David Baker2016-01-202-43/+40
| * | Inline membership specifierDavid Baker2016-01-201-3/+1
| * | Simplify badge updating code by just updating it every time we get woken up a...David Baker2016-01-201-15/+4
| * | Merge branch 'develop' into push_badge_countsDavid Baker2016-01-201-1/+1
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into push_badge_countsDavid Baker2016-01-201-0/+3
| |\ \ \
| * \ \ \ Merge branch 'develop' into push_badge_countsDavid Baker2016-01-203-36/+36
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'develop' into push_badge_countsDavid Baker2016-01-1930-672/+950
| |\ \ \ \
| * | | | | Use the unread notification count to send accurate badge counts in push notif...David Baker2016-01-133-45/+86
* | | | | | Merge pull request #513 from matrix-org/erikj/register_user_charsErik Johnston2016-01-211-3/+2
|\ \ \ \ \ \
| * | | | | | Don't explode when given a unicode username in /register/Erik Johnston2016-01-201-3/+2
* | | | | | | Fix change_passwordErik Johnston2016-01-201-3/+2
* | | | | | | Whine if we give a from param to /syncErik Johnston2016-01-201-0/+7
|/ / / / / /
* | | | | / Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-208-85/+108
| |_|_|_|/ |/| | | |
* | | | | 'filtered' is a list of zero or 1David Baker2016-01-201-1/+1
| |_|_|/ |/| | |
* | | | Don't generate push actions for our own eventsDavid Baker2016-01-201-0/+3
| |_|/ |/| |
* | | Merge pull request #506 from matrix-org/erikj/push_fastErik Johnston2016-01-192-30/+23
|\ \ \
| * | | Only compute unread notifications for rooms we send down streamErik Johnston2016-01-192-30/+23
| | |/ | |/|
* / | Don't use form of get_state_for_events with None state_keyErik Johnston2016-01-191-6/+13
|/ /
* | Use split rather than endswithErik Johnston2016-01-191-2/+1
* | Change regex cache size to 5000Erik Johnston2016-01-191-1/+1
* | Add regex cache. Only caculate push actions for users that have sent read rec...Erik Johnston2016-01-197-14/+50
* | Handle glob -> regex errorsErik Johnston2016-01-191-29/+33
* | Merge pull request #477 from matrix-org/erikj/access_token_logErik Johnston2016-01-191-3/+5
|\ \
| * | Use compiled regexErik Johnston2016-01-131-2/+4
| * | Don't log urlencoded access_tokensErik Johnston2016-01-081-2/+2
* | | Use all_ephemeral_by_room in incremental_sync_with_gap_for_roomErik Johnston2016-01-191-3/+5
* | | Return don't breakErik Johnston2016-01-191-1/+1
* | | Except truthy valuesErik Johnston2016-01-191-1/+1
* | | Merge pull request #504 from matrix-org/erikj/highlight_countErik Johnston2016-01-193-8/+40
|\ \ \
| * | | Return highlight_count in /syncErik Johnston2016-01-193-8/+40
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into default_notifyErik Johnston2016-01-1924-647/+851
|\| | |
| * | | Merge pull request #502 from matrix-org/erikj/push_notif_perfErik Johnston2016-01-1911-395/+550
| |\ \ \
| | * | | Take a deepcopy of push rules before mutating themErik Johnston2016-01-191-1/+3
| | * | | Update _idErik Johnston2016-01-191-2/+3
| | * | | Preserve truthinessErik Johnston2016-01-181-1/+2
| | * | | You need to escape backslashesErik Johnston2016-01-181-2/+2
| | * | | Fix branch didn't check word_boundaryErik Johnston2016-01-181-3/+9
| | * | | Remove dead codeErik Johnston2016-01-181-22/+1
| | * | | Don't split at word boundaries, actually use regexErik Johnston2016-01-182-63/+48
| | * | | Drop log levelsErik Johnston2016-01-181-2/+2
| | * | | Add comments and remove dead codeErik Johnston2016-01-181-12/+11
| | * | | Do for loop once at startErik Johnston2016-01-181-8/+17
| | * | | Use static for const dictsErik Johnston2016-01-184-198/+209
| | * | | Remove internal idsErik Johnston2016-01-181-0/+4
| | * | | Don't edit rulesetErik Johnston2016-01-181-5/+4
| | * | | Make unit tests workErik Johnston2016-01-181-1/+1
| | * | | Re-enable urnead notificationsErik Johnston2016-01-183-13/+6
| | * | | Make notifications go quickerErik Johnston2016-01-184-131/+260
| | * | | Make Event objects behave more like dictsErik Johnston2016-01-181-0/+9
| | * | | Allow filtering events for multiple users at onceErik Johnston2016-01-182-39/+67
| * | | | Don't error on AS non-ghost user useDaniel Wagner-Hall2016-01-181-0/+2
| * | | | Pull out app service user lookupDaniel Wagner-Hall2016-01-181-31/+28
| |/ / /
| * | | Require unbanning before other membership changesDaniel Wagner-Hall2016-01-155-55/+113
| * | | Remove unused parametersDaniel Wagner-Hall2016-01-152-16/+8
| * | | M_INVALID_USERNAME to be consistent with the parameter nameDavid Baker2016-01-152-2/+2
| * | | Add specific error code for invalid user names.David Baker2016-01-142-1/+3
| * | | Merge pull request #497 from matrix-org/erikj/max_limitErik Johnston2016-01-141-2/+5
| |\ \ \
| | * | | Clamp pagination limits to at most 1000Erik Johnston2016-01-141-2/+5
| * | | | Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-142-12/+29
| |\ \ \ \
| | * | | | Add 'event' result to 'context' endpointRichard van der Hoff2016-01-132-12/+29
| | * | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-135-21/+5
| * | | | | Require ID and as_token be unique for ASsDaniel Wagner-Hall2016-01-141-1/+25
| * | | | | Merge pull request #498 from matrix-org/push_rule_enabled_fixDavid Baker2016-01-141-1/+1
| |\ \ \ \ \
| | * | | | | Fix enabling & disabling push rulesDavid Baker2016-01-141-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #487 from matrix-org/daniel/forceregistrationDaniel Wagner-Hall2016-01-141-0/+5
| |\ \ \ \ \
| | * | | | | Require AS users to be registered before useDaniel Wagner-Hall2016-01-131-0/+5
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #494 from matrix-org/daniel/2Daniel Wagner-Hall2016-01-141-0/+1
| |\ \ \ \ \
| | * | | | | Don't start server if ASes are invalidly configuredDaniel Wagner-Hall2016-01-131-0/+1
| | |/ / / /
| * | | | | Merge pull request #493 from matrix-org/daniel/1Daniel Wagner-Hall2016-01-141-59/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Delete unused codeDaniel Wagner-Hall2016-01-131-59/+0
| | |/ / /
| * | | | Use logger not loggingErik Johnston2016-01-141-2/+2
| * | | | Don't change signature. Return empty listErik Johnston2016-01-131-2/+2
| * | | | Temporarily disable notification branchErik Johnston2016-01-133-7/+14
| * | | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest o...Mark Haines2016-01-139-99/+99
| |/ / /
* / / / Change default pushrules back to notifying for all messages.David Baker2016-01-131-1/+0
|/ / /
* | | Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/t...Mark Haines2016-01-133-26/+13
|\ \ \
| * | | bulk_get_push_rules should handle empty listsErik Johnston2016-01-131-21/+13
| * | | Merge pull request #480 from matrix-org/erikj/guest_event_tightloopErik Johnston2016-01-131-7/+0
| |\ \ \
| | * | | Dont fire user_joined_room when guest hits /eventsErik Johnston2016-01-121-7/+0
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-22 17:45:31 +0000