summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #568 from matrix-org/erikj/unread_notifErik Johnston2016-02-107-89/+66
|\
| * Rename functionsErik Johnston2016-02-102-4/+4
| * Atomically persit push actions when we persist the eventErik Johnston2016-02-096-65/+49
| * Pass in current state to push action handlerErik Johnston2016-02-093-27/+20
* | Merge pull request #532 from floviolleau/floviolleau/documentationErik Johnston2016-02-102-1/+25
|\ \
| * | Update documentationFlorent VIOLLEAU2016-01-272-1/+25
* | | Merge pull request #565 from matrix-org/erikj/macaroon_configErik Johnston2016-02-093-19/+34
|\ \ \
| * | | TypoErik Johnston2016-02-091-1/+1
| * | | Fix testErik Johnston2016-02-091-3/+4
| * | | Derive macaroon_secret_key from signing key.Erik Johnston2016-02-082-16/+30
* | | | Change a log from debug to infoErik Johnston2016-02-091-1/+1
| |_|/ |/| |
* | | Remove dead codeErik Johnston2016-02-091-12/+0
* | | Invalidate get_last_receipt_event_id_for_user cacheErik Johnston2016-02-091-0/+5
* | | Merge pull request #567 from matrix-org/erikj/sync_ephemeralErik Johnston2016-02-092-14/+20
|\ \ \
| * | | Don't load all ephemeral state for a room on every syncErik Johnston2016-02-092-14/+20
|/ / /
* | | Fix unit testsErik Johnston2016-02-092-5/+9
* | | Merge pull request #560 from matrix-org/daniel/toxDaniel Wagner-Hall2016-02-091-1/+1
|\ \ \
| * | | Remove pyc files before running testsDaniel Wagner-Hall2016-02-091-1/+1
|/ / /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2016-02-093-6/+6
|\ \ \
| * | | Revert "Reject additional path segments"Daniel Wagner-Hall2016-02-093-6/+6
* | | | Measure some /sync related thingsErik Johnston2016-02-092-150/+162
* | | | 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
* | | Merge pull request #563 from matrix-org/daniel/dollarzDaniel Wagner-Hall2016-02-083-6/+6
|\ \ \ | |/ / |/| |
| * | Reject additional path segmentsDaniel Wagner-Hall2016-02-083-6/+6
|/ /
* | Report the v1 and v2 patterns separatelyMark Haines2016-02-051-4/+12
* | List the URL patterns in synapseMark Haines2016-02-051-0/+54
* | Merge pull request #550 from matrix-org/daniel/guestnamesDaniel Wagner-Hall2016-02-052-19/+72
|\ \
| * | Allocate guest user IDs numericcallyDaniel Wagner-Hall2016-02-052-19/+72
|/ /
* | Merge pull request #559 from matrix-org/daniel/mediaDaniel Wagner-Hall2016-02-052-3/+6
|\ \
| * | Host /media/r0 as well as /media/v1Daniel Wagner-Hall2016-02-052-3/+6
|/ /
* | Merge pull request #558 from matrix-org/daniel/configDaniel Wagner-Hall2016-02-057-23/+198
|\ \
| * | Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-057-23/+198
|/ /
* | 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-036-10/+10
|\ \ \
| * | | Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-036-10/+10
* | | | Merge pull request #552 from matrix-org/erikj/public_room_fixErik Johnston2016-02-035-136/+88
|\ \ \ \ | |/ / / |/| | |
| * | | Simplify get_roomsErik Johnston2016-02-033-105/+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-0336-238/+216
| |\| |
| * | | Unused importErik Johnston2016-02-031-1/+1
| * | | Change the way we do public room list fetchingErik Johnston2016-02-023-24/+80
* | | | Add macaroon inspection scriptDaniel Wagner-Hall2016-02-031-0/+24
| |/ / |/| |
* | | Merge pull request #553 from matrix-org/daniel/accesstokenloggingDaniel Wagner-Hall2016-02-021-0/+2
|\ \ \
| * | | Log more diagnostics for unrecognised access tokensDaniel Wagner-Hall2016-02-021-0/+2
|/ / /
* | | Explain what W503 isDaniel Wagner-Hall2016-02-021-1/+1
* | | Merge pull request #551 from matrix-org/daniel/flake8Daniel Wagner-Hall2016-02-0234-66/+73
|\ \ \
| * | | Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-0234-66/+73
|/ / /
* | | Merge pull request #549 from matrix-org/erikj/syncErik Johnston2016-02-023-29/+32
|\ \ \
| * | | 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
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-02-011-5/+0
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-02-011-6/+3
| |\ \ \ \
* | \ \ \ \ Merge pull request #548 from matrix-org/dbkr/fix_guest_db_columnDavid Baker2016-02-021-1/+3
|\ \ \ \ \ \
| * | | | | | 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
| | |_|/ / | |/| | |
* | | | | Merge pull request #546 from matrix-org/erikj/eventsErik Johnston2016-02-012-7/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
* | | | Merge pull request #544 from matrix-org/erikj/stream_roomsErik Johnston2016-02-011-5/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
* | | Merge pull request #542 from matrix-org/erikj/cache_fixErik Johnston2016-01-292-8/+7
|\| |
| * | 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
| |/ /
* | | Merge pull request #539 from matrix-org/markjh/3pidMark Haines2016-01-294-10/+29
|\ \ \ | |/ / |/| |
| * | Add missing param to the log lineMark Haines2016-01-291-1/+2
| * | Fix the mock homserver used in the testsMark Haines2016-01-291-0/+1
| * | Merge remote-tracking branch 'origin/develop' into markjh/3pidMark Haines2016-01-2917-347/+581
| |\ \ | |/ / |/| |
* | | 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-2910-324/+501
|\ \ \
| * | | 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-284-28/+20
| |\ \ \
| * | | | 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-283-16/+24
| * | | | Return correct type of tokenErik Johnston2016-01-281-3/+6
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-283-25/+36
| |\ \ \ \
| * | | | | 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-294-8/+57
|\ \ \ \ \ \
| * | | | | | Add testsErik Johnston2016-01-292-0/+19
| * | | | | | 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
* | | | | | | Merge pull request #537 from matrix-org/erikj/cache_filtersErik Johnston2016-01-283-4/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix testErik Johnston2016-01-282-3/+9
| * | | | | | 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
| |_|_|/ / |/| | | |
* | | | | Prune on fetchingDaniel Wagner-Hall2016-01-281-1/+1
* | | | | Pin pynacl to 0.3.0Daniel Wagner-Hall2016-01-281-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #534 from matrix-org/erikj/setupErik Johnston2016-01-2812-120/+123
|\ \ \ \
| * | | | 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
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Fix testsErik Johnston2016-01-273-5/+12
| * | | | 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
* | | | | | Quot all the thingsDaniel Wagner-Hall2016-01-281-2/+2
| |_|_|/ / |/| | | |
* | | | | 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-282-24/+35
|\ \ \ \ \
| * | | | | Make it possible to paginate forwards from stream tokensRichard van der Hoff2016-01-272-24/+35
| | |/ / / | |/| | |
* | | | | Remove chdirErik Johnston2016-01-281-1/+0
| |_|/ / |/| | |
* | | | Merge pull request #530 from matrix-org/erikj/server_refactorErik Johnston2016-01-2712-544/+190
|\ \ \ \ | |/ / / |/| | |
| * | | 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-2612-545/+191
* | | 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
* | | Merge pull request #529 from matrix-org/dbkr/one_to_one_only_messagesDavid Baker2016-01-261-0/+6
|\ \ \ | |/ / |/| |
| * | 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-254-93/+178
|\ \
| * | PEP8Erik Johnston2016-01-251-1/+0
| * | Remove weird stuffErik Johnston2016-01-251-6/+0
| * | Fix testsErik Johnston2016-01-252-7/+5
| * | 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-228-19/+275
| |\ \
* | \ \ 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-254-35/+41
|\ \ \ \ | | |/ / | |/| |
| * | | Fix testsErik Johnston2016-01-221-1/+1
| * | | 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
|/ / /
* | | Merge pull request #520 from matrix-org/dbkr/bulk_push_overlay_enabledDavid Baker2016-01-222-0/+46
|\ \ \ | |_|/ |/| |
| * | 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
|/ /
* | Merge pull request #519 from matrix-org/dbkr/treecacheDavid Baker2016-01-226-19/+229
|\ \ | |/ |/|
| * 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-225-44/+44
| * Make LRU cache not default to treecache & add options to use itDavid Baker2016-01-224-12/+22
| * 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
| * Test treecache directlyDavid Baker2016-01-221-0/+19
| * Add tests for treecache directly and test del_multi at the LruCache level too.David Baker2016-01-221-0/+66
| * peppateDavid Baker2016-01-211-2/+2
| * Change LRUCache to be tree-based so we can delete subtrees.David Baker2016-01-217-52/+140
|/
* Merge pull request #517 from matrix-org/erikj/push_only_roomErik Johnston2016-01-213-7/+8
|\
| * Only fetch events for rooms and receiptsErik Johnston2016-01-213-7/+8
|/
* Merge pull request #516 from matrix-org/erikj/push_perfErik Johnston2016-01-212-5/+17
|\
| * 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-212-30/+186
|\ \
| * | Cache dns lookups, and use the cache if we fail to lookup servers laterErik Johnston2016-01-202-30/+186
* | | Merge pull request #514 from matrix-org/remove_member_event_ruleDavid Baker2016-01-211-17/+19
|\ \ \ | |_|/ |/| |
| * | Remove member event rule as per SYN-607David Baker2016-01-211-17/+19
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2016-01-216-69/+110
|\ \
| * \ 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-1935-1247/+1044
| | |\ \ \ \
| | * | | | | 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
* | | | | | | | Add another graph contribErik Johnston2016-01-211-0/+151
|/ / / / / / /
* | | | | | | Fix change_passwordErik Johnston2016-01-201-3/+2
* | | | | | | Merge pull request #512 from matrix-org/erikj/whine_on_fromErik Johnston2016-01-201-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Whine if we give a from param to /syncErik Johnston2016-01-201-0/+7
|/ / / / / /
* | | | | | Merge pull request #510 from matrix-org/daniel/nonguestpeekingDaniel Wagner-Hall2016-01-208-85/+108
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-208-85/+108
|/ / / / /
* | | | | Merge branch 'dbkr/no_push_for_own_events' into developDavid Baker2016-01-201-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 'filtered' is a list of zero or 1David Baker2016-01-201-1/+1
* | | | | Merge pull request #511 from matrix-org/dbkr/no_push_for_own_eventsDavid Baker2016-01-201-0/+3
|\| | | | | |_|_|/ |/| | |
| * | | 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
| |_|/ |/| |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 02:28:01 +0000