Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add a lru cache class | Mark Haines | 2015-02-11 | 2 | -0/+166 |
| | |||||
* | Merge pull request #63 from matrix-org/homeserver_test_setup | Mark Haines | 2015-02-11 | 25 | -360/+140 |
|\ | | | | | Factor out some of the common homeserver setup code | ||||
| * | Factor out some of the common homeserver setup code into a | Mark Haines | 2015-02-11 | 25 | -360/+140 |
| | | | | | | | | setup_test_homeserver function in utils. | ||||
* | | Fix bug where variable was not always defined | Erik Johnston | 2015-02-11 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-11 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #59 from matrix-org/hotfixes-v0.6.1f v0.6.1f | Erik Johnston | 2015-02-10 | 3 | -4/+6 |
| |\ | | | | | | | Hotfixes v0.6.1f | ||||
| | * | Bump version | Erik Johnston | 2015-02-10 | 2 | -2/+2 |
| | | | |||||
| | * | Fix prune_events to work with nested dicts | Erik Johnston | 2015-02-10 | 1 | -2/+4 |
| |/ | |||||
| * | Pin the twisted version so that it doesn't pull in twisted 15. v0.6.1e | Erik Johnston | 2015-02-04 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #48 from matrix-org/hotfixes-v0.6.1e | Matthew Hodgson | 2015-02-04 | 4 | -7/+138 |
| |\ | | | | | | | Hotfixes v0.6.1e | ||||
| | * | Ver bump | Erik Johnston | 2015-02-04 | 2 | -2/+2 |
| | | | |||||
| | * | Pull in python_dependencies.py from develop | Erik Johnston | 2015-02-04 | 1 | -0/+122 |
| | | | |||||
| | * | Bluntly port changes of README from develop to master | Erik Johnston | 2015-02-04 | 1 | -5/+14 |
| | | | |||||
| * | | Revert "Pull in python_dependencies.py from develop" | Erik Johnston | 2015-02-04 | 1 | -122/+0 |
| | | | | | | | | | | | | This reverts commit 47b1e1491f7f98b57f4b6894f0d4d333e64bf721. | ||||
| * | | Pull in python_dependencies.py from develop | Erik Johnston | 2015-02-04 | 1 | -0/+122 |
| |/ | |||||
* | | Merge pull request #60 from matrix-org/single_source_version_and_dependencies | Mark Haines | 2015-02-10 | 3 | -39/+29 |
|\ \ | | | | | | | Single source version and dependencies | ||||
| * | | Rename path to path_segments to make it clearer that it is a list | Mark Haines | 2015-02-10 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'develop' into single_source_version_and_dependencies | Mark Haines | 2015-02-10 | 7 | -12/+12 |
| |\ \ | |/ / |/| | | |||||
* | | | Fix code-style | Mark Haines | 2015-02-10 | 7 | -12/+12 |
| | | | |||||
| * | | Add the 'setup_requires' and allow easy_install since jenkins uses them | Mark Haines | 2015-02-10 | 1 | -14/+5 |
| | | | |||||
| * | | Single source version and python dependencies, prevent people accidentally ↵ | Mark Haines | 2015-02-10 | 3 | -44/+43 |
|/ / | | | | | | | installing with easy_install, use scripts rather than entry_points to install synctl | ||||
* | | Log all the exits from _attempt_new_transaction | Erik Johnston | 2015-02-10 | 1 | -2/+7 |
| | | |||||
* | | Code-style fixes | Mark Haines | 2015-02-10 | 11 | -36/+57 |
| | | |||||
* | | Sign auth_chains when returned by /state/ requests | Erik Johnston | 2015-02-10 | 1 | -0/+11 |
| | | |||||
* | | Merge pull request #58 from matrix-org/get_event_counters | Mark Haines | 2015-02-10 | 1 | -26/+62 |
|\ \ | | | | | | | Add performance counters for different stages of loading events | ||||
| * | | Fix pyflakes | Mark Haines | 2015-02-10 | 1 | -3/+3 |
| | | | |||||
| * | | Add performance counters for different stages of loading events | Mark Haines | 2015-02-10 | 1 | -24/+60 |
| | | | |||||
* | | | yaml.load expects strings to be a yaml rather than file | Erik Johnston | 2015-02-10 | 1 | -1/+2 |
| | | | |||||
* | | | Use yaml logging config format because it is much nicer | Erik Johnston | 2015-02-10 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-10 | 1 | -1/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵ | Mark Haines | 2015-02-06 | 1 | -1/+3 |
| | | | | | | | | | | | | topological token to a stream token before passing it to get_recent_events_for_room | ||||
| * | | Explicitly list the RejectedReasons that we can prove | Erik Johnston | 2015-02-06 | 1 | -1/+6 |
| | | | |||||
* | | | Convert directory paths to absolute paths before daemonizing | Mark Haines | 2015-02-09 | 1 | -2/+3 |
| | | | |||||
* | | | Merge pull request #56 from matrix-org/room_initial_sync_perf | Mark Haines | 2015-02-09 | 4 | -21/+43 |
|\ \ \ | | | | | | | | | During room intial sync, only calculate current state once. | ||||
| * | | | During room intial sync, only calculate current state once. | Erik Johnston | 2015-02-09 | 4 | -21/+43 |
| | | | | |||||
* | | | | Merge pull request #57 from matrix-org/transaction_counters | Erik Johnston | 2015-02-09 | 1 | -2/+31 |
|\ \ \ \ | | | | | | | | | | | Transaction counters | ||||
| * | | | | Use the transaction 'desc' rather than 'name', increment the txn_ids in | Mark Haines | 2015-02-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | txn names | ||||
| * | | | | Formatting | Mark Haines | 2015-02-09 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Performance counters for database transaction names | Mark Haines | 2015-02-09 | 1 | -1/+31 |
| |/ / / | |||||
* | | | | Need to use re.search if looking for matches not at the start of the string. ↵ | David Baker | 2015-02-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Also comparisons with None should be 'is'. | ||||
* | | | | oops | Matthew Hodgson | 2015-02-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | oops | Matthew Hodgson | 2015-02-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | only do word-boundary patches on bodies for now | Matthew Hodgson | 2015-02-09 | 2 | -2/+5 |
|/ / / | |||||
* | | | Merge pull request #55 from matrix-org/profiling | Erik Johnston | 2015-02-09 | 6 | -6/+60 |
|\ \ \ | | | | | | | | | Profiling | ||||
| * | | | Fix typo | Erik Johnston | 2015-02-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add looping_call to Clock | Erik Johnston | 2015-02-09 | 1 | -1/+9 |
| | | | | |||||
| * | | | Log database time every 10s and log as percentage | Erik Johnston | 2015-02-09 | 1 | -2/+2 |
| | | | | |||||
| * | | | Time how long we're spending on the database thread | Erik Johnston | 2015-02-09 | 2 | -0/+27 |
| | | | | |||||
| * | | | Log when we receive a request, when we send a response and how long it took ↵ | Erik Johnston | 2015-02-09 | 4 | -5/+24 |
| | | | | | | | | | | | | | | | | to process it. | ||||
* | | | | Fix server default rule injection (downwards, not upwards!) | David Baker | 2015-02-09 | 1 | -6/+6 |
|/ / / | |||||
* | | | glob *s should probably be non-greedy | Matthew Hodgson | 2015-02-08 | 1 | -1/+1 |
| | | | |||||
* | | | oops | Matthew Hodgson | 2015-02-08 | 1 | -1/+1 |
| | | | |||||
* | | | kill off fnmatch in favour of word-boundary based push alerts (untested) | Matthew Hodgson | 2015-02-08 | 1 | -12/+20 |
| | | | |||||
* | | | Merge pull request #53 from matrix-org/default_avatar_identicons | Matthew Hodgson | 2015-02-07 | 3 | -25/+88 |
|\ \ \ | | | | | | | | | create identicons for new users by default as default avatars | ||||
| * | | | don't give up if we can't create default avatars during tests | Matthew Hodgson | 2015-02-07 | 1 | -9/+12 |
| | | | | |||||
| * | | | add some options and doc | Matthew Hodgson | 2015-02-07 | 1 | -5/+20 |
| | | | | |||||
| * | | | ...and here's the actual impl. git fail. | Matthew Hodgson | 2015-02-07 | 2 | -25/+46 |
| | | | | |||||
| * | | | create identicons for new users by default as default avatars, and provide ↵ | Matthew Hodgson | 2015-02-07 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | script to update existing avatarless users | ||||
* | | | | clean up TurnedToDust's ArchLinux notes a bit | Matthew Hodgson | 2015-02-07 | 1 | -18/+26 |
| | | | | |||||
* | | | | Merge pull request #52 from TurnedToDust/patch-2 | Matthew Hodgson | 2015-02-07 | 1 | -0/+38 |
|\ \ \ \ | |/ / / |/| | | | Thanks Dust - this is great :) will merge to develop and tweak it slightly there. | ||||
| * | | | Update to README.rst | TurnedToDust | 2015-02-06 | 1 | -0/+38 |
| | | | | | | | | | | | | Added Documentation regarding ArchLinux | ||||
* | | | | thou shalt specify a content-length | Matthew Hodgson | 2015-02-07 | 1 | -0/+1 |
| | | | | |||||
* | | | | i hate weakly typed languages | Matthew Hodgson | 2015-02-07 | 1 | -1/+1 |
|/ / / | |||||
* / / | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵ | Mark Haines | 2015-02-06 | 1 | -1/+3 |
|/ / | | | | | | | topological token to a stream token before passing it to get_recent_events_for_room | ||||
* | | Move delta/v13.sql to delta/v12.sql | Erik Johnston | 2015-02-06 | 2 | -24/+11 |
| | | |||||
* | | Don't query auth if the only difference is events that were rejected due to ↵ | Erik Johnston | 2015-02-06 | 1 | -56/+72 |
| | | | | | | | | auth. | ||||
* | | Make seen_ids a set | Erik Johnston | 2015-02-06 | 1 | -1/+3 |
| | | |||||
* | | Return body of response in HttpResponseException | Erik Johnston | 2015-02-06 | 1 | -1/+2 |
| | | |||||
* | | Handle the fact the list.remove raises if element doesn't exist | Erik Johnston | 2015-02-06 | 1 | -4/+10 |
| | | |||||
* | | priority class now dealt with in namespaced rule_id | David Baker | 2015-02-05 | 1 | -4/+0 |
| | | |||||
* | | Give server default rules the 'default' attribute and fix various brokenness. | David Baker | 2015-02-05 | 3 | -3/+9 |
| | | |||||
* | | Server default rules now of all kinds rather than all being at lowest prio. | David Baker | 2015-02-05 | 4 | -51/+98 |
| | | |||||
* | | namespace rule IDs to be unique within their scope and rule type. | David Baker | 2015-02-05 | 1 | -123/+129 |
| | | |||||
* | | Merge branch 'federation_client_retries' of github.com:matrix-org/synapse ↵ | Erik Johnston | 2015-02-05 | 8 | -89/+169 |
|\ \ | | | | | | | | | | into develop | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-05 | 3 | -5/+82 |
| |\ \ | | | | | | | | | | | | | federation_client_retries | ||||
| * | | | Connection errors in twisted aren't RuntimeErrors | Erik Johnston | 2015-02-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | Pass through list of room hosts from room alias query to federation so that ↵ | Erik Johnston | 2015-02-05 | 3 | -15/+22 |
| | | | | | | | | | | | | | | | | it can retry against different room hosts | ||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-04 | 16 | -49/+146 |
| |\ \ \ | | | | | | | | | | | | | | | | federation_client_retries | ||||
| * \ \ \ | Merge branch 'signature_failures' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-04 | 3 | -9/+15 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | federation_client_retries | ||||
| * | | | | | Apply sanity to the transport client interface. Convert 'make_join' and ↵ | Erik Johnston | 2015-02-04 | 6 | -71/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | 'send_join' to accept iterables of destinations | ||||
| * | | | | | When returning lists of servers from alias lookups, put the current server ↵ | Erik Johnston | 2015-02-04 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | first in the list | ||||
| * | | | | | Retry make_join | Erik Johnston | 2015-02-04 | 1 | -7/+12 |
| | | | | | | |||||
* | | | | | | Merge pull request #47 from matrix-org/signature_failures | Erik Johnston | 2015-02-05 | 9 | -272/+429 |
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | | Federation fixes. | ||||
| * | | | | Change context.auth_events to what the auth_events would be bases on ↵ | Erik Johnston | 2015-02-04 | 3 | -9/+15 |
| |/ / / | | | | | | | | | | | | | context.current_state, rather than based on the auth_events from the event. | ||||
| * | | | Brief comment on why we do some things on every call to persist_event and ↵ | Erik Johnston | 2015-02-04 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | not others | ||||
| * | | | Fix state resolution to remember join_rules is a type of auth event. | Erik Johnston | 2015-02-04 | 1 | -1/+13 |
| | | | | |||||
| * | | | Rearrange persist_event so that do all the queries that need to be done ↵ | Erik Johnston | 2015-02-04 | 3 | -72/+77 |
| | | | | | | | | | | | | | | | | before returning early if we have already persisted that event. | ||||
| * | | | Add doc to get_event | Erik Johnston | 2015-02-03 | 1 | -0/+15 |
| | | | | |||||
| * | | | New line | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Neaten the handling of state and auth_chain up a bit | Erik Johnston | 2015-02-03 | 1 | -27/+30 |
| | | | | |||||
| * | | | Actually, the old prune_event function was non-deterministic, so no point ↵ | Erik Johnston | 2015-02-03 | 2 | -91/+4 |
| | | | | | | | | | | | | | | | | keeping it around :( | ||||
| * | | | Remove unused imports | Erik Johnston | 2015-02-03 | 1 | -5/+0 |
| | | | | |||||
| * | | | Add new FederationBase | Erik Johnston | 2015-02-03 | 1 | -0/+126 |
| | | | | |||||
| * | | | Keep around the old (buggy) version of the prune_event function so that we ↵ | Erik Johnston | 2015-02-03 | 4 | -137/+92 |
| | | | | | | | | | | | | | | | | can use it to check signatures for events on old servers | ||||
| * | | | Don't completely die if get auth_chain or querying auth_chain requests fail | Erik Johnston | 2015-02-03 | 1 | -63/+72 |
| | | | | |||||
| * | | | Set combinations is | and not + | Erik Johnston | 2015-02-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | Spelling | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Give exception better message | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add FIXME note. | Erik Johnston | 2015-02-03 | 1 | -0/+2 |
| | | | | |||||
| * | | | PEP8 | Erik Johnston | 2015-02-03 | 1 | -1/+0 |
| | | | | |||||
| * | | | Return rejected events if asked for it over federation. | Erik Johnston | 2015-02-03 | 1 | -0/+1 |
| | | | | |||||
| * | | | Try to ensure we don't persist an event we have already persisted. In ↵ | Erik Johnston | 2015-02-03 | 3 | -19/+68 |
| | | | | | | | | | | | | | | | | persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering. | ||||
| * | | | Don't bother requesting PDUs with bad signatures from the same server | Erik Johnston | 2015-02-02 | 1 | -16/+17 |
| | | | | |||||
| * | | | Don't fail an entire request if one of the returned events fails a signature ↵ | Erik Johnston | 2015-02-02 | 2 | -34/+94 |
| | | | | | | | | | | | | | | | | check. If an event does fail a signature check, look in the local database and request it from the originator. | ||||
* | | | | SYN-202: Log as WARN the 404 'Presence information not visible' errors ↵ | Erik Johnston | 2015-02-05 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | instead of as ERROR since they were spamming the logs | ||||
* | | | | Print out the auth events on failure | Erik Johnston | 2015-02-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add script to check and auth chain and current state of a room | Erik Johnston | 2015-02-04 | 1 | -0/+65 |
| | | | | |||||
* | | | | Mention new pydenticon dep. | Erik Johnston | 2015-02-04 | 1 | -0/+5 |
| |/ / |/| | | |||||
* | | | More s/instance_handle/profile_tag/ | David Baker | 2015-02-04 | 1 | -5/+5 |
| | | | |||||
* | | | s/instance_handle/profile_tag/ | David Baker | 2015-02-03 | 8 | -37/+37 |
| | | | |||||
* | | | Use set_tweak instead of set_sound | David Baker | 2015-02-03 | 2 | -3/+4 |
| | | | |||||
* | | | Merge pull request #46 from matrix-org/identicons | Mark Haines | 2015-02-02 | 4 | -0/+55 |
|\ \ \ | | | | | | | | | Add a media/v1/identicon resource for generating identicons | ||||
| * | | | Add pydenticon to python_dependencies | Mark Haines | 2015-02-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add Cache-Control header to identicon | Mark Haines | 2015-02-02 | 1 | -0/+3 |
| | | | | |||||
| * | | | Fix setting identicon width and height | Mark Haines | 2015-02-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | Spell height more correctly | Mark Haines | 2015-02-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add a media/v1/identicon resource for generating identicons using pydenticon | Mark Haines | 2015-02-02 | 3 | -0/+51 |
| | | | | |||||
* | | | | less obscure xargs | Matthew Hodgson | 2015-02-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Generate a list of dependencies from synapse/python_dependencies.py | Mark Haines | 2015-02-02 | 1 | -0/+41 |
| | | | | |||||
* | | | | fix typo | Matthew Hodgson | 2015-02-02 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge master into develop | Mark Haines | 2015-02-02 | 3 | -4/+4 |
|\ \ \ | |/ / |/| / | |/ | | | | | Conflicts: README.rst setup.py | ||||
| * | fix OSX stuff and typos | Matthew Hodgson | 2015-02-02 | 1 | -2/+3 |
| | | |||||
| * | Merge pull request #45 from matrix-org/hotfixes-v0.6.1d v0.6.1d | Mark Haines | 2015-02-02 | 3 | -3/+4 |
| |\ | | | | | | | Hotfixes v0.6.1d | ||||
| | * | Bump version to 0.6.1d | Mark Haines | 2015-02-02 | 2 | -2/+2 |
| | | | |||||
| | * | Pin the version of Twisted to 14.0.2 since we are using some of its internals | Mark Haines | 2015-02-02 | 1 | -1/+2 |
| |/ | |||||
| * | Tell people to "source" the activate script for virtualenv, Remove --user ↵ | Mark Haines | 2015-02-02 | 1 | -7/+7 |
| | | | | | | | | from pip install | ||||
| * | Update documentation to recommend virtual env | Mark Haines | 2015-02-02 | 1 | -21/+15 |
| | | | | | | | | | | Conflicts: README.rst | ||||
| * | Merge branch 'hotfixes-v0.6.1c' of github.com:matrix-org/synapse v0.6.1c | Erik Johnston | 2015-02-02 | 3 | -4/+4 |
| |\ | |||||
| | * | Use >= for version of webclient | Erik Johnston | 2015-02-02 | 1 | -1/+1 |
| | | | |||||
| | * | Bump version | Erik Johnston | 2015-02-02 | 2 | -2/+2 |
| | | | |||||
| | * | Bump version of webclient pulled in. | Erik Johnston | 2015-02-02 | 1 | -2/+2 |
| |/ | |||||
* | | Ignore empty strings for display names & room names in notifications | David Baker | 2015-01-31 | 1 | -2/+2 |
| | | |||||
* | | fix OSX stuff and typos | Matthew Hodgson | 2015-01-31 | 1 | -2/+3 |
| | | |||||
* | | Again, don't assume all member events have displayname. | David Baker | 2015-01-30 | 1 | -1/+1 |
| | | |||||
* | | Don't assume all member events have a display nme. | David Baker | 2015-01-30 | 1 | -4/+5 |
| | | |||||
* | | Resign events when we return them via /query_auth/ | Erik Johnston | 2015-01-30 | 1 | -0/+9 |
| | | |||||
* | | s/homeserver.config/homeserver.yaml/ because that's what synctl looks for. | David Baker | 2015-01-30 | 1 | -5/+5 |
| | | |||||
* | | Add twisted to setup requires so it gets processed before setuptools_trial | David Baker | 2015-01-30 | 1 | -0/+1 |
| | | |||||
* | | add generate config instruction to the HS setup part | David Baker | 2015-01-30 | 1 | -0/+9 |
| | | |||||
* | | Tell people to "source" the activate script for virtualenv, Remove --user ↵ | Mark Haines | 2015-01-30 | 1 | -7/+7 |
| | | | | | | | | from pip install | ||||
* | | Update documentation to recommend virtual env | Mark Haines | 2015-01-30 | 1 | -30/+15 |
| | | |||||
* | | Return empty list rather than None when there are no emphemeral events for a ↵ | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| | | | | | | | | room | ||||
* | | Fix bug where accepting invite over federation didn't work. Add logging. | Erik Johnston | 2015-01-30 | 1 | -8/+49 |
| | | |||||
* | | Merge pull request #43 from matrix-org/rejections | Erik Johnston | 2015-01-30 | 16 | -172/+708 |
|\ \ | | | | | | | Rejections | ||||
| * | | Briefly doc structure of query_auth API. | Erik Johnston | 2015-01-30 | 1 | -0/+18 |
| | | | |||||
| * | | Only auth_events with event if event in event.auth_events | Erik Johnston | 2015-01-30 | 1 | -1/+3 |
| | | | |||||
| * | | Remove debug logging | Erik Johnston | 2015-01-30 | 1 | -9/+0 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 19 | -25/+1166 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/schema/im.sql | ||||
| * \ \ | Merge branch 'replication_split' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 4 | -10/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections Conflicts: synapse/storage/schema/delta/v12.sql | ||||
| * | | | | Fix bug where we superfluously asked for current state. Change API of ↵ | Erik Johnston | 2015-01-30 | 5 | -49/+43 |
| | | | | | | | | | | | | | | | | | | | | /query_auth/ so that we don't duplicate events in the response. | ||||
| * | | | | Revert accidental bumping of angluar_sdk dep | Erik Johnston | 2015-01-30 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix bad merge fo python_dependencies.py | Erik Johnston | 2015-01-30 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 51 | -326/+2392 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| * | | | | | Update the current state of an event if we update auth events. | Erik Johnston | 2015-01-30 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Fix bug in timeout handling in keyclient | Erik Johnston | 2015-01-30 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | Fix regression where we no longer correctly handled the case of gaps in our ↵ | Erik Johnston | 2015-01-30 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | event graph | ||||
| * | | | | | Fix bug where we changes in outlier in metadata dict propogated to other events | Erik Johnston | 2015-01-30 | 3 | -4/+8 |
| | | | | | | |||||
| * | | | | | Initial implementation of auth conflict resolution | Erik Johnston | 2015-01-29 | 8 | -81/+210 |
| | | | | | | |||||
| * | | | | | Make post_json(...) actually send data. | Erik Johnston | 2015-01-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add post_json(...) method to federation client | Erik Johnston | 2015-01-29 | 1 | -0/+37 |
| | | | | | | |||||
| * | | | | | Start implementing auth conflict res | Erik Johnston | 2015-01-28 | 6 | -52/+253 |
| | | | | | | |||||
| * | | | | | Make it the responsibility of the replication layer to check signature and ↵ | Erik Johnston | 2015-01-26 | 3 | -26/+173 |
| | | | | | | | | | | | | | | | | | | | | | | | | hashes. | ||||
* | | | | | | Allow any greater version for webclient | Erik Johnston | 2015-01-30 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Spit out server default rules too. | David Baker | 2015-01-30 | 2 | -10/+17 |
| | | | | | | |||||
* | | | | | | Merge pull request #41 from matrix-org/client_v2_sync | Mark Haines | 2015-01-30 | 7 | -46/+794 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Client v2 sync | ||||
| * | | | | | Add doc string for __nonzero__ overrides for sync results, raise not ↵ | Mark Haines | 2015-01-30 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | implemented if the client attempts to do a gapless sync | ||||
| * | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-30 | 2 | -10/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | Check if the user has joined the room between incremental syncs | Mark Haines | 2015-01-30 | 1 | -4/+27 |
| | | | | | | | |||||
| * | | | | | | Pass client info to the sync_config | Mark Haines | 2015-01-30 | 2 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | Fix token formatting | Mark Haines | 2015-01-30 | 2 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Filter the recent events before applying the limit when doing an initial sync | Mark Haines | 2015-01-30 | 1 | -11/+10 |
| | | | | | | | |||||
| * | | | | | | Filter the recent events before applying the limit when doing an incremental ↵ | Mark Haines | 2015-01-30 | 4 | -24/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | sync with a gap | ||||
| * | | | | | | Update todo for the filtering on sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Add basic filtering support | Mark Haines | 2015-01-29 | 1 | -5/+14 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 3 | -164/+166 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix indent | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Move typing notifs to an "emphermal" event list on the room object | Mark Haines | 2015-01-29 | 2 | -7/+9 |
| | | | | | | | | |||||
| * | | | | | | | Fix check for empty room update | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix v2 initial sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 9 | -40/+54 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 15 | -20/+1100 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| * | | | | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of ↵ | Mark Haines | 2015-01-29 | 2 | -11/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes is small | ||||
| * | | | | | | | | | | Remove typing TODO | Mark Haines | 2015-01-29 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add typing notifications to sync | Mark Haines | 2015-01-29 | 2 | -19/+29 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Include transaction ids in unsigned section of events in the sync results ↵ | Mark Haines | 2015-01-29 | 2 | -12/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the clients that made those requests | ||||
| * | | | | | | | | | | Add support for formatting events in the way a v2 client expects | Mark Haines | 2015-01-29 | 1 | -39/+52 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add ports back to demo/start.sh | Mark Haines | 2015-01-28 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-28 | 42 | -300/+2092 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix Formatting | Mark Haines | 2015-01-27 | 4 | -14/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Wait for events if the incremental sync is empty and a timeout is given | Mark Haines | 2015-01-27 | 3 | -8/+61 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Start implementing incremental initial sync | Mark Haines | 2015-01-27 | 3 | -34/+241 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Start implementing the non-incremental sync portion of the v2 /sync API | Mark Haines | 2015-01-26 | 4 | -54/+146 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 8 | -21/+60 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add handler for /sync API | Mark Haines | 2015-01-26 | 1 | -0/+110 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| * | | | | | | | | | | | | | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 2 | -1/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Start implementing the v2_alpha sync API | Mark Haines | 2015-01-23 | 5 | -0/+272 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #42 from matrix-org/replication_split | Mark Haines | 2015-01-30 | 5 | -886/+993 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | Replication split | ||||
| * | | | | | | | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 52 | -333/+2390 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | replication_split | ||||
| * | | | | | | | | | | | | | Split up replication_layer module into client, server and transaction queue | Erik Johnston | 2015-01-26 | 5 | -603/+654 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-23 | 96 | -1707/+599 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add storage method have_events | Erik Johnston | 2015-01-23 | 1 | -0/+29 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Split out TransactionQueue from replication layer | Erik Johnston | 2015-01-22 | 2 | -289/+316 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections | ||||
* | | | | | | | | | | | | | | | | Add glob asterisks when running rules. | David Baker | 2015-01-30 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Means that now you can't do exact matches even in override rules, but I think we can live with that. Advantage is that you'll now always get back what was put in to the API. | ||||
* | | | | | | | | | | | | | | | | Merge pull request #40 from matrix-org/rejections_storage | Mark Haines | 2015-01-30 | 6 | -11/+86 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rejections storage | ||||
| * | | | | | | | | | | | | | | | | Remove merge conflict | Erik Johnston | 2015-01-30 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Remember to add schema file to list | Erik Johnston | 2015-01-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 14 | -11/+1140 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 11 | -5/+1072 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | Client v2 filter | ||||
| * | | | | | | | | | | | | | | | | Use 'in' to test if the key exists, remove unused _filters_for_user | Mark Haines | 2015-01-30 | 2 | -10/+2 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Unused import | Mark Haines | 2015-01-30 | 1 | -2/+0 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 3 | -164/+166 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | split the storage and management of filters from the actual filter code and don't have to load a filter from the db each time we filter an event | ||||
| * | | | | | | | | | | | | | | Merge branch 'develop' into client_v2_filter | Mark Haines | 2015-01-29 | 8 | -27/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Fix code-style | Mark Haines | 2015-01-29 | 1 | -13/+6 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 2 | -2/+3 |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge changes from develop | Mark Haines | 2015-01-29 | 42 | -302/+2052 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Move bump schema delta | Mark Haines | 2015-01-29 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add filter_room_state unit tests. | Kegan Dougal | 2015-01-29 | 1 | -0/+56 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add basic filtering public API unit tests. Use defers in the right places. | Kegan Dougal | 2015-01-29 | 2 | -5/+60 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add more unit tests for the filter algorithm. | Kegan Dougal | 2015-01-29 | 1 | -5/+259 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Implement filter algorithm. Add basic event type unit tests to assert it works. | Kegan Dougal | 2015-01-29 | 2 | -1/+93 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add filtering public API; outline filtering algorithm. | Kegan Dougal | 2015-01-29 | 1 | -8/+52 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add filtering.filter_events function, with stub passes_filter function. | Kegan Dougal | 2015-01-29 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Also edit the filter column on the delta SQL | Kegan Dougal | 2015-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | s/definition/filter_json/ since definition is now used to mean a component ↵ | Kegan Dougal | 2015-01-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the filter, rather than the complete json | ||||
| * | | | | | | | | | | | | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 4 | -11/+128 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Created schema delta | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -1/+25 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Initial stab at real SQL storage implementation of user filter definitions | Paul "LeoNerd" Evans | 2015-01-27 | 4 | -15/+78 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | More unit-testing of REST errors | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -1/+35 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Move storage of user filters into real datastore layer; now have to mock it ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 5 | -27/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out in the REST-level tests | ||||
| * | | | | | | | | | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -7/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation nicely | ||||
| * | | | | | | | | | | | | | | Initial trivial unittest of Filtering object | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+67 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -13/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of user filters into there | ||||
| * | | | | | | | | | | | | | | Use new V2AlphaRestTestCase | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -38/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 8 | -21/+90 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Minor changes to v2_alpha filter REST test to allow the setUp method to be ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shareable | ||||
| * | | | | | | | | | | | | | | | Initial trivial REST test of v2_alpha filter API | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+74 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ↵ | Paul "LeoNerd" Evans | 2015-01-26 | 2 | -1/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actual filter implementation | ||||
* | | | | | | | | | | | | | | | | Add room member count condition and default rule to make a noise on rooms of ↵ | David Baker | 2015-01-30 | 3 | -6/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only 2 people. | ||||
* | | | | | | | | | | | | | | | | Merge pull request #38 from matrix-org/new_state_resolution | Mark Haines | 2015-01-30 | 2 | -121/+441 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New state resolution | ||||
| * | | | | | | | | | | | | | | | | Add a slightly more helpful comment | Erik Johnston | 2015-01-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | | Be more specific in naming columns in selects. | Erik Johnston | 2015-01-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | | Put CREATE rejections into seperate .sql | Erik Johnston | 2015-01-30 | 2 | -7/+21 |
| | | | | | | |_|_|/ / / / / / / | | | | | | |/| | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections_storage | ||||
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 125 | -2084/+3048 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new_state_resolution | ||||
| | | | | | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 125 | -2083/+3034 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
* | | | | | | | | | | | | | | | | We do need Twisted 14, not 15: we use internal Twisted things that have been ↵ | David Baker | 2015-01-30 | 2 | -2/+2 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed in 15. | ||||
* | | | | | | | | | | | | | | | Include content in notification pokes | David Baker | 2015-01-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | |