| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Actually look up required remote server key IDs | Paul "LeoNerd" Evans | 2015-12-18 | 1 | -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-identicons | Matthew Hodgson | 2015-12-18 | 1 | -19/+3 |
| |\ | | | | | Matthew/no identicons | ||||
| | * | fix indentation level | Matthew Hodgson | 2015-12-17 | 1 | -3/+3 |
| | | | |||||
| | * | stop generating default identicons. reverts most of ↵ | Matthew Hodgson | 2015-12-17 | 1 | -19/+3 |
| | | | | | | | | | 582019f870adbc4a8a8a9ef97b527e0fead77761 and solves vector-web/vector-im#346 | ||||
| * | | Merge branch 'release-v0.12.0' into develop | David Baker | 2015-12-18 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix typo that broke registration on the mobile clients | David Baker | 2015-12-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add display_name to 3pid invite in m.room.member invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+31 |
| | |/ |/| | |||||
| * | | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 2 | -2/+13 |
| |/ | | | | We're not meant to leak that into the graph | ||||
| * | Fix 500 error when back-paginating search results | Richard van der Hoff | 2015-12-17 | 1 | -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 typo | Daniel Wagner-Hall | 2015-12-16 | 1 | -1/+1 |
| | | |||||
| * | Give the IS a bunch more 3pid invite context | Daniel Wagner-Hall | 2015-12-16 | 1 | -7/+60 |
| | | | | | This allows it to form richer emails | ||||
| * | Merge pull request #440 from matrix-org/daniel/ise | Mark Haines | 2015-12-16 | 1 | -2/+5 |
| |\ | | | | | Include errcode on Internal Server Error | ||||
| | * | Include errcode on Internal Server Error | Daniel Wagner-Hall | 2015-12-14 | 1 | -2/+5 |
| | | | |||||
| * | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-16 | 3 | -5/+10 |
| |\ \ | |||||
| | * | | Allow users to change which account a 3pid is bound to | Mark Haines | 2015-12-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Changelog and version bump for v0.12.0-rc2 v0.12.0-rc2 | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix a race between started/stopped stream | Mark Haines | 2015-12-14 | 1 | -3/+8 |
| | | | | |||||
| * | | | Fix spacing | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix logging to lie less | Mark Haines | 2015-12-14 | 1 | -2/+9 |
| | | | | |||||
| * | | | Add commentary for fix in PR#442 | Mark Haines | 2015-12-14 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-14 | 3 | -7/+23 |
| |\| | | |||||
| | * | | Merge pull request #441 from matrix-org/markjh/fts_skip_invalid | Mark Haines | 2015-12-14 | 1 | -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 Haines | 2015-12-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | populating the FTS index | ||||
| | * | | | Combine the prev content tests | Mark Haines | 2015-12-14 | 1 | -14/+12 |
| | | | | | |||||
| | * | | | Check whether prev_content or prev_sender is set before trying to rollback state | Mark Haines | 2015-12-14 | 1 | -8/+13 |
| | | | | | |||||
| | * | | | Do the /sync in parallel accross the rooms like /initialSync does | Mark Haines | 2015-12-11 | 1 | -4/+12 |
| | |/ / | |||||
| * | / | Fix typo | Daniel Wagner-Hall | 2015-12-14 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Fix typo in sql for full text search on sqlite3 | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-12 | 4 | -7/+10 |
| |\| | |||||
| | * | Missing yield | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| | | | |||||
| | * | Add caches for whether a room has been forgotten by a user | Mark Haines | 2015-12-10 | 2 | -5/+8 |
| | | | |||||
| | * | Mark the version as a -rc1 release candidate v0.12.0-rc1 | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| | | | |||||
| | * | Bump synapse version to v0.12.0 | Mark Haines | 2015-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #435 from matrix-org/erikj/search | Erik Johnston | 2015-12-11 | 2 | -9/+72 |
| |\ \ | | | | | | | Include approximate count of search results | ||||
| | * | | Include approximate count of search results | Erik Johnston | 2015-12-11 | 2 | -3/+61 |
| | | | | |||||
| | * | | Use more efficient query form | Erik Johnston | 2015-12-11 | 1 | -8/+13 |
| | |/ | |||||
| * / | Ensure that the event that gets persisted is the one that was signed | Paul "LeoNerd" Evans | 2015-12-10 | 1 | -6/+6 |
| |/ | |||||
| * | pep8 | David Baker | 2015-12-09 | 1 | -4/+4 |
| | | |||||
| * | Split out the push rule evaluator into a separate file so it can be more ↵ | David Baker | 2015-12-09 | 2 | -185/+234 |
| | | | | | readily reused. Should be functionally identical. | ||||
| * | Allow filter JSON object in the filter query parameter in /sync | Mark Haines | 2015-12-09 | 1 | -9/+21 |
| | | | | | Documented by matrix-org/matrix-doc#224 | ||||
| * | Merge pull request #430 from matrix-org/daniel/unstable | Daniel Wagner-Hall | 2015-12-09 | 5 | -85/+80 |
| |\ | | | | | Merge pull request #430 from matrix-org/daniel/unstable | ||||
| | * | Actually host r0 and unstable prefixes | Daniel Wagner-Hall | 2015-12-08 | 5 | -85/+80 |
| | | | |||||
| * | | Merge pull request #405 from matrix-org/erikj/search-ts | Erik Johnston | 2015-12-08 | 1 | -6/+4 |
| |\ \ | |/ |/| | Change the result dict to be a list in /search response | ||||
| | * | Change the result tict to be a list | Erik Johnston | 2015-12-01 | 1 | -6/+4 |
| | | | |||||
| * | | Track the time spent in the database per request. | Mark Haines | 2015-12-07 | 5 | -4/+38 |
| | | | | | | | | | and track the number of transactions that request started. | ||||
| * | | Merge pull request #423 from matrix-org/markjh/archived_flag | Mark Haines | 2015-12-07 | 2 | -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 filter | Mark Haines | 2015-12-04 | 2 | -6/+10 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into develop | Mark Haines | 2015-12-07 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'erikj/perspective_limiter' into release-v0.11.1 | Erik Johnston | 2015-11-20 | 2 | -22/+21 |
| | |\ \ \ | |||||
| | * | | | | Bump changes and version | Erik Johnston | 2015-11-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | also do more structured logging | David Baker | 2015-12-07 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | pep8 | David Baker | 2015-12-07 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add logging to pushers API to log the body of the request | David Baker | 2015-12-07 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #427 from matrix-org/markjh/log_context | Mark Haines | 2015-12-07 | 1 | -16/+24 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add a setter for the current log context. | ||||
| | * | | | | | Add a setter for the current log context. | Mark Haines | 2015-12-07 | 1 | -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 bool | Daniel Wagner-Hall | 2015-12-07 | 1 | -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/schema | Mark Haines | 2015-12-04 | 5 | -24/+37 |
| |\ \ \ \ \ | | | | | | | | | | | | | Bump schema version. | ||||
| | * | | | | | Bump schema version. | Mark Haines | 2015-12-04 | 5 | -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 request | Mark Haines | 2015-12-04 | 1 | -0/+17 |
| |/ / / / | |||||
| * | | | | Merge pull request #420 from matrix-org/markjh/resource_usage | Mark Haines | 2015-12-04 | 4 | -11/+91 |
| |\ \ \ \ | | | | | | | | | | | Track the cpu used in the main thread by each logging context | ||||
| | * | | | | Add comments to explain why we are hardcoding RUSAGE_THREAD | Mark Haines | 2015-12-04 | 1 | -0/+8 |
| | | | | | | |||||
| | * | | | | Fix warnings | Mark Haines | 2015-12-04 | 2 | -3/+13 |
| | | | | | | |||||
| | * | | | | Track the cpu used in the main thread by each logging context | Mark Haines | 2015-12-03 | 3 | -10/+72 |
| | | | | | | |||||
| * | | | | | Merge pull request #419 from matrix-org/markjh/reuse_captcha_client | Mark Haines | 2015-12-03 | 1 | -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 request | Mark Haines | 2015-12-03 | 1 | -4/+2 |
| | |/ / / / | |||||
| * / / / / | Flatten devices into a dict, not a list | Daniel Wagner-Hall | 2015-12-03 | 1 | -4/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #414 from matrix-org/erikj/if_not_exists | Erik Johnston | 2015-12-03 | 1 | -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 tables | Erik Johnston | 2015-12-02 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #415 from matrix-org/daniel/endpoints | Daniel Wagner-Hall | 2015-12-03 | 6 | -35/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | Merge pull request #415 from matrix-org/daniel/endpoints | ||||
| | * | | | | | Update endpoints to reflect current spec | Daniel Wagner-Hall | 2015-12-02 | 6 | -35/+11 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #418 from matrix-org/daniel/whois | Daniel Wagner-Hall | 2015-12-03 | 2 | -18/+12 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Merge pull request #418 from matrix-org/daniel/whois | ||||
| | * | | | | | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 2 | -18/+12 |
| | |/ / / / / | |||||
| * | | | | | | Just replace the table definition with the one from full_schema 16 | David Baker | 2015-12-02 | 1 | -11/+10 |
| | | | | | | | |||||
| * | | | | | | Fix schema delta 15 on postgres in the very unlikley event that anyone ↵ | David Baker | 2015-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | upgrades to 15... | ||||
| * | | | | | | Make state updates in the C+S API idempotent | Mark Haines | 2015-12-02 | 1 | -0/+12 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #412 from matrix-org/erikj/search | Erik Johnston | 2015-12-02 | 1 | -11/+36 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Search: Add prefix matching support | ||||
| | * | | | | Throw if unrecognized DB type | Erik Johnston | 2015-12-02 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | Fix so highlight matching works again | Erik Johnston | 2015-12-02 | 1 | -8/+13 |
| | | | | | | |||||
| | * | | | | Remove deuplication. Add comment about regex. | Erik Johnston | 2015-12-02 | 1 | -21/+11 |
| | | | | | | |||||
| | * | | | | Search: Add prefix matching support | Erik Johnston | 2015-12-02 | 1 | -5/+32 |
| | | | | | | |||||
| * | | | | | Merge pull request #410 from matrix-org/markjh/edu_frequency | Mark Haines | 2015-12-02 | 2 | -5/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | Only fire user_joined_room if the user has actually joined. | ||||
| | * | | | | | Use the context returned by _handle_new_event | Mark Haines | 2015-12-02 | 1 | -4/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Add comments | Mark Haines | 2015-12-02 | 2 | -0/+6 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 9 | -56/+91 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py | ||||
| | * | | | | | | | Only fire user_joined_room if the membership has changed | Mark Haines | 2015-12-01 | 1 | -3/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-01 | 42 | -235/+835 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Only fire user_joined_room on the distributor if the user has actually ↵ | Mark Haines | 2015-12-01 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | joined the room | ||||
| * | | | | | | | | | Merge pull request #413 from matrix-org/markjh/reuse_http_client | Mark Haines | 2015-12-02 | 3 | -18/+10 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Reuse a single http client, rather than creating new ones | ||||
| | * | | | | | | | | | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 3 | -18/+10 |
| | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #411 from matrix-org/default_dont_notify | David Baker | 2015-12-02 | 1 | -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 Baker | 2015-12-02 | 1 | -0/+1 |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | for 1:1 rooms / highlights out-of-the-box | ||||
| * | | | | | | | | Fix typo in collect_presencelike_data | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | | Merge pull request #409 from MadsRC/develop | Erik Johnston | 2015-12-02 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Develop | ||||
| | * | | | | | | | Added a single line to explain what the server_name is used for | Mads R. Christensen | 2015-12-02 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #408 from matrix-org/markjh/distributor_facade | Mark Haines | 2015-12-02 | 7 | -53/+78 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Wrap calls to distributor.fire in appropriately named functions | ||||
| | * | | | | | | | | Wrap calls to distributor.fire in appropriately named functions so that ↵ | Mark Haines | 2015-12-01 | 7 | -53/+78 |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | static analysis can work out want is calling what | ||||
| * | | | | | | | | Merge pull request #406 from matrix-org/erikj/search | Erik Johnston | 2015-12-02 | 1 | -3/+12 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | Search: Don't disregard grouping info in pagination tokens | ||||
| | * | | | | | | Search: Don't disregard grouping info in pagination tokens | Erik Johnston | 2015-12-01 | 1 | -3/+12 |
| | | | | | | | | |||||
| * | | | | | | | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 11 | -25/+476 |
| | | | | | | | | |||||
| * | | | | | | | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 26 | -115/+130 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #404 from matrix-org/markjh/trivial_rename | Mark Haines | 2015-12-01 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Rename presence_handler.send_invite | ||||
| | * | | | | | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ↵ | Mark Haines | 2015-12-01 | 2 | -2/+2 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | to distinguish it from normal invites | ||||
| * | | | | | | Merge pull request #402 from matrix-org/markjh/event_formatting | Mark Haines | 2015-12-01 | 1 | -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 present | Mark Haines | 2015-12-01 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Copy rather than move the fields to shuffle between a v1 and a v2 event. | Mark Haines | 2015-11-30 | 1 | -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 bit | Erik Johnston | 2015-12-01 | 1 | -8/+9 |
| | | | | | | | |||||
| * | | | | | | Allow paginating search ordered by recents | Erik Johnston | 2015-11-30 | 4 | -84/+219 |
| | |/ / / / |/| | | | | |||||
| * | | | | | Return words to highlight in search results | Erik Johnston | 2015-11-27 | 2 | -22/+120 |
| |/ / / / | |||||
| * | | | | Allow user to redact with an equal power | Erik Johnston | 2015-11-26 | 1 | -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 again | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix SQL for postgres | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove size specifier for database column | Daniel Wagner-Hall | 2015-11-23 | 1 | -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/guestroominitialsync | Daniel Wagner-Hall | 2015-11-23 | 1 | -10/+15 |
| |\ \ \ \ | |/ / / |/| | | | Clean up room initialSync for guest users | ||||
| | * | | | Clean up room initialSync for guest users | Daniel Wagner-Hall | 2015-11-13 | 1 | -10/+15 |
| | | | | | |||||
| * | | | | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 6 | -5/+118 |
| |\ \ \ \ | |_|_|/ |/| | | | Allow users to forget rooms | ||||
| | * | | | Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into ↵ | Daniel Wagner-Hall | 2015-11-19 | 14 | -74/+112 |
| | |\ \ \ | | | | | | | | | | | | | | | | daniel/forgetrooms | ||||
| | | * \ \ | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 14 | -74/+112 |
| | | |\ \ \ | |||||
| | * | | | | | Ignore forgotten rooms in v2 sync | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 |
| | |/ / / / | |||||
| | * | | | | Simplify code | Daniel Wagner-Hall | 2015-11-19 | 2 | -8/+6 |
| | | | | | | |||||
| | * | | | | Apply forgetting properly to historical events | Daniel Wagner-Hall | 2015-11-18 | 2 | -3/+41 |
| | | | | | | |||||
| | * | | | | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 6 | -4/+81 |
| | | | | | | |||||
| * | | | | | Fix typo | Erik Johnston | 2015-11-20 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Don't limit connections to perspective servers | Erik Johnston | 2015-11-20 | 2 | -22/+21 |
| | |_|_|/ |/| | | | |||||
| * | | | | Merge pull request #394 from matrix-org/erikj/search | Erik Johnston | 2015-11-20 | 1 | -1/+54 |
| |\ \ \ \ | | | | | | | | | | | Add options for including state in search results | ||||
| | * | | | | Add option to include the current room state | Erik Johnston | 2015-11-20 | 1 | -0/+24 |
| | | | | | | |||||
| | * | | | | Optionally include historic profile info | Erik Johnston | 2015-11-20 | 1 | -1/+30 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #389 from matrix-org/rav/flatten_sync_response | Richard van der Hoff | 2015-11-20 | 2 | -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_response | Paul "LeoNerd" Evans | 2015-11-19 | 15 | -75/+113 |
| | |\| | | | |||||
| | * | | | | Put back the 'state.events' subobject | Richard van der Hoff | 2015-11-19 | 1 | -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 states | Richard van der Hoff | 2015-11-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | joined->join invited->invite archived->leave | ||||
| | * | | | | Flatten the /sync response to remove the event_map | Richard van der Hoff | 2015-11-19 | 2 | -24/+14 |
| | | | | | | |||||
| * | | | | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flow | Erik Johnston | 2015-11-20 | 1 | -1/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove m.login.token from advertised flows. | ||||
| | * | | | | | Comment | Erik Johnston | 2015-11-20 | 1 | -0/+8 |
| | | | | | | | |||||
| | * | | | | | Remove m.login.token from advertised flows. | Erik Johnston | 2015-11-19 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #393 from matrix-org/erikj/destination_retry_max | Erik Johnston | 2015-11-20 | 1 | -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 interval | Erik Johnston | 2015-11-20 | 1 | -2/+2 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-19 | 1 | -1/+1 |
| |\| | | | | |||||
| | * | | | | Bump changes and version | Erik Johnston | 2015-11-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data | Mark Haines | 2015-11-19 | 11 | -49/+66 |
| |\ \ \ \ \ | | | | | | | | | | | | | s/private_user_data/account_data/ | ||||
| | * | | | | | Rename the database table | Mark Haines | 2015-11-18 | 1 | -0/+17 |
| | | | | | | | |||||
| | * | | | | | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 10 | -49/+49 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Take a boolean not a list of lambdas | Daniel Wagner-Hall | 2015-11-19 | 2 | -9/+18 |
| | |/ / / |/| | | | |||||
| * | | | | Comment | Erik Johnston | 2015-11-19 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Split out text for missing config options. | Erik Johnston | 2015-11-18 | 1 | -16/+26 |
| | |/ / |/| | | | | | | | | | | | This allows packages to more easily override the default messages to include package specific options. | ||||
| * | | | Bump changelog and version | Erik Johnston | 2015-11-17 | 1 | -1/+1 |
| |/ / | |||||
| * | | Add comment | Erik Johnston | 2015-11-17 | 1 | -0/+2 |
| | | | |||||
| * | | Only retry federation requests for a long time for background requests | Erik Johnston | 2015-11-17 | 2 | -7/+20 |
| | | | |||||
| * | | Implement required method 'resumeProducing' | Erik Johnston | 2015-11-17 | 1 | -0/+3 |
| | | | |||||
| * | | Slightly more aggressive retry timers at HTTP level | Erik Johnston | 2015-11-17 | 1 | -2/+3 |
| | | | |||||
| * | | Bump changelog and version | Erik Johnston | 2015-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-17 | 7 | -42/+219 |
| |\ \ | |||||
| | * | | Always check guest = true in macaroons | Steven Hammerton | 2015-11-17 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 28 | -284/+1003 |
| | |\ \ | |||||
| | | * | | Don't complain if /make_join response lacks 'prev_state' list (SYN-517) | Paul "LeoNerd" Evans | 2015-11-13 | 1 | -0/+6 |
| | | |/ | |||||
| | | * | Allow guests to /room/:room_id/{join,leave} | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 |
| | | | | |||||
| | * | | Snakes not camels | Steven Hammerton | 2015-11-11 | 1 | -5/+5 |
| | | | | |||||
| | * | | Minor review fixes | Steven Hammerton | 2015-11-11 | 2 | -17/+14 |
| | | | | |||||
| | * | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 2 | -57/+17 |
| | | | | |||||
| | * | | Updates to fallback CAS login to do new token login | Steven Hammerton | 2015-11-06 | 1 | -26/+12 |
| | | | | |||||
| | * | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-05 | 40 | -295/+1435 |
| | |\ \ | |||||
| | * | | | Allow hs to do CAS login completely and issue the client with a login token ↵ | Steven Hammerton | 2015-11-05 | 3 | -5/+218 |
| | | | | | | | | | | | | | | | | | that can be redeemed for the usual successful login response | ||||
| | * | | | Add service URL to CAS config | Steven Hammerton | 2015-11-04 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Bump version and change log v0.11.0-rc2 | Erik Johnston | 2015-11-13 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | Implementation of state rollback in /sync | Richard van der Hoff | 2015-11-13 | 2 | -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 calculation | Richard van der Hoff | 2015-11-13 | 2 | -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 Hoff | 2015-11-13 | 2 | -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 comments | Richard van der Hoff | 2015-11-13 | 4 | -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/guestnonevents | Daniel Wagner-Hall | 2015-11-12 | 1 | -3/+17 |
| |\ \ \ | | | | | | | | | Return non-room events from guest /events calls | ||||
| | * | | | Return non-room events from guest /events calls | Daniel Wagner-Hall | 2015-11-12 | 1 | -3/+17 |
| | | | | | |||||
| * | | | | Merge pull request #368 from matrix-org/erikj/fix_federation_profile | Erik Johnston | 2015-11-12 | 3 | -6/+13 |
| |\ \ \ \ | | | | | | | | | | | Fix missing profile data in federation joins | ||||
| | * | | | | Fix missing profile data in federation joins | Erik Johnston | 2015-11-12 | 3 | -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_faster | Erik Johnston | 2015-11-12 | 1 | -3/+14 |
| |\ \ \ \ | |/ / / |/| | | | Use a (hopefully) more efficient SQL query for doing recency based room search | ||||
| | * | | | Trailing whitespace | Erik Johnston | 2015-11-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Expand comment | Erik Johnston | 2015-11-12 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | Comment | Erik Johnston | 2015-11-12 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Fix SQL syntax | Erik Johnston | 2015-11-12 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Use a (hopefully) more efficient SQL query for doing recency based room search | Erik Johnston | 2015-11-12 | 1 | -4/+6 |
| | | | | | |||||
| * | | | | Fix an issue with ignoring power_level changes on divergent graphs | Richard van der Hoff | 2015-11-12 | 1 | -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/readafterleave | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge pull request #367 from matrix-org/daniel/readafterleave Tweak guest access permissions | ||||
| | * | | | | Tweak guest access permissions | Daniel Wagner-Hall | 2015-11-12 | 1 | -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/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 2 | -24/+34 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync | ||||
| | * | | | | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 2 | -24/+34 |
| | | | | | | |||||
| * | | | | | Fix bug where assumed dict was namedtuple | Erik Johnston | 2015-11-12 | 1 | -1/+1 |
| | |/ / / |/| | | | |||||
| * | | | | Allow guests to set their display names | Daniel Wagner-Hall | 2015-11-12 | 1 | -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 users | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 |
| | | | | | | | | | | | | | | | | | | | | | Otherwise they're inconveniently allowed to write events to the room but not to read them from the room. | ||||
| * | | | | Fix race creating directories | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-11 | 2 | -5/+11 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #361 from matrix-org/daniel/guestcontext | Erik Johnston | 2015-11-11 | 2 | -5/+11 |
| | |\ \ \ \ | | | | | | | | | | | | | Allow guests to access room context API | ||||
| | | * | | | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 2 | -5/+11 |
| | | |/ / / | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-11 | 19 | -134/+594 |
| |\| | | | | |||||
| | * | | | | Merge pull request #359 from matrix-org/markjh/incremental_indexing | Erik Johnston | 2015-11-11 | 6 | -77/+413 |
| | |\ \ \ \ | | |/ / / | |/| | | | Incremental background updates for db indexes | ||||
| | | * | | | Fix param style to work on both sqlite and postgres | Mark Haines | 2015-11-11 | 1 | -2/+6 |
| | | | | | | |||||
| | | * | | | Fix the background update | Mark Haines | 2015-11-11 | 3 | -17/+19 |
| | | | | | | |||||
| | | * | | | Use a background task to update databases to use the full text search | Mark Haines | 2015-11-10 | 2 | -80/+28 |
| | | | | | | |||||
| | | * | | | Run the background updates when starting synapse. | Mark Haines | 2015-11-10 | 4 | -10/+67 |
| | | | | | | |||||
| | | * | | | Add background update task for reindexing event search | Mark Haines | 2015-11-09 | 1 | -2/+96 |
| | | | | | | |||||
| | | * | | | Add storage module for tracking background updates. | Mark Haines | 2015-11-09 | 2 | -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 /publicRooms | Daniel Wagner-Hall | 2015-11-10 | 3 | -29/+69 |
| | | | | | | |||||
| | * | | | | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 7 | -12/+92 |
| | | | | | | |||||
| | * | | | | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 2 | -7/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | Get display name from identity server, not client | ||||
| | | * | | | | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 2 | -7/+4 |
| | | |/ / / | |||||
| | * | | | | Don't fiddle with results returned by event sources | Richard van der Hoff | 2015-11-09 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overwriting hashes returned by other methods is poor form. Fixes: SYN-516 | ||||
| | * | | | | Add a couple of unit tests for room/<x>/messages | Richard van der Hoff | 2015-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | ... merely because I was trying to figure out how it worked, and couldn't. | ||||
| | * | | | | Merge branch 'develop' into markjh/SYN-513 | Mark Haines | 2015-11-09 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/tags.py | ||||
| | | * | | | | fix comedy important missing comma breaking recent-ordered FTS on sqlite | Matthew Hodgson | 2015-11-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | add a key existence check to tags_by_room to avoid /events 500'ing when ↵ | Matthew Hodgson | 2015-11-06 | 1 | -1/+2 |
| | | |/ / / | | | | | | | | | | | | | | | | testing against vector | ||||
| | * / / / | SYN-513: Include updates for rooms that have had all their tags deleted | Mark Haines | 2015-11-09 | 2 | -2/+2 |
| | |/ / / | |||||
| | * | / | Remove accidentally added ID column | Daniel Wagner-Hall | 2015-11-06 | 1 | -1/+0 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 | Erik Johnston | 2015-11-05 | 13 | -187/+245 |
| |\| | | |||||
| | * | | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 3 | -36/+288 |
| | |\ \ | | | | | | | | | Implement pagination, order by and groups in search | ||||
| | | * | | Be explicit about what we're doing | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Remove redundant test | Erik Johnston | 2015-11-05 | 1 | -1/+0 |
| | | | | | |||||
| | | * | | Increment by one, not five | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 10 | -180/+230 |
| | | | | | |||||
| | * | | | Merge pull request #340 from matrix-org/erikj/server_retries | Erik Johnston | 2015-11-05 | 2 | -4/+13 |
| | |\ \ \ | | | | | | | | | | | Retry dead servers a lot less often | ||||
| | | * | | | Retry dead servers a lot less often | Erik Johnston | 2015-11-02 | 2 | -4/+13 |
| | | | | | | |||||
| * | | | | | Bump changelog and version number | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | |_|/ / |/| | | | |||||
| * | | | | COMMENTS | Erik Johnston | 2015-11-05 | 1 | -4/+26 |
| | | | | | |||||
| * | | | | Error handling | Erik Johnston | 2015-11-05 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-11-05 | 55 | -330/+1126 |
| |\| | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-11-05 | 43 | -329/+434 |
| | |\ \ \ | |||||
| | | * | | | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 16 | -56/+210 |
| | | | | | | | | | | | | | | | | | | | | | Squash-merge of PR #345 from daniel/anonymousevents | ||||
| | | * | | | Merge pull request #347 from matrix-org/markjh/check_filter | Mark Haines | 2015-11-05 | 1 | -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 Haines | 2015-11-04 | 1 | -18/+2 |
| | | | | | | | | | | | | | | | | | | | | | check the right top level definitions in the filter | ||||
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Daniel Wagner-Hall | 2015-11-04 | 8 | -114/+6 |
| | | |\ \ \ | |||||
| | | | * | | | Merge branch 'develop' into daniel/removesomelies | Mark Haines | 2015-11-04 | 18 | -160/+577 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/notifier.py | ||||
| | | | | * | | Remove the LockManager class because it wasn't being used | Mark Haines | 2015-11-04 | 3 | -81/+0 |
| | | | | | | | |||||
| | | | * | | | Remove more unused parameters | Daniel Wagner-Hall | 2015-11-02 | 3 | -4/+1 |
| | | | | | | | |||||
| | | | * | | | Remove unused arguments and code | Daniel Wagner-Hall | 2015-11-02 | 3 | -29/+5 |
| | | | | |/ | | | |/| | |||||
| | | * | | | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 27 | -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 develop | Erik Johnston | 2015-11-05 | 12 | -1/+692 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Use correct service url | Erik Johnston | 2015-10-26 | 1 | -3/+1 |
| | | | | | |||||
| | | * | | Add login fallback | Erik Johnston | 2015-10-26 | 5 | -0/+280 |
| | | | | | |||||
| | | * | | Move static folder into synapse | Erik Johnston | 2015-10-26 | 7 | -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 results | Erik Johnston | 2015-11-05 | 3 | -50/+86 |
| | | | | | |||||
| * | | | | Implement order and group by | Erik Johnston | 2015-11-04 | 2 | -17/+205 |
| |/ / / | |||||
| * | | | Merge pull request #341 from matrix-org/markjh/v2_sync_receipts | Mark Haines | 2015-11-03 | 1 | -15/+30 |
| |\ \ \ | | | | | | | | | Include read receipts in v2 sync | ||||
| | * \ \ | Merge branch 'develop' into markjh/v2_sync_receipts | Mark Haines | 2015-11-03 | 13 | -23/+522 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py | ||||
| | * | | | | Include read receipts in v2 sync | Mark Haines | 2015-11-02 | 1 | -15/+30 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge pull request #343 from matrix-org/erikj/fix_retries | Erik Johnston | 2015-11-03 | 2 | -46/+30 |
| |\ \ \ \ | |_|/ / |/| | | | Fix broken cache for getting retry times. | ||||
| | * | | | Don't rearrange transaction_queue | Erik Johnston | 2015-11-03 | 1 | -12/+11 |
| | | | | | |||||
| | * | | | Fix broken cache for getting retry times. This meant we retried remote ↵ | Erik Johnston | 2015-11-03 | 2 | -55/+40 |
| | |/ / | | | | | | | | | | destinations way more frequently than we should | ||||
| * | | | Merge pull request #335 from matrix-org/markjh/room_tags | Mark Haines | 2015-11-03 | 13 | -24/+523 |
| |\ \ \ | |/ / |/| | | Add APIs for adding and removing tags from rooms | ||||
| | * | | That TODO was done | Mark Haines | 2015-11-03 | 1 | -1/+0 |
| | | | | |||||
| | * | | Spell "deferred" more correctly | Mark Haines | 2015-11-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 3 | -11/+70 |
| | | | | |||||
| | * | | Store room tag content and return the content in the m.tag event | Mark Haines | 2015-11-02 | 4 | -22/+41 |
| | | | | |||||
| | * | | Merge branch 'develop' into markjh/room_tags | Mark Haines | 2015-11-02 | 9 | -28/+331 |
| | |\ \ | |||||
| | * | | | Support clients supplying older tokens, fix short poll test | Mark Haines | 2015-10-30 | 1 | -1/+1 |
| | | | | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |