summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Update readme to reflect change in signing key nameErik Johnston2016-01-061-2/+1
|
* Merge pull request #463 from matrix-org/daniel/hashtagnofilterDaniel Wagner-Hall2016-01-055-21/+5
|\ | | | | | | | | | | | | | | | | | | | | Skip, rather than erroring, invalid guest requests Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour.
| * Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-055-21/+5
|/ | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour.
* Merge pull request #462 from matrix-org/daniel/guestupgradeDaniel Wagner-Hall2016-01-0511-40/+93
|\ | | | | Allow guests to upgrade their accounts
| * 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 thumbnails rather than smaller when method=crop
| * 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 changed
| * 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
|\ | | | | Support inviting 3pids in /createRoom
| * 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
| |
| * Update CHANGES 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 r0
| | * Expose /login under r0Richard van der Hoff2016-01-021-1/+1
| |/ | | | | | | The spec says /login should be available at r0 and 'unstable', so make it so.
| * 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 a cache for initialSync responses that expires after 5 minutes
| | * 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 check Needs matrix-org/sytest#125 to land first
| | * Missing yield on guest access auth checkMark Haines2015-12-231-1/+1
| |/ | | | | | | Needs matrix-org/sytest#125 to land first
| * Merge pull request #455 from matrix-org/markjh/guest_accessMark Haines2015-12-224-50/+144
| |\ | | | | | | Allow guest access to /sync
| | * 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
| | |\ | | |/ | |/| | | | | | | Conflicts: synapse/api/filtering.py
| * | Merge pull request #454 from matrix-org/markjh/room_filteringMark Haines2015-12-222-34/+35
| |\ \ | | | | | | | | | | | | | | | | Add top level filters for filtering by room id Documented by matrix-org/matrix-doc#246
| | * | Add top level filters for filtering by room idMark Haines2015-12-222-34/+35
| |/ / | | | | | | | | | Documented by matrix-org/matrix-doc#246
| | * 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 /publicRooms Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121
| | * | Return room avatar URLs in /publicRoomsDaniel Wagner-Hall2015-12-211-2/+21
| |/ / | | | | | | | | | | | | Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121
| | * 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 IDs
| | * Actually look up required remote server key IDsPaul "LeoNerd" Evans2015-12-181-1/+3
| |/ | | | | | | | | | | set.union() is a side-effect-free function that returns the union of two sets. This clearly wanted .update(), which is the side-effecting mutator version.
| * Merge pull request #451 from matrix-org/markjh/branch_coverageMark Haines2015-12-182-6/+18
| |\ | | | | | | Generate code coverage report when running jenkins.sh
| | * 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
| |\ | | | | | | Matthew/no identicons
| | * fix indentation levelMatthew Hodgson2015-12-171-3/+3
| | |
| | * stop generating default identicons. reverts most of ↵Matthew Hodgson2015-12-171-19/+3
| | | | | | | | | | | | 582019f870adbc4a8a8a9ef97b527e0fead77761 and solves vector-web/vector-im#346
| * | 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 invites
| | * | 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 invites
| | * Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-172-2/+13
| |/ | | | | | | We're not meant to leak that into the graph
| * Merge pull request #447 from matrix-org/rav/fix_search_paginationMark Haines2015-12-171-2/+4
| |\ | | | | | | Fix 500 error when back-paginating search results
| | * Fix 500 error when back-paginating search resultsRichard van der Hoff2015-12-171-2/+4
| |/ | | | | | | | | We were mistakenly adding pagination clauses to the count query, which then failed because the count query doesn't join to the events table.
| * 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 context This allows it to form richer emails
| | * Give the IS a bunch more 3pid invite contextDaniel Wagner-Hall2015-12-161-7/+60
| |/ | | | | | | This allows it to form richer emails
| * Merge pull request #440 from matrix-org/daniel/iseMark Haines2015-12-161-2/+5
| |\ | | | | | | Include errcode on Internal Server Error
| | * 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 to
| | | * | 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 stream
| | | * | 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
| |\ \ \ | | | | | | | | | | Add commentary for fix in PR #442
| | * | | 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
| | | * | Skip events that where the body, name or topic isn't a string when back ↵Mark Haines2015-12-141-0/+5
| | | | | | | | | | | | | | | | | | | | populating the FTS index
| | * | | Merge pull request #442 from matrix-org/markjh/missing_prev_contentMark Haines2015-12-141-3/+6
| | |\ \ \ | | | | | | | | | | | | Check whether prev_content or prev_sender is set …
| | | * | | 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 across the rooms like /initialSync does
| | | * | 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 typo
| | * | 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 sqlite3
| | * | 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-links
| | | * SYN-90: We don't need --proccess-dependency-linksMark Haines2015-12-111-5/+3
| | |/ | | | | | | | | | When installing synapse since all its dependencies are on PyPI
| | * Merge pull request #434 from matrix-org/markjh/forget_roomsMark Haines2015-12-103-6/+9
| | |\ | | | | | | | | Add caches for whether a room has been forgotten by a user
| | | * 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 results
| | * | 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 signed
| | * | 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
| | |/ | |/|
| * | Merge pull request #432 from matrix-org/pushrules_refactorDavid Baker2015-12-092-185/+234
| |\ \ | | | | | | | | Split out the push rule evaluator into a separate file
| | * | pep8David Baker2015-12-091-4/+4
| | | |
| | * | Split out the push rule evaluator into a separate file so it can be more ↵David Baker2015-12-092-185/+234
| |/ / | | | | | | | | | readily reused. Should be functionally identical.
| * | 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 /sync Documented by matrix-org/matrix-doc#224
| | * | Allow filter JSON object in the filter query parameter in /syncMark Haines2015-12-091-9/+21
| |/ / | | | | | | | | | Documented by matrix-org/matrix-doc#224
| * | Merge pull request #430 from matrix-org/daniel/unstableDaniel Wagner-Hall2015-12-095-85/+80
| |\ \ | | | | | | | | Merge pull request #430 from matrix-org/daniel/unstable
| | * | 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 dict to be a list in /search response
| | * | 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.
| | * | | Track the time spent in the database per request.Mark Haines2015-12-075-4/+38
| |/ / / | | | | | | | | | | | | and track the number of transactions that request started.
| * | | 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…
| | * | | 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 #428 from matrix-org/pusher_api_logDavid Baker2015-12-071-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Add logging to pushers API to log the body of the request
| | * | | | | 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.
| | * | | | | Add a setter for the current log context.Mark Haines2015-12-071-16/+24
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Move the resource tracking inside that setter so that it is easier to make sure that the resource tracking isn't double counting the resource usage.
| * | | | | Merge pull request #424 from matrix-org/daniel/pushdictificationDaniel Wagner-Hall2015-12-071-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take object not bool Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212
| | * | | | | Take object not boolDaniel Wagner-Hall2015-12-071-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212
| * | | | | Merge pull request #425 from MadsRC/developMatthew Hodgson2015-12-051-2/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | Added installation instructions for postgres on CentOS 7
| | * | | | | 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.
| | * | | | | | Bump schema version.Mark Haines2015-12-045-24/+37
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | As we released version 26 in v0.11.1
| * | | | | | 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…
| | * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Track the cpu used in the main thread by each logging context
| | * | | | | 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 request
| | * | | | | | 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 tables
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Merge pull request #415 from matrix-org/daniel/endpoints
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge pull request #418 from matrix-org/daniel/whois
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix schema delta 15 on postgres
| | * | | | | | | 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 ↵David Baker2015-12-021-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | upgrades to 15...
| * | | | | | | Merge pull request #416 from matrix-org/markjh/idempotent_stateMark Haines2015-12-021-0/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Make state updates in the C+S API idempotent
| | * | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Search: Add prefix matching support
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Only fire user_joined_room if the user has actually joined.
| | * | | | | | 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
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py
| | * | | | | | | | 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 ↵Mark Haines2015-12-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | joined the room
| * | | | | | | | | | 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 ones
| | * | | | | | | | | | 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
| | * | | | | | | | | Change the m.room.message rule to be disabled by default so we only notify ↵David Baker2015-12-021-0/+1
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | for 1:1 rooms / highlights out-of-the-box
| * | | | | | | | | Fix typo in collect_presencelike_dataMark Haines2015-12-021-1/+1
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #409 from MadsRC/developErik Johnston2015-12-022-0/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | Develop
| | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | part of the UserID
| * | | | | | | | Merge pull request #408 from matrix-org/markjh/distributor_facadeMark Haines2015-12-027-53/+78
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Wrap calls to distributor.fire in appropriately named functions
| | * \ \ \ \ \ \ \ Merge branch 'develop' into markjh/distributor_facadeMark Haines2015-12-011-1/+1
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Wrap calls to distributor.fire in appropriately named functions so that ↵Mark Haines2015-12-017-53/+78
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | static analysis can work out want is calling what
| * | | | | | | | | Merge pull request #406 from matrix-org/erikj/searchErik Johnston2015-12-021-3/+12
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | Search: Don't disregard grouping info in pagination tokens
| | * | | | | | | | 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 ↵Matthew Hodgson2015-12-011-12/+13
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | synapse before you try to register a new user
| * | | | | | | | 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 per user account data at the top level or room level.
| | * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | Develop
| | * | | | | | 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 ↵Mads R. Christensen2015-12-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indentation of yum groupinstall. Signed-off-by: Mads Robin Christensen <mads@v42.dk>
| * | | | | | | Merge pull request #400 from matrix-org/daniel/versioningDaniel Wagner-Hall2015-12-0127-117/+133
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Merge pull request # 400 from matrix-org/daniel/versioning
| | * | | | | | 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 presence_handler.send_invite
| | * | | | | | 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
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | to distinguish it from normal invites
| * | | | | | Merge pull request #402 from matrix-org/markjh/event_formattingMark Haines2015-12-011-9/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Copy rather than move the fields to shuffle between a v1 and a v2 event.
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make all v1 APIs compatible with v2 clients. While still allowing v1 clients to access the fields. This makes the documentation easier since we can just document the v2 format and explain that some of the fields, in some of the APIs are duplicated for backwards compatibility, rather than having to document two separate event formats.
| * | | | | | | Merge pull request #403 from matrix-org/erikj/search-tsErik Johnston2015-12-014-84/+220
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | Allow paginating search ordered by recents
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Run sytest against postgresql
| | * | | | | | 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
| | | | | | | |
| | * | | | | | Run sytest against postgresql if appropriate databases exist for it to run ↵Mark Haines2015-11-261-0/+33
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | against
| * | | | | | Merge pull request #399 from matrix-org/erikj/searchErik Johnston2015-12-012-22/+120
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / Return words to highlight in search results
| | * / / / Return words to highlight in search resultsErik Johnston2015-11-272-22/+120
| |/ / / /
| * | | | Merge pull request #397 from matrix-org/erikj/redaction_inequalityErik Johnston2015-11-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | Allow user to redact with an equal power
| | * | | | Allow user to redact with an equal powerErik Johnston2015-11-261-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Users only need their power level to be equal to the redact level for them to be allowed to redact events.
| * | | | Fix SQL for postgres againDaniel Wagner-Hall2015-11-231-1/+1
| | | | |
| * | | | Fix SQL for postgresDaniel Wagner-Hall2015-11-231-1/+1
| | | | |
| * | | | Remove size specifier for database columnDaniel Wagner-Hall2015-11-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres doesn't support them like this. We don't have a bool type in common between postgres and sqlite.
| * | | | Merge pull request #375 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-231-10/+15
| |\ \ \ \ | | | | | | | | | | | | Clean up room initialSync for guest users
| | * | | | Clean up room initialSync for guest usersDaniel Wagner-Hall2015-11-131-10/+15
| | | | | |
| * | | | | Merge pull request #396 from MadsRC/developMatthew Hodgson2015-11-212-0/+11
| |\ \ \ \ \ | | | |/ / / | | |/| | | CentOS 7 dep instructions from MadsRC
| | * | | | Added myself to AUTHORS.rstMads R. Christensen2015-11-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mads Robin Christensen <mads@v42.dk>
| | * | | | Added prerequisite instructions for CentOS 7Mads R. Christensen2015-11-201-0/+8
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Mads Robin Christensen <mads@v42.dk>
| * | | | Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-206-5/+118
| |\ \ \ \ | | | | | | | | | | | | Allow users to forget rooms
| | * \ \ \ Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into ↵Daniel Wagner-Hall2015-11-1918-87/+180
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | daniel/forgetrooms
| | | * \ \ \ Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-1918-87/+180
| | | |\ \ \ \
| | * | | | | | Ignore forgotten rooms in v2 syncDaniel Wagner-Hall2015-11-191-1/+1
| | |/ / / / /
| | * | | | | Simplify codeDaniel Wagner-Hall2015-11-192-8/+6
| | | | | | |
| | * | | | | Apply forgetting properly to historical eventsDaniel Wagner-Hall2015-11-182-3/+41
| | | | | | |
| | * | | | | Allow users to forget roomsDaniel Wagner-Hall2015-11-176-4/+81
| | | | | | |
| * | | | | | Merge pull request #395 from matrix-org/erikj/perspective_limiterErik Johnston2015-11-202-22/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't limit connections to perspective servers
* | | | | | | | Added info abou Martin Giess' auto-deployment process with vagrant/ansibleOddvar Lovaas2015-12-141-0/+4
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #426 from OlegGirko/fix_mock_importMark Haines2015-12-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix mock import in tests.
| * | | | | | | Fix mock import in tests.Oleg Girko2015-12-061-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, one test imports Mock class from mock.mock rather than from mock. This change fixes this error. Signed-off-by: Oleg Girko <ol@infoserver.lv>
* | | | | | | 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
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix typoErik Johnston2015-11-202-3/+3
| | | | | | | |
| | * | | | | | Don't limit connections to perspective serversErik 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 #394 from matrix-org/erikj/searchErik Johnston2015-11-201-1/+54
| |\ \ \ \ \ | | | | | | | | | | | | | | Add options for including state in search results
| | * | | | | Add option to include the current room stateErik Johnston2015-11-201-0/+24
| | | | | | |
| | * | | | | Optionally include historic profile infoErik Johnston2015-11-201-1/+30
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #389 from matrix-org/rav/flatten_sync_responseRichard van der Hoff2015-11-202-27/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | v2 sync: Get rid of the event_map, and rename the keys of the rooms obj
| | * | | | | Merge branch 'develop' into rav/flatten_sync_responsePaul "LeoNerd" Evans2015-11-1917-86/+162
| | |\| | | |
| | * | | | | Put back the 'state.events' subobjectRichard van der Hoff2015-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're keeping 'events', in case we decide to add more keys later.
| | * | | | | v2 /sync: Rename the keys of the 'rooms' object to match member statesRichard van der Hoff2015-11-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | joined->join invited->invite archived->leave
| | * | | | | Flatten the /sync response to remove the event_mapRichard van der Hoff2015-11-192-24/+14
| | | | | | |
| * | | | | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flowErik Johnston2015-11-201-1/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove m.login.token from advertised flows.
| | * | | | | | CommentErik Johnston2015-11-201-0/+8
| | | | | | | |
| | * | | | | | Remove m.login.token from advertised flows.Erik Johnston2015-11-191-1/+2
| |/ / / / / / |/| | | | | |
| * | | | | | Merge pull request #393 from matrix-org/erikj/destination_retry_maxErik Johnston2015-11-201-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Use min and not max to set an upper bound on retry interval
| | * | | | | Use min and not max to set an upper bound on retry intervalErik Johnston2015-11-201-2/+2
| |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-11-192-1/+6
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse v0.11.0-r2Erik Johnston2015-11-194-28/+78
|\ \ \ \ \ \
| * | | | | | Bump changes and versionErik Johnston2015-11-192-1/+6
| | | | | | |
| * | | | | | Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2Erik Johnston2015-11-191-11/+44
| |\ \ \ \ \ \
| | | * \ \ \ \ Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_dataMark Haines2015-11-1911-49/+66
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | s/private_user_data/account_data/
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-10-30 21:24:39 +0000