summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | Fix 500 error when back-paginating search resultsRichard van der Hoff2015-12-171-2/+4
* | Fix typoDaniel Wagner-Hall2015-12-161-1/+1
* | Give the IS a bunch more 3pid invite contextDaniel Wagner-Hall2015-12-161-7/+60
* | Merge pull request #440 from matrix-org/daniel/iseMark Haines2015-12-161-2/+5
|\ \
| * | Include errcode on Internal Server ErrorDaniel Wagner-Hall2015-12-141-2/+5
* | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-163-5/+10
|\ \ \
| * | | Allow users to change which account a 3pid is bound toMark Haines2015-12-151-1/+1
| * | | Changelog and version bump for v0.12.0-rc2 v0.12.0-rc2Mark Haines2015-12-141-1/+1
| * | | Fix a race between started/stopped streamMark Haines2015-12-141-3/+8
* | | | Fix spacingMark Haines2015-12-141-1/+1
* | | | Fix logging to lie lessMark Haines2015-12-141-2/+9
* | | | Add commentary for fix in PR#442Mark Haines2015-12-141-0/+6
* | | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-143-7/+23
|\| | |
| * | | Merge pull request #441 from matrix-org/markjh/fts_skip_invalidMark Haines2015-12-141-0/+5
| |\ \ \
| | * | | Skip events that where the body, name or topic isn't a string when back popul...Mark Haines2015-12-141-0/+5
| * | | | Combine the prev content testsMark Haines2015-12-141-14/+12
| * | | | Check whether prev_content or prev_sender is set before trying to rollback stateMark Haines2015-12-141-8/+13
| * | | | Do the /sync in parallel accross the rooms like /initialSync doesMark Haines2015-12-111-4/+12
| |/ / /
* | / / Fix typoDaniel Wagner-Hall2015-12-141-1/+1
| |/ / |/| |
* | | Fix typo in sql for full text search on sqlite3Mark Haines2015-12-141-1/+1
* | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-124-7/+10
|\| |
| * | Missing yieldMark Haines2015-12-101-1/+1
| * | Add caches for whether a room has been forgotten by a userMark Haines2015-12-102-5/+8
| * | Mark the version as a -rc1 release candidate v0.12.0-rc1Mark Haines2015-12-101-1/+1
| * | Bump synapse version to v0.12.0Mark Haines2015-12-091-1/+1
| |/
* | Merge pull request #435 from matrix-org/erikj/searchErik Johnston2015-12-112-9/+72
|\ \
| * | Include approximate count of search resultsErik Johnston2015-12-112-3/+61
| * | Use more efficient query formErik Johnston2015-12-111-8/+13
| |/
* / Ensure that the event that gets persisted is the one that was signedPaul "LeoNerd" Evans2015-12-101-6/+6
|/
* pep8David Baker2015-12-091-4/+4
* Split out the push rule evaluator into a separate file so it can be more read...David Baker2015-12-092-185/+234
* Allow filter JSON object in the filter query parameter in /syncMark Haines2015-12-091-9/+21
* Merge pull request #430 from matrix-org/daniel/unstableDaniel Wagner-Hall2015-12-095-85/+80
|\
| * Actually host r0 and unstable prefixesDaniel Wagner-Hall2015-12-085-85/+80
* | Merge pull request #405 from matrix-org/erikj/search-tsErik Johnston2015-12-081-6/+4
|\ \ | |/ |/|
| * Change the result tict to be a listErik Johnston2015-12-011-6/+4
* | Track the time spent in the database per request.Mark Haines2015-12-075-4/+38
* | Merge pull request #423 from matrix-org/markjh/archived_flagMark Haines2015-12-072-6/+10
|\ \
| * | Only include the archived rooms if a include_leave flag in set in the filterMark Haines2015-12-042-6/+10
* | | Merge remote-tracking branch 'origin/master' into developMark Haines2015-12-071-1/+1
|\ \ \
| * \ \ Merge branch 'erikj/perspective_limiter' into release-v0.11.1Erik Johnston2015-11-202-22/+21
| |\ \ \
| * | | | Bump changes and versionErik Johnston2015-11-201-1/+1
* | | | | also do more structured loggingDavid Baker2015-12-071-0/+1
* | | | | pep8David Baker2015-12-071-0/+1
* | | | | Add logging to pushers API to log the body of the requestDavid Baker2015-12-071-0/+4
* | | | | Merge pull request #427 from matrix-org/markjh/log_contextMark Haines2015-12-071-16/+24
|\ \ \ \ \
| * | | | | Add a setter for the current log context.Mark Haines2015-12-071-16/+24
| | |_|/ / | |/| | |
* | | | | Take object not boolDaniel Wagner-Hall2015-12-071-0/+5
* | | | | Merge pull request #422 from matrix-org/markjh/schemaMark Haines2015-12-045-24/+37
|\ \ \ \ \
| * | | | | Bump schema version.Mark Haines2015-12-045-24/+37
| |/ / / /
* / / / / Add metrics to track the cpu on the main thread consumed by each type of requestMark Haines2015-12-041-0/+17
|/ / / /
* | | | Merge pull request #420 from matrix-org/markjh/resource_usageMark Haines2015-12-044-11/+91
|\ \ \ \
| * | | | Add comments to explain why we are hardcoding RUSAGE_THREADMark Haines2015-12-041-0/+8
| * | | | Fix warningsMark Haines2015-12-042-3/+13
| * | | | Track the cpu used in the main thread by each logging contextMark Haines2015-12-033-10/+72
* | | | | Merge pull request #419 from matrix-org/markjh/reuse_captcha_clientMark Haines2015-12-031-4/+2
|\ \ \ \ \
| * | | | | Reuse the captcha client rather than creating a new one for each requestMark Haines2015-12-031-4/+2
| |/ / / /
* / / / / Flatten devices into a dict, not a listDaniel Wagner-Hall2015-12-031-4/+3
|/ / / /
* | | | Merge pull request #414 from matrix-org/erikj/if_not_existsErik Johnston2015-12-031-1/+1
|\ \ \ \
| * | | | Older versions of SQLite don't like IF NOT EXISTS in virtual tablesErik Johnston2015-12-021-1/+1
* | | | | Merge pull request #415 from matrix-org/daniel/endpointsDaniel Wagner-Hall2015-12-036-35/+11
|\ \ \ \ \
| * | | | | Update endpoints to reflect current specDaniel Wagner-Hall2015-12-026-35/+11
* | | | | | Merge pull request #418 from matrix-org/daniel/whoisDaniel Wagner-Hall2015-12-032-18/+12
|\ \ \ \ \ \
| * | | | | | Fix implementation of /admin/whoisDaniel Wagner-Hall2015-12-022-18/+12
| |/ / / / /
* | | | | | Just replace the table definition with the one from full_schema 16David Baker2015-12-021-11/+10
* | | | | | Fix schema delta 15 on postgres in the very unlikley event that anyone upgrad...David Baker2015-12-021-1/+1
* | | | | | Make state updates in the C+S API idempotentMark Haines2015-12-021-0/+12
|/ / / / /
* | | | | Merge pull request #412 from matrix-org/erikj/searchErik Johnston2015-12-021-11/+36
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Throw if unrecognized DB typeErik Johnston2015-12-021-1/+4
| * | | | Fix so highlight matching works againErik Johnston2015-12-021-8/+13
| * | | | Remove deuplication. Add comment about regex.Erik Johnston2015-12-021-21/+11
| * | | | Search: Add prefix matching supportErik Johnston2015-12-021-5/+32
* | | | | Merge pull request #410 from matrix-org/markjh/edu_frequencyMark Haines2015-12-022-5/+15
|\ \ \ \ \
| * | | | | Use the context returned by _handle_new_eventMark Haines2015-12-021-4/+1
| * | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-021-1/+1
| |\ \ \ \ \
| * | | | | | Add commentsMark Haines2015-12-022-0/+6
| * | | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-029-56/+91
| |\ \ \ \ \ \
| * | | | | | | Only fire user_joined_room if the membership has changedMark Haines2015-12-011-3/+8
| * | | | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-0142-235/+835
| |\ \ \ \ \ \ \
| * | | | | | | | Only fire user_joined_room on the distributor if the user has actually joined...Mark Haines2015-12-011-4/+6
* | | | | | | | | Merge pull request #413 from matrix-org/markjh/reuse_http_clientMark Haines2015-12-023-18/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reuse a single http client, rather than creating new onesMark Haines2015-12-023-18/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #411 from matrix-org/default_dont_notifyDavid Baker2015-12-021-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Change the m.room.message rule to be disabled by default so we only notify fo...David Baker2015-12-021-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Fix typo in collect_presencelike_dataMark Haines2015-12-021-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #409 from MadsRC/developErik Johnston2015-12-021-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Added a single line to explain what the server_name is used forMads R. Christensen2015-12-021-0/+1
* | | | | | | | Merge pull request #408 from matrix-org/markjh/distributor_facadeMark Haines2015-12-027-53/+78
|\ \ \ \ \ \ \ \
| * | | | | | | | Wrap calls to distributor.fire in appropriately named functions so that stati...Mark Haines2015-12-017-53/+78
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #406 from matrix-org/erikj/searchErik Johnston2015-12-021-3/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Search: Don't disregard grouping info in pagination tokensErik Johnston2015-12-011-3/+12
* | | | | | | Add API for setting account_data globaly or on a per room basisMark Haines2015-12-0111-25/+476
* | | | | | | Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0126-115/+130
|/ / / / / /
* | | | | | Merge pull request #404 from matrix-org/markjh/trivial_renameMark Haines2015-12-012-2/+2
|\ \ \ \ \ \
| * | | | | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ...Mark Haines2015-12-012-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #402 from matrix-org/markjh/event_formattingMark Haines2015-12-011-9/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-27 01:31:42 +0000