summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| |_|/ / / |/| | | |
* | | | | Merge pull request #505 from matrix-org/erikj/push_fastErik Johnston2016-01-197-14/+49
|\| | | |
| * | | | 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 pull request #486 from matrix-org/default_notifyErik Johnston2016-01-191-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into default_notifyErik Johnston2016-01-1929-1222/+945
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #502 from matrix-org/erikj/push_notif_perfErik Johnston2016-01-1913-954/+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-183-560/+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
* | | | | | | Merge pull request #503 from matrix-org/daniel/nonghostsDaniel Wagner-Hall2016-01-191-31/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
|/ / / / / /
* | | | | | Merge pull request #501 from matrix-org/daniel/unbanDaniel Wagner-Hall2016-01-156-58/+116
|\ \ \ \ \ \
| * | | | | | Require unbanning before other membership changesDaniel Wagner-Hall2016-01-156-58/+116
|/ / / / / /
* | | | | | Merge pull request #500 from matrix-org/daniel/cleanupDaniel Wagner-Hall2016-01-152-16/+8
|\ \ \ \ \ \
| * | | | | | Remove unused parametersDaniel Wagner-Hall2016-01-152-16/+8
|/ / / / / /
* | | | | | Merge branch 'invalid_user_name' into developDavid Baker2016-01-152-2/+2
|\ \ \ \ \ \
| * | | | | | M_INVALID_USERNAME to be consistent with the parameter nameDavid Baker2016-01-152-2/+2
* | | | | | | Merge pull request #499 from matrix-org/invalid_user_nameDavid Baker2016-01-152-1/+3
|\| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #492 from matrix-org/rav/event_context_shiz_release github/release-v0.12.1 release-v0.12.1Richard van der Hoff2016-01-142-12/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Add 'event' result to 'context' endpointRichard van der Hoff2016-01-132-12/+29
| |/ / / / / / /
* | | | | | | | Merge pull request #496 from matrix-org/daniel/3Daniel Wagner-Hall2016-01-143-17/+111
|\ \ \ \ \ \ \ \
| * | | | | | | | Require ID and as_token be unique for ASsDaniel Wagner-Hall2016-01-143-17/+111
|/ / / / / / / /
* | | | | | | | 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 branch 'release-v0.12.1' into developRichard van der Hoff2016-01-141-0/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-135-21/+5
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #476 from koobs/patch-1Matthew Hodgson2016-01-081-0/+8
| |\ \ \ \ \ \
| | * | | | | | Add FreeBSD install section & instructionsKubilay Kocak2016-01-091-0/+8
| |/ / / / / /
* | | | | | | 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
* | | | | | Merge pull request #495 from matrix-org/erikj/disable_notificationErik Johnston2016-01-143-6/+13
|\ \ \ \ \ \
| * | | | | | Don't change signature. Return empty listErik Johnston2016-01-131-2/+2
| * | | | | | Temporarily disable notification branchErik Johnston2016-01-133-7/+14
|/ / / / / /
* | | | | | Merge pull request #488 from matrix-org/markjh/user_nameMark Haines2016-01-139-99/+99
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 pull request #482 from matrix-org/markjh/table_nameMark Haines2016-01-137-128/+41
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/t...Mark Haines2016-01-133-26/+13
| |\ \ \ \
| * | | | | Delete the table objects from TransactionStoreMark Haines2016-01-133-60/+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 #483 from matrix-org/erikj/bulk_get_push_rulesErik Johnston2016-01-131-21/+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
| |/ / / /
* | | | | Merge pull request #481 from matrix-org/erikj/SYN-589Erik Johnston2016-01-121-1/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't include old left roomsErik Johnston2016-01-121-1/+5
|/ / / /
* | | | Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-1124-144/+178
|\ \ \ \
| * | | | Introduce a Requester objectDaniel Wagner-Hall2016-01-1124-144/+178
* | | | | 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-0819-36/+541
|\ \ \ \
| * | | | 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
| * | | | | fix testsDavid Baker2016-01-063-1/+10
| * | | | | 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-0517-74/+139
| |\ \ \ \ \
| * | | | | | 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
| * | | | | | fix testsDavid Baker2016-01-042-2/+2
| * | | | | | 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-047-4/+208
| |\ \ \ \ \ \
| * | | | | | | Address minor PR issuesDavid Baker2016-01-047-25/+12
| * | | | | | | Fix merge fail with anon access stuffDavid Baker2015-12-221-2/+2
| * | | | | | | Add mocks to make tests work againDavid Baker2015-12-222-0/+16
| * | | | | | | pep8 & unused variableDavid Baker2015-12-223-4/+3
| * | | | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-226-91/+210
| |\ \ \ \ \ \ \
| * | | | | | | | Add some comments to areas that could be optimised.David Baker2015-12-223-1/+14
| * | | | | | | | Remove the list of problems (moved to jira issues)David Baker2015-12-221-5/+0
| * | | | | | | | Insert push actions in a single db query rather than one per user/profile_tagDavid Baker2015-12-222-17/+24
| * | | | | | | | clarify problemsDavid Baker2015-12-221-1/+1
| * | | | | | | | 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-2120-80/+320
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Only run pushers for users on this hs!David Baker2015-12-213-3/+9
| * | | | | | | | | pep8David Baker2015-12-212-9/+9
| * | | | | | | | | add list of things I want to fix with this branchDavid Baker2015-12-181-0/+5
| * | | | | | | | | 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
* | | | | | | | | | Merge pull request #475 from matrix-org/markjh/fix_thumbnailMark Haines2016-01-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | 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
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #465 from matrix-org/syn-453Erik Johnston2016-01-071-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update readme to reflect change in signing key nameErik Johnston2016-01-061-2/+1
| |/ / / / / / / /
* | | | | | | | | copyrightsMatthew Hodgson2016-01-07295-297/+297
* | | | | | | | | 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
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #468 from matrix-org/daniel/versionsyoDaniel Wagner-Hall2016-01-063-0/+43
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add /_matrix/versions to report supported versionsDaniel Wagner-Hall2016-01-063-0/+43
|/ / / / / / / /
* | | | | | | | Merge pull request #469 from matrix-org/markjh/joined_guest_accessMark Haines2016-01-064-139/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | | Merge pull request #466 from matrix-org/daniel/logloglogDaniel Wagner-Hall2016-01-061-1/+10
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Log when we skip daily messagesDaniel Wagner-Hall2016-01-061-1/+10
|/ / / / / / /
* | | | | | | Merge pull request #463 from matrix-org/daniel/hashtagnofilterDaniel Wagner-Hall2016-01-055-21/+5
|\ \ \ \ \ \ \
| * | | | | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-055-21/+5
|/ / / / / / /
* | | | | | | Merge pull request #462 from matrix-org/daniel/guestupgradeDaniel Wagner-Hall2016-01-0511-40/+93
|\ \ \ \ \ \ \
| * | | | | | | Allow guests to upgrade their accountsDaniel Wagner-Hall2016-01-0511-40/+93
|/ / / / / / /
* | | | | | | Merge pull request #464 from matrix-org/erikj/crop_correctErik Johnston2016-01-051-4/+13
|\ \ \ \ \ \ \
| * | | | | | | Use larger thumbnail rather than smaller.Erik Johnston2016-01-051-4/+13
|/ / / / / / /
* | | | | | | Merge pull request #461 from matrix-org/erikj/sync_leaveErik Johnston2016-01-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Return /sync when something under the 'leave' key has changedErik Johnston2016-01-051-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #460 from matrix-org/erikj/create_room_3pid_inviteErik Johnston2016-01-051-0/+16
|\ \ \ \ \ \ \
| * | | | | | | Use named argsErik Johnston2016-01-051-2/+2
| * | | | | | | Support inviting 3pids in /createRoomErik Johnston2016-01-051-0/+16
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-01-051-4/+2
|\| | | | | |
| | | | | | * try to bump syweb to 0.6.8Matthew Hodgson2016-02-101-1/+1
| | |_|_|_|/ | |/| | | |
| * | | | | typoeMatthew Hodgson2016-01-041-1/+1
| * | | | | fix another whitespace rst bugMatthew Hodgson2016-01-041-1/+1
| * | | | | fix whitespace bugMatthew Hodgson2016-01-041-2/+0
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/release-v0.12.0' v0.12.0Mark Haines2016-01-0486-873/+2602
|\ \ \ \ \
| * | | | | Bump changelog and version for v0.12.0Mark Haines2016-01-042-4/+5
| | |_|_|/ | |/| | |
| * | | | Update CHANGES github/release-v0.12.0 release-v0.12.0Richard van der Hoff2016-01-041-0/+4
| * | | | Merge pull request #459 from matrix-org/rav/fix_r0_loginRichard van der Hoff2016-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-232-1/+25
| * | | | Merge pull request #457 from matrix-org/markjh/cached_syncMark Haines2015-12-233-1/+177
| |\ \ \ \
| | * | | | Add some docstring explaining the snapshot cache doesMark Haines2015-12-231-1/+23
| | * | | | Add a unit test for the snapshot cacheMark Haines2015-12-232-2/+62
| | * | | | 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
| | | |_|/ | | |/| |
| * | | | Merge pull request #458 from matrix-org/markjh/guest_authMark Haines2015-12-231-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Missing yield on guest access auth checkMark Haines2015-12-231-1/+1
| |/ / /
| * | | Merge pull request #455 from matrix-org/markjh/guest_accessMark Haines2015-12-224-50/+144
| |\ \ \
| | * | | 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
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #454 from matrix-org/markjh/room_filteringMark Haines2015-12-222-34/+35
| |\ \ \ \
| | * | | | Add top level filters for filtering by room idMark Haines2015-12-222-34/+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
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #453 from matrix-org/daniel/avatarurlsDaniel Wagner-Hall2015-12-211-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 bogus comment about branch coverageMark Haines2015-12-211-1/+0
| |/ / /
| * | | Delete all the .coverage files, including the combined .coverageMark Haines2015-12-211-1/+2
| * | | Use an absolute path when specifying the directory for synapse in jenkins.shMark Haines2015-12-211-8/+8
| | |/ | |/|
| * | Remove accidentally committed debug loggingMark Haines2015-12-211-1/+0
| * | Merge pull request #452 from matrix-org/paul/SYN-558Mark Haines2015-12-211-1/+3
| |\ \
| | * | Actually look up required remote server key IDsPaul "LeoNerd" Evans2015-12-181-1/+3
| |/ /
| * | Merge pull request #451 from matrix-org/markjh/branch_coverageMark Haines2015-12-182-6/+18
| |\ \
| | * | Generate code coverage report when running jenkins.shMark Haines2015-12-182-6/+18
| |/ /
| * | Merge pull request #450 from matrix-org/matthew/no-identiconsMatthew Hodgson2015-12-181-19/+3
| |\ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-27 19:14:45 +0000