summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-066-142/+60
|\
| * 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
| |/
* | 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
|\|
| * 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
| |\
| | * 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
| * | Added info abou Martin Giess' auto-deployment process with vagrant/ansibleOddvar Lovaas2015-12-141-0/+4
* | | 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
|\ \ \ | | |/ | |/|
| * | 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
| |/ /
* | | 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
|\| |
| * | 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
* | | 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
|\| |
| * | 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
| |\ \
| | * | 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
| * | | | Merge pull request #449 from matrix-org/daniel/3pidDaniel Wagner-Hall2015-12-181-1/+31
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add display_name to 3pid invite in m.room.member invitesDaniel Wagner-Hall2015-12-171-1/+31
| * | | | Merge pull request #448 from matrix-org/daniel/3pidDaniel Wagner-Hall2015-12-172-2/+13
| |\| | | | | |/ / | |/| |
| | * | Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-172-2/+13
| |/ /
| * | Merge pull request #447 from matrix-org/rav/fix_search_paginationMark Haines2015-12-171-2/+4
| |\ \
| | * | Fix 500 error when back-paginating search resultsRichard van der Hoff2015-12-171-2/+4
| |/ /
| * | Fix typoDaniel Wagner-Hall2015-12-161-1/+1
| * | Merge pull request #446 from matrix-org/daniel/invitemetadataDaniel Wagner-Hall2015-12-161-7/+60
| |\ \
| | * | 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-164-5/+21
| |\ \ \
| | * \ \ Merge pull request #445 from matrix-org/markjh/rebind_threepidMark Haines2015-12-151-1/+1
| | |\ \ \
| | | * | | 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-142-1/+12
| | * | | Merge pull request #444 from matrix-org/markjh/presence_raceMark Haines2015-12-141-3/+8
| | |\ \ \
| | | * | | Fix a race between started/stopped streamMark Haines2015-12-141-3/+8
| | |/ / /
| * | | | Merge pull request #443 from matrix-org/markjh/commentaryMark Haines2015-12-141-2/+15
| |\ \ \ \
| | * | | | 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
| | * | | | Merge pull request #442 from matrix-org/markjh/missing_prev_contentMark Haines2015-12-141-3/+6
| | |\ \ \ \
| | | * | | | 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
| | |/ / / /
| | * | | | Merge pull request #437 from matrix-org/markjh/parallel_syncMark Haines2015-12-141-4/+12
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Do the /sync in parallel accross the rooms like /initialSync doesMark Haines2015-12-111-4/+12
| | |/ / /
| * | | | Merge pull request #439 from matrix-org/daniel/typoDaniel Wagner-Hall2015-12-141-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix typoDaniel Wagner-Hall2015-12-141-1/+1
| |/ / /
| * | | Merge pull request #438 from matrix-org/markjh/fix_search_sqlMark Haines2015-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-126-12/+47
| |\| |
| | * | Merge pull request #436 from matrix-org/markjh/pip_instructionsMark Haines2015-12-111-5/+3
| | |\ \
| | | * | SYN-90: We don't need --proccess-dependency-linksMark Haines2015-12-111-5/+3
| | |/ /
| | * | Merge pull request #434 from matrix-org/markjh/forget_roomsMark Haines2015-12-103-6/+9
| | |\ \
| | | * | 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-102-3/+3
| | * | Update release dateMark Haines2015-12-101-1/+1
| | * | Bump synapse version to v0.12.0Mark Haines2015-12-091-1/+1
| | * | Add to changelogMark Haines2015-12-091-7/+7
| | * | Changelog for v0.12.0Mark Haines2015-12-091-0/+34
| * | | 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
| * | | | Merge pull request #433 from matrix-org/paul/tiny-fixesPaul Evans2015-12-111-6/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Ensure that the event that gets persisted is the one that was signedPaul "LeoNerd" Evans2015-12-101-6/+6
| | * | | Merge branch 'develop' into paul/tiny-fixesPaul "LeoNerd" Evans2015-12-1095-903/+2496
| | |\| |
| * | | | throwaway 1-liner for generating password hashesMatthew Hodgson2015-12-101-0/+1
| | |/ / | |/| |
* | | | 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 #432 from matrix-org/pushrules_refactorDavid Baker2015-12-092-185/+234
|\ \ \
| * | | 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
|/ / /
* | | Merge pull request #431 from matrix-org/markjh/filter_inlineMark Haines2015-12-091-9/+21
|\ \ \
| * | | 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
* | | | Merge pull request #429 from matrix-org/markjh/db_countersMark Haines2015-12-085-4/+38
|\ \ \ \
| * | | | 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-074-2/+30
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #426 from OlegGirko/fix_mock_importMark Haines2015-12-071-1/+1
| |\ \ \ \
| | * | | | Fix mock import in tests.Oleg Girko2015-12-061-1/+1
| |/ / / /
| * | | | Merge branch 'release-v0.11.1' of github.com:matrix-org/synapse v0.11.1Erik Johnston2015-11-2022-114/+225
| |\ \ \ \
| | * \ \ \ Merge branch 'erikj/perspective_limiter' into release-v0.11.1Erik Johnston2015-11-202-22/+21
| | |\ \ \ \
| | * | | | | Mention report_stats in upgrade.rstErik Johnston2015-11-201-0/+13
| | * | | | | Fix englishErik Johnston2015-11-201-2/+2
| | * | | | | Bump changes and versionErik Johnston2015-11-202-1/+16
* | | | | | | Merge pull request #428 from matrix-org/pusher_api_logDavid Baker2015-12-071-0/+6
|\ \ \ \ \ \ \
| * | | | | | | 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
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #424 from matrix-org/daniel/pushdictificationDaniel Wagner-Hall2015-12-071-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Take object not boolDaniel Wagner-Hall2015-12-071-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #425 from MadsRC/developMatthew Hodgson2015-12-051-2/+15
|\ \ \ \ \ \ \
| * | | | | | | Added installation instructions for postgres on CentOS 7Mads R. Christensen2015-12-051-2/+15
* | | | | | | | Merge pull request #422 from matrix-org/markjh/schemaMark Haines2015-12-045-24/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump schema version.Mark Haines2015-12-045-24/+37
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #421 from matrix-org/markjh/resource_metricsMark Haines2015-12-041-0/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | Merge pull request #417 from matrix-org/fix_db_v15_postgresDavid Baker2015-12-021-12/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|/ / / / / / / / /
* | | | | | | | | Merge pull request #416 from matrix-org/markjh/idempotent_stateMark Haines2015-12-021-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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-0211-69/+109
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Only fire user_joined_room if the membership has changedMark Haines2015-12-011-3/+8
| * | | | | | | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-0145-243/+845
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-022-0/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Added a single line to explain what the server_name is used forMads R. Christensen2015-12-021-0/+1
| * | | | | | | | | Added a few lines to better explain how to run Synapse on a FQDN that is not ...Mads R. Christensen2015-12-021-0/+4
* | | | | | | | | | Merge pull request #408 from matrix-org/markjh/distributor_facadeMark Haines2015-12-027-53/+78
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into markjh/distributor_facadeMark Haines2015-12-011-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
* | | | | | | | | | | various fixes - thanks to Mark White for pointing out you need to run synapse...Matthew Hodgson2015-12-011-12/+13
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix definitions scriptMark Haines2015-12-011-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #392 from matrix-org/markjh/client_configMark Haines2015-12-0111-25/+476
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add API for setting account_data globaly or on a per room basisMark Haines2015-12-0111-25/+476
* | | | | | | | | | Merge pull request #407 from MadsRC/developMatthew Hodgson2015-12-011-3/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Added --report-status=yes|no as Synapse won't generate the config without itMads R. Christensen2015-12-011-2/+3
| * | | | | | | | Added libffi-devel in CentOS 7 installation requirements and fixed indentatio...Mads R. Christensen2015-12-011-2/+2
* | | | | | | | | Merge pull request #400 from matrix-org/daniel/versioningDaniel Wagner-Hall2015-12-0127-117/+133
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0127-117/+133
|/ / / / / / / /
* | | | | | | | Merge pull request #404 from matrix-org/markjh/trivial_renameMark Haines2015-12-013-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | rename the method in the tests as wellMark Haines2015-12-011-3/+3
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Only add the user_id if the sender is presentMark Haines2015-12-011-1/+3
| * | | | | | | | Copy rather than move the fields to shuffle between a v1 and a v2 event.Mark Haines2015-11-301-9/+5
* | | | | | | | | Merge pull request #403 from matrix-org/erikj/search-tsErik Johnston2015-12-014-84/+220
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Tidy up a bitErik Johnston2015-12-011-8/+9
| * | | | | | | Allow paginating search ordered by recentsErik Johnston2015-11-304-84/+219
* | | | | | | | Add options to definitions.py to fetch referrers and to output dotMark Haines2015-12-011-6/+39
* | | | | | | | Merge pull request #398 from matrix-org/markjh/jenkins_postgresMark Haines2015-12-011-1/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Write the tap results for each database to different files when running sytestMark Haines2015-12-011-2/+2
| * | | | | | | | Set the port when running sytest under postgresqlMark Haines2015-12-011-1/+1
| * | | | | | | | Use a PORT_BASE environment variable to configure the ports that sytest usesMark Haines2015-12-011-12/+4
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-05 05:42:23 +0000