summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Add top level filters for filtering by room idMark Haines2015-12-221-33/+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
|\|
| * 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 accidentally committed debug loggingMark Haines2015-12-211-1/+0
|
* 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 #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
| | |
* | | 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
|/ | | | We're not meant to leak that into the graph
* 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
|
* 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-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
| | * | 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
| * | | 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 results
| * | 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 ↵David Baker2015-12-092-185/+234
| | | | readily reused. Should be functionally identical.
* 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
| |
* | 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-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.
| * | | | | 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.
* | | | | 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 #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
* / / / / 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
| |/ / / / /
* | | | | | 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...
* | | | | | 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-029-56/+91
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0142-235/+835
| |\ \ \ \ \ \ \
| * | | | | | | | 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-021-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Develop
| * | | | | | | 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
| * | | | | | | | 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
| | | | | | |
* | | | | | | 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
| * | | | | | 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.
* | | | | | Tidy up a bitErik Johnston2015-12-011-8/+9
| | | | | |
* | | | | | Allow paginating search ordered by recentsErik Johnston2015-11-304-84/+219
| |/ / / / |/| | | |
* | | | | Return words to highlight in search resultsErik Johnston2015-11-272-22/+120
|/ / / /
* | | | 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 #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-1914-74/+112
| |\ \ \ | | | | | | | | | | | | | | | daniel/forgetrooms
| | * \ \ Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-1914-74/+112
| | |\ \ \
| * | | | | 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
| | | | |
* | | | | Fix typoErik Johnston2015-11-202-3/+3
| | | | |
* | | | | Don't limit connections to perspective serversErik Johnston2015-11-202-22/+21
| |_|_|/ |/| | |
* | | | 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-1915-75/+113
| |\| | |
| * | | | 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-191-1/+1
|\| | | |
| * | | | Bump changes and versionErik Johnston2015-11-191-1/+1
| | | | |
* | | | | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_dataMark Haines2015-11-1911-49/+66
|\ \ \ \ \ | | | | | | | | | | | | s/private_user_data/account_data/
| * | | | | Rename the database tableMark Haines2015-11-181-0/+17
| | | | | |
| * | | | | s/private_user_data/account_data/Mark Haines2015-11-1810-49/+49
| | |_|/ / | |/| | |
* | | | | Take a boolean not a list of lambdasDaniel Wagner-Hall2015-11-192-9/+18
| |/ / / |/| | |
* | | | CommentErik Johnston2015-11-191-0/+2
| | | |
* | | | Split out text for missing config options.Erik Johnston2015-11-181-16/+26
| |/ / |/| | | | | | | | | | | This allows packages to more easily override the default messages to include package specific options.
* | | Bump changelog and versionErik Johnston2015-11-171-1/+1
|/ /
* | Add commentErik Johnston2015-11-171-0/+2
| |
* | Only retry federation requests for a long time for background requestsErik Johnston2015-11-172-7/+20
| |
* | Implement required method 'resumeProducing'Erik Johnston2015-11-171-0/+3
| |
* | Slightly more aggressive retry timers at HTTP levelErik Johnston2015-11-171-2/+3
| |
* | Bump changelog and versionErik Johnston2015-11-171-1/+1
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-177-42/+219
|\ \
| * | Always check guest = true in macaroonsSteven Hammerton2015-11-171-1/+2
| | |
| * | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-1728-284/+1003
| |\ \
| | * | Don't complain if /make_join response lacks 'prev_state' list (SYN-517)Paul "LeoNerd" Evans2015-11-131-0/+6
| | |/
| | * Allow guests to /room/:room_id/{join,leave}Daniel Wagner-Hall2015-11-131-3/+14
| | |
| * | Snakes not camelsSteven Hammerton2015-11-111-5/+5
| | |
| * | Minor review fixesSteven Hammerton2015-11-112-17/+14
| | |
| * | Share more code between macaroon validationSteven Hammerton2015-11-112-57/+17
| | |
| * | Updates to fallback CAS login to do new token loginSteven Hammerton2015-11-061-26/+12
| | |
| * | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-0540-295/+1435
| |\ \
| * | | Allow hs to do CAS login completely and issue the client with a login token ↵Steven Hammerton2015-11-053-5/+218
| | | | | | | | | | | | | | | | that can be redeemed for the usual successful login response
| * | | Add service URL to CAS configSteven Hammerton2015-11-041-0/+3
| | | |
* | | | Bump version and change log v0.11.0-rc2Erik Johnston2015-11-131-1/+1
| |_|/ |/| |
* | | Implementation of state rollback in /syncRichard van der Hoff2015-11-132-4/+69
| | | | | | | | | | | | | | | | | | | | | Implementation of SPEC-254: roll back the state dictionary to how it looked at the start of the timeline. Merged PR https://github.com/matrix-org/synapse/pull/373
* | | Fix a few race conditions in the state calculationRichard van der Hoff2015-11-132-60/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be a bit more careful about how we calculate the state to be returned by /sync. In a few places, it was possible for /sync to return slightly later state than that represented by the next_batch token and the timeline. In particular, the following cases were susceptible: * On a full state sync, for an active room * During a per-room incremental sync with a timeline gap * When the user has just joined a room. (Refactor check_joined_room to make it less magical) Also, use store.get_state_for_events() (and thus the existing stategroups) to calculate the state corresponding to a particular sync position, rather than state_handler.compute_event_context(), which recalculates from first principles (and tends to miss some state). Merged from PR https://github.com/matrix-org/synapse/pull/372
* | | Make handlers.sync return a state dictionary, instead of an event list.Richard van der Hoff2015-11-132-32/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371
* | | Update some commentsRichard van der Hoff2015-11-134-14/+98
| | | | | | | | | | | | | | | | | | | | | Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370.
* | | Merge pull request #369 from matrix-org/daniel/guestnoneventsDaniel Wagner-Hall2015-11-121-3/+17
|\ \ \ | | | | | | | | Return non-room events from guest /events calls
| * | | Return non-room events from guest /events callsDaniel Wagner-Hall2015-11-121-3/+17
| | | |
* | | | Merge pull request #368 from matrix-org/erikj/fix_federation_profileErik Johnston2015-11-123-6/+13
|\ \ \ \ | | | | | | | | | | Fix missing profile data in federation joins
| * | | | Fix missing profile data in federation joinsErik Johnston2015-11-123-6/+13
| |/ / / | | | | | | | | | | | | | | | | There was a regression where we stopped including profile data in initial joins for rooms joined over federation.
* | | | Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_fasterErik Johnston2015-11-121-3/+14
|\ \ \ \ | |/ / / |/| | | Use a (hopefully) more efficient SQL query for doing recency based room search
| * | | Trailing whitespaceErik Johnston2015-11-121-1/+1
| | | |
| * | | Expand commentErik Johnston2015-11-121-0/+6
| | | |
| * | | CommentErik Johnston2015-11-121-0/+2
| | | |
| * | | Fix SQL syntaxErik Johnston2015-11-121-2/+3
| | | |
| * | | Use a (hopefully) more efficient SQL query for doing recency based room searchErik Johnston2015-11-121-4/+6
| | | |
* | | | Fix an issue with ignoring power_level changes on divergent graphsRichard van der Hoff2015-11-121-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to m.room.power_levels events are supposed to be handled at a high priority; however a typo meant that the relevant bit of code was never executed, so they were handled just like any other state change - which meant that a bad person could cause room state changes by forking the graph from a point in history when they were allowed to do so.
* | | | Merge pull request #367 from matrix-org/daniel/readafterleaveDaniel Wagner-Hall2015-11-121-10/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge pull request #367 from matrix-org/daniel/readafterleave Tweak guest access permissions
| * | | | Tweak guest access permissionsDaniel Wagner-Hall2015-11-121-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow world_readable rooms to be read by guests who have joined and left * Allow regular users to access world_readable rooms
* | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-122-24/+34
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync
| * | | | Allow guest access to room initialSyncDaniel Wagner-Hall2015-11-112-24/+34
| | | | |
* | | | | Fix bug where assumed dict was namedtupleErik Johnston2015-11-121-1/+1
| |/ / / |/| | |
* | | | Allow guests to set their display namesDaniel Wagner-Hall2015-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | Depends: https://github.com/matrix-org/synapse/pull/363 Tests in https://github.com/matrix-org/sytest/pull/66
* | | | Consider joined guest users as joined usersDaniel Wagner-Hall2015-11-121-12/+21
| | | | | | | | | | | | | | | | | | | | Otherwise they're inconveniently allowed to write events to the room but not to read them from the room.
* | | | Fix race creating directoriesDaniel Wagner-Hall2015-11-121-1/+5
| | | |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-112-5/+11
|\ \ \ \
| * \ \ \ Merge pull request #361 from matrix-org/daniel/guestcontextErik Johnston2015-11-112-5/+11
| |\ \ \ \ | | | | | | | | | | | | Allow guests to access room context API
| | * | | | Allow guests to access room context APIDaniel Wagner-Hall2015-11-112-5/+11
| | |/ / /
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-1119-134/+594
|\| | | |
| * | | | Merge pull request #359 from matrix-org/markjh/incremental_indexingErik Johnston2015-11-116-77/+413
| |\ \ \ \ | | |/ / / | |/| | | Incremental background updates for db indexes
| | * | | Fix param style to work on both sqlite and postgresMark Haines2015-11-111-2/+6
| | | | |
| | * | | Fix the background updateMark Haines2015-11-113-17/+19
| | | | |
| | * | | Use a background task to update databases to use the full text searchMark Haines2015-11-102-80/+28
| | | | |
| | * | | Run the background updates when starting synapse.Mark Haines2015-11-104-10/+67
| | | | |
| | * | | Add background update task for reindexing event searchMark Haines2015-11-091-2/+96
| | | | |
| | * | | Add storage module for tracking background updates.Mark Haines2015-11-092-0/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The progress for each background update is stored as a JSON blob in the database. Each background update is broken up into separate batches. The batch size is automatically tuned to try avoid blocking single threaded databases for too long.
| * | | | Return world_readable and guest_can_join in /publicRoomsDaniel Wagner-Hall2015-11-103-29/+69
| | | | |
| * | | | Allow guest users to join and message roomsDaniel Wagner-Hall2015-11-107-12/+92
| | | | |
| * | | | Merge pull request #356 from matrix-org/daniel/3pidyetagainDaniel Wagner-Hall2015-11-102-7/+4
| |\ \ \ \ | | | | | | | | | | | | Get display name from identity server, not client
| | * | | | Get display name from identity server, not clientDaniel Wagner-Hall2015-11-092-7/+4
| | |/ / /
| * | | | Don't fiddle with results returned by event sourcesRichard van der Hoff2015-11-091-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overwriting hashes returned by other methods is poor form. Fixes: SYN-516
| * | | | Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | ... merely because I was trying to figure out how it worked, and couldn't.
| * | | | Merge branch 'develop' into markjh/SYN-513Mark Haines2015-11-091-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/tags.py
| | * | | | fix comedy important missing comma breaking recent-ordered FTS on sqliteMatthew Hodgson2015-11-081-1/+1
| | | | | |
| | * | | | add a key existence check to tags_by_room to avoid /events 500'ing when ↵Matthew Hodgson2015-11-061-1/+2
| | |/ / / | | | | | | | | | | | | | | | testing against vector
| * / / / SYN-513: Include updates for rooms that have had all their tags deletedMark Haines2015-11-092-2/+2
| |/ / /
| * | / Remove accidentally added ID columnDaniel Wagner-Hall2015-11-061-1/+0
| | |/ | |/|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-0513-187/+245
|\| |
| * | Merge pull request #350 from matrix-org/erikj/searchErik Johnston2015-11-053-36/+288
| |\ \ | | | | | | | | Implement pagination, order by and groups in search
| | * | Be explicit about what we're doingErik Johnston2015-11-051-1/+1
| | | |
| | * | Remove redundant testErik Johnston2015-11-051-1/+0
| | | |
| | * | Increment by one, not fiveErik Johnston2015-11-051-1/+1
| | | |
| * | | Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-0510-180/+230
| | | |
| * | | Merge pull request #340 from matrix-org/erikj/server_retriesErik Johnston2015-11-052-4/+13
| |\ \ \ | | | | | | | | | | Retry dead servers a lot less often
| | * | | Retry dead servers a lot less oftenErik Johnston2015-11-022-4/+13
| | | | |
* | | | | Bump changelog and version numberErik Johnston2015-11-051-1/+1
| |_|/ / |/| | |
* | | | COMMENTSErik Johnston2015-11-051-4/+26
| | | |
* | | | Error handlingErik Johnston2015-11-051-1/+8
| | | |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-11-0555-330/+1126
|\| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2015-11-0543-329/+434
| |\ \ \
| | * | | Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-0516-56/+210
| | | | | | | | | | | | | | | | | | | | Squash-merge of PR #345 from daniel/anonymousevents
| | * | | Merge pull request #347 from matrix-org/markjh/check_filterMark Haines2015-11-051-18/+2
| | |\ \ \ | | | |_|/ | | |/| | Remove fields that are both unspecified and unused from the filter checks
| | | * | Remove fields that are both unspecified and unused from the filter checks, ↵Mark Haines2015-11-041-18/+2
| | | | | | | | | | | | | | | | | | | | check the right top level definitions in the filter
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-11-048-114/+6
| | |\ \ \
| | | * | | Merge branch 'develop' into daniel/removesomeliesMark Haines2015-11-0418-160/+577
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/notifier.py
| | | | * | Remove the LockManager class because it wasn't being usedMark Haines2015-11-043-81/+0
| | | | | |
| | | * | | Remove more unused parametersDaniel Wagner-Hall2015-11-023-4/+1
| | | | | |
| | | * | | Remove unused arguments and codeDaniel Wagner-Hall2015-11-023-29/+5
| | | | |/ | | | |/|
| | * | | Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-0427-149/+224
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices.
| * | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-11-0512-1/+692
| |\ \ \ | | |/ / | |/| |
| | * | Use correct service urlErik Johnston2015-10-261-3/+1
| | | |
| | * | Add login fallbackErik Johnston2015-10-265-0/+280
| | | |
| | * | Move static folder into synapseErik Johnston2015-10-267-1/+414
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because otherwise it won't get picked up by python packaging. This also fixes the problem where the "static" folder was found if synapse wasn't started from that directory.
* | | | Implement basic pagination for search resultsErik Johnston2015-11-053-50/+86
| | | |
* | | | Implement order and group byErik Johnston2015-11-042-17/+205
|/ / /
* | | Merge pull request #341 from matrix-org/markjh/v2_sync_receiptsMark Haines2015-11-031-15/+30
|\ \ \ | | | | | | | | Include read receipts in v2 sync
| * \ \ Merge branch 'develop' into markjh/v2_sync_receiptsMark Haines2015-11-0313-23/+522
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-28 05:51:13 +0000