summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
| * | | | Don't include old left roomsErik Johnston2016-01-121-1/+5
| |/ / /
* | | | Delete the table objects from TransactionStoreMark Haines2016-01-131-58/+10
* | | | Remove the RoomsTable objectMark Haines2016-01-131-13/+3
* | | | Remove the PushersTable and EventPushActionsTable objectsMark Haines2016-01-122-14/+6
* | | | Remove the PushRuleTable and PushRuleEnableTable objectsMark Haines2016-01-121-50/+33
|/ / /
* | | Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-1121-131/+167
|\ \ \
| * | | Introduce a Requester objectDaniel Wagner-Hall2016-01-1121-131/+167
* | | | Postgres doesn't like booleansDavid Baker2016-01-111-2/+2
* | | | Remove rogue 'admin'David Baker2016-01-111-1/+1
* | | | Merge pull request #474 from matrix-org/erikj/core_dumpErik Johnston2016-01-081-2/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Turn on core dumpsErik Johnston2016-01-071-2/+5
| |/ /
* | | Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-0816-35/+515
|\ \ \
| * | | This comma is actually importantDavid Baker2016-01-071-1/+1
| * | | more commasDavid Baker2016-01-071-1/+1
| * | | comma styleDavid Baker2016-01-061-1/+1
| * | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-066-142/+60
| |\ \ \
| * | | | Adding is_guest here won't work because it just constructs a dict of uid -> p...David Baker2016-01-061-1/+1
| * | | | Delete notifications for redacted eventsDavid Baker2016-01-062-0/+19
| * | | | Add schema change file for is_guest flagDavid Baker2016-01-061-0/+22
| * | | | Add is_guest flag to users db to track whether a user is a guest user or not....David Baker2016-01-069-31/+69
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-0514-58/+120
| |\ \ \ \
| * | | | | comment typoDavid Baker2016-01-051-1/+1
| * | | | | = not == in sqlDavid Baker2016-01-041-1/+1
| * | | | | Only joined rooms have unread_notif_countDavid Baker2016-01-041-1/+1
| * | | | | commaDavid Baker2016-01-041-1/+1
| * | | | | Add unread_notif_count in incremental_sync_with_gapDavid Baker2016-01-041-0/+8
| * | | | | Rename event-actions to event_push_actions as per PR requestDavid Baker2016-01-046-17/+17
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-045-4/+120
| |\ \ \ \ \
| * | | | | | Address minor PR issuesDavid Baker2016-01-047-25/+12
| * | | | | | Fix merge fail with anon access stuffDavid Baker2015-12-221-2/+2
| * | | | | | pep8 & unused variableDavid Baker2015-12-223-4/+3
| * | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-225-81/+200
| |\ \ \ \ \ \
| * | | | | | | Add some comments to areas that could be optimised.David Baker2015-12-223-1/+14
| * | | | | | | Insert push actions in a single db query rather than one per user/profile_tagDavid Baker2015-12-222-17/+24
| * | | | | | | Add bulk push rule evaluator which actually still evaluates rules one by one,...David Baker2015-12-224-22/+159
| * | | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-2115-69/+253
| |\ \ \ \ \ \ \
| * | | | | | | | Only run pushers for users on this hs!David Baker2015-12-213-3/+9
| * | | | | | | | pep8David Baker2015-12-212-9/+9
| * | | | | | | | Make unread notification count sending work: put the correct count in increme...David Baker2015-12-182-20/+49
| * | | | | | | | still very WIP, but now sends unread_notifications_count in the room object o...David Baker2015-12-165-5/+82
| * | | | | | | | Store nothing instead of ['dont_notify'] for events with no notification requ...David Baker2015-12-103-21/+14
| * | | | | | | | Save event actions to the dbDavid Baker2015-12-104-2/+72
| * | | | | | | | Having consulted The Erikle, this should go at the end of on_receive_pdu, oth...David Baker2015-12-101-11/+6
| * | | | | | | | Very first cut of calculating actions for events as they come in. Doesn't sto...David Baker2015-12-104-1/+81
* | | | | | | | | Only use cropped thumbnails when asked for a cropped thumbnail.Mark Haines2016-01-071-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Use logger not loggingErik Johnston2016-01-071-2/+2
* | | | | | | | Merge pull request #473 from matrix-org/erikj/ssh_manholeErik Johnston2016-01-072-6/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | s/telnet/ssh/Erik Johnston2016-01-071-1/+1
| * | | | | | | | Change manhole to use sshErik Johnston2016-01-071-5/+21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | copyrightsMatthew Hodgson2016-01-07231-231/+231
* | | | | | | | Merge pull request #472 from roblabla/patch-1Matthew Hodgson2016-01-061-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Config Comment mixup in captcha public/private keyRobin Lambertz2016-01-061-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Add /_matrix/versions to report supported versionsDaniel Wagner-Hall2016-01-063-0/+43
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Pass whether the user was a guest to some of the event streamsMark Haines2016-01-061-5/+3
* | | | | | | Guest users must be joined to a room to see it in /syncMark Haines2016-01-064-137/+50
* | | | | | | Log when starting stats reportingDaniel Wagner-Hall2016-01-061-0/+1
* | | | | | | Log on stats schedulingDaniel Wagner-Hall2016-01-061-0/+1
* | | | | | | Log when we skip daily messagesDaniel Wagner-Hall2016-01-061-1/+10
| |/ / / / / |/| | | | |
* | | | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-055-21/+5
* | | | | | Allow guests to upgrade their accountsDaniel Wagner-Hall2016-01-0510-31/+84
* | | | | | Use larger thumbnail rather than smaller.Erik Johnston2016-01-051-4/+13
* | | | | | Return /sync when something under the 'leave' key has changedErik Johnston2016-01-051-1/+1
* | | | | | Use named argsErik Johnston2016-01-051-2/+2
* | | | | | Support inviting 3pids in /createRoomErik Johnston2016-01-051-0/+16
|/ / / / /
* | | | / Bump changelog and version for v0.12.0Mark Haines2016-01-041-1/+1
| |_|_|/ |/| | |
* | | | Expose /login under r0Richard van der Hoff2016-01-021-1/+1
* | | | Bump version and update changelog for v0.12.0-rc3 v0.12.0-rc3Mark Haines2015-12-231-1/+1
* | | | Merge pull request #457 from matrix-org/markjh/cached_syncMark Haines2015-12-232-1/+117
|\ \ \ \
| * | | | Add some docstring explaining the snapshot cache doesMark Haines2015-12-231-1/+23
| * | | | Add a unit test for the snapshot cacheMark Haines2015-12-231-2/+2
| * | | | Move the doc string to the public facing methodMark Haines2015-12-221-16/+17
| * | | | Add a cache for initialSync responses that expires after 5 minutesMark Haines2015-12-222-1/+94
| | |_|/ | |/| |
* / | | Missing yield on guest access auth checkMark Haines2015-12-231-1/+1
|/ / /
* | | Include the list of bad room ids in the errorMark Haines2015-12-222-2/+24
* | | Use a list comprehensionMark Haines2015-12-221-3/+4
* | | Merge remote-tracking branch 'origin/develop' into markjh/guest_accessMark Haines2015-12-221-0/+5
|\ \ \
| * | | Add top level filters for filtering by room idMark Haines2015-12-221-33/+35
* | | | Hook up read receipts and typing notifications for guest accessMark Haines2015-12-221-13/+11
* | | | Merge branch 'develop' into markjh/guest_accessMark Haines2015-12-221-2/+21
|\| | |
| * | | Return room avatar URLs in /publicRoomsDaniel Wagner-Hall2015-12-211-2/+21
| | |/ | |/|
* | | Allow guest access to /syncMark Haines2015-12-221-46/+98
* | | Allow guest access if the user provides a list of rooms in the filterMark Haines2015-12-223-1/+22
* | | Add top level filtering by room idMark Haines2015-12-211-33/+30
|/ /
* | Remove accidentally committed debug loggingMark Haines2015-12-211-1/+0
* | Actually look up required remote server key IDsPaul "LeoNerd" Evans2015-12-181-1/+3
* | Merge pull request #450 from matrix-org/matthew/no-identiconsMatthew Hodgson2015-12-181-19/+3
|\ \
| * | fix indentation levelMatthew Hodgson2015-12-171-3/+3
| * | stop generating default identicons. reverts most of 582019f870adbc4a8a8a9ef97...Matthew Hodgson2015-12-171-19/+3
* | | Merge branch 'release-v0.12.0' into developDavid Baker2015-12-181-1/+1
|\ \ \
| * | | Fix typo that broke registration on the mobile clientsDavid Baker2015-12-181-1/+1
* | | | Add display_name to 3pid invite in m.room.member invitesDaniel Wagner-Hall2015-12-171-1/+31
| |/ / |/| |
* | | Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-172-2/+13
|/ /