summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Blunty replace json with simplejsonErik Johnston2015-02-1121-21/+21
|
* Mention new libs in CHANGESErik Johnston2015-02-111-0/+2
|
* Merge pull request #63 from matrix-org/homeserver_test_setupMark Haines2015-02-1125-360/+140
|\ | | | | Factor out some of the common homeserver setup code
| * Factor out some of the common homeserver setup code into aMark Haines2015-02-1125-360/+140
| | | | | | | | setup_test_homeserver function in utils.
* | Fix bug where variable was not always definedErik Johnston2015-02-111-2/+1
| |
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-111-1/+1
|\ \ | |/ |/|
| * Merge pull request #59 from matrix-org/hotfixes-v0.6.1f v0.6.1fErik Johnston2015-02-103-4/+6
| |\ | | | | | | Hotfixes v0.6.1f
| | * Bump versionErik Johnston2015-02-102-2/+2
| | |
| | * Fix prune_events to work with nested dictsErik Johnston2015-02-101-2/+4
| |/
| * Pin the twisted version so that it doesn't pull in twisted 15. v0.6.1eErik Johnston2015-02-041-1/+1
| |
| * Merge pull request #48 from matrix-org/hotfixes-v0.6.1eMatthew Hodgson2015-02-044-7/+138
| |\ | | | | | | Hotfixes v0.6.1e
| | * Ver bumpErik Johnston2015-02-042-2/+2
| | |
| | * Pull in python_dependencies.py from developErik Johnston2015-02-041-0/+122
| | |
| | * Bluntly port changes of README from develop to masterErik Johnston2015-02-041-5/+14
| | |
| * | Revert "Pull in python_dependencies.py from develop"Erik Johnston2015-02-041-122/+0
| | | | | | | | | | | | This reverts commit 47b1e1491f7f98b57f4b6894f0d4d333e64bf721.
| * | Pull in python_dependencies.py from developErik Johnston2015-02-041-0/+122
| |/
* | Merge pull request #60 from matrix-org/single_source_version_and_dependenciesMark Haines2015-02-103-39/+29
|\ \ | | | | | | Single source version and dependencies
| * | Rename path to path_segments to make it clearer that it is a listMark Haines2015-02-101-4/+4
| | |
| * | Merge branch 'develop' into single_source_version_and_dependenciesMark Haines2015-02-107-12/+12
| |\ \ | |/ / |/| |
* | | Fix code-styleMark Haines2015-02-107-12/+12
| | |
| * | Add the 'setup_requires' and allow easy_install since jenkins uses themMark Haines2015-02-101-14/+5
| | |
| * | Single source version and python dependencies, prevent people accidentally ↵Mark Haines2015-02-103-44/+43
|/ / | | | | | | installing with easy_install, use scripts rather than entry_points to install synctl
* | Log all the exits from _attempt_new_transactionErik Johnston2015-02-101-2/+7
| |
* | Code-style fixesMark Haines2015-02-1011-36/+57
| |
* | Sign auth_chains when returned by /state/ requestsErik Johnston2015-02-101-0/+11
| |
* | Merge pull request #58 from matrix-org/get_event_countersMark Haines2015-02-101-26/+62
|\ \ | | | | | | Add performance counters for different stages of loading events
| * | Fix pyflakesMark Haines2015-02-101-3/+3
| | |
| * | Add performance counters for different stages of loading eventsMark Haines2015-02-101-24/+60
| | |
* | | yaml.load expects strings to be a yaml rather than fileErik Johnston2015-02-101-1/+2
| | |
* | | Use yaml logging config format because it is much nicerErik Johnston2015-02-101-1/+2
| | |
* | | Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into developErik Johnston2015-02-101-1/+6
|\ \ \ | |/ / |/| |
| * | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵Mark Haines2015-02-061-1/+3
| | | | | | | | | | | | topological token to a stream token before passing it to get_recent_events_for_room
| * | Explicitly list the RejectedReasons that we can proveErik Johnston2015-02-061-1/+6
| | |
* | | Convert directory paths to absolute paths before daemonizingMark Haines2015-02-091-2/+3
| | |
* | | Merge pull request #56 from matrix-org/room_initial_sync_perfMark Haines2015-02-094-21/+43
|\ \ \ | | | | | | | | During room intial sync, only calculate current state once.
| * | | During room intial sync, only calculate current state once.Erik Johnston2015-02-094-21/+43
| | | |
* | | | Merge pull request #57 from matrix-org/transaction_countersErik Johnston2015-02-091-2/+31
|\ \ \ \ | | | | | | | | | | Transaction counters
| * | | | Use the transaction 'desc' rather than 'name', increment the txn_ids inMark Haines2015-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | txn names
| * | | | FormattingMark Haines2015-02-091-1/+0
| | | | |
| * | | | Performance counters for database transaction namesMark Haines2015-02-091-1/+31
| |/ / /
* | | | Need to use re.search if looking for matches not at the start of the string. ↵David Baker2015-02-091-3/+3
| | | | | | | | | | | | | | | | Also comparisons with None should be 'is'.
* | | | oopsMatthew Hodgson2015-02-091-1/+1
| | | |
* | | | oopsMatthew Hodgson2015-02-091-1/+1
| | | |
* | | | only do word-boundary patches on bodies for nowMatthew Hodgson2015-02-092-2/+5
|/ / /
* | | Merge pull request #55 from matrix-org/profilingErik Johnston2015-02-096-6/+60
|\ \ \ | | | | | | | | Profiling
| * | | Fix typoErik Johnston2015-02-091-1/+1
| | | |
| * | | Add looping_call to ClockErik Johnston2015-02-091-1/+9
| | | |
| * | | Log database time every 10s and log as percentageErik Johnston2015-02-091-2/+2
| | | |
| * | | Time how long we're spending on the database threadErik Johnston2015-02-092-0/+27
| | | |
| * | | Log when we receive a request, when we send a response and how long it took ↵Erik Johnston2015-02-094-5/+24
| | | | | | | | | | | | | | | | to process it.
* | | | Fix server default rule injection (downwards, not upwards!)David Baker2015-02-091-6/+6
|/ / /
* | | glob *s should probably be non-greedyMatthew Hodgson2015-02-081-1/+1
| | |
* | | oopsMatthew Hodgson2015-02-081-1/+1
| | |
* | | kill off fnmatch in favour of word-boundary based push alerts (untested)Matthew Hodgson2015-02-081-12/+20
| | |
* | | Merge pull request #53 from matrix-org/default_avatar_identiconsMatthew Hodgson2015-02-073-25/+88
|\ \ \ | | | | | | | | create identicons for new users by default as default avatars
| * | | don't give up if we can't create default avatars during testsMatthew Hodgson2015-02-071-9/+12
| | | |
| * | | add some options and docMatthew Hodgson2015-02-071-5/+20
| | | |
| * | | ...and here's the actual impl. git fail.Matthew Hodgson2015-02-072-25/+46
| | | |
| * | | create identicons for new users by default as default avatars, and provide ↵Matthew Hodgson2015-02-071-0/+24
| | | | | | | | | | | | | | | | script to update existing avatarless users
* | | | clean up TurnedToDust's ArchLinux notes a bitMatthew Hodgson2015-02-071-18/+26
| | | |
* | | | Merge pull request #52 from TurnedToDust/patch-2Matthew Hodgson2015-02-071-0/+38
|\ \ \ \ | |/ / / |/| | | Thanks Dust - this is great :) will merge to develop and tweak it slightly there.
| * | | Update to README.rstTurnedToDust2015-02-061-0/+38
| | | | | | | | | | | | Added Documentation regarding ArchLinux
* | | | thou shalt specify a content-lengthMatthew Hodgson2015-02-071-0/+1
| | | |
* | | | i hate weakly typed languagesMatthew Hodgson2015-02-071-1/+1
|/ / /
* / / SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵Mark Haines2015-02-061-1/+3
|/ / | | | | | | topological token to a stream token before passing it to get_recent_events_for_room
* | Move delta/v13.sql to delta/v12.sqlErik Johnston2015-02-062-24/+11
| |
* | Don't query auth if the only difference is events that were rejected due to ↵Erik Johnston2015-02-061-56/+72
| | | | | | | | auth.
* | Make seen_ids a setErik Johnston2015-02-061-1/+3
| |
* | Return body of response in HttpResponseExceptionErik Johnston2015-02-061-1/+2
| |
* | Handle the fact the list.remove raises if element doesn't existErik Johnston2015-02-061-4/+10
| |
* | priority class now dealt with in namespaced rule_idDavid Baker2015-02-051-4/+0
| |
* | Give server default rules the 'default' attribute and fix various brokenness.David Baker2015-02-053-3/+9
| |
* | Server default rules now of all kinds rather than all being at lowest prio.David Baker2015-02-054-51/+98
| |
* | namespace rule IDs to be unique within their scope and rule type.David Baker2015-02-051-123/+129
| |
* | Merge branch 'federation_client_retries' of github.com:matrix-org/synapse ↵Erik Johnston2015-02-058-89/+169
|\ \ | | | | | | | | | into develop
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-053-5/+82
| |\ \ | | | | | | | | | | | | federation_client_retries
| * | | Connection errors in twisted aren't RuntimeErrorsErik Johnston2015-02-051-2/+2
| | | |
| * | | Pass through list of room hosts from room alias query to federation so that ↵Erik Johnston2015-02-053-15/+22
| | | | | | | | | | | | | | | | it can retry against different room hosts
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-0416-49/+146
| |\ \ \ | | | | | | | | | | | | | | | federation_client_retries
| * \ \ \ Merge branch 'signature_failures' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-043-9/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | federation_client_retries
| * | | | | Apply sanity to the transport client interface. Convert 'make_join' and ↵Erik Johnston2015-02-046-71/+130
| | | | | | | | | | | | | | | | | | | | | | | | 'send_join' to accept iterables of destinations
| * | | | | When returning lists of servers from alias lookups, put the current server ↵Erik Johnston2015-02-041-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | first in the list
| * | | | | Retry make_joinErik Johnston2015-02-041-7/+12
| | | | | |
* | | | | | Merge pull request #47 from matrix-org/signature_failuresErik Johnston2015-02-059-272/+429
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | Federation fixes.
| * | | | Change context.auth_events to what the auth_events would be bases on ↵Erik Johnston2015-02-043-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 Johnston2015-02-041-0/+6
| | | | | | | | | | | | | | | | not others
| * | | Fix state resolution to remember join_rules is a type of auth event.Erik Johnston2015-02-041-1/+13
| | | |
| * | | Rearrange persist_event so that do all the queries that need to be done ↵Erik Johnston2015-02-043-72/+77
| | | | | | | | | | | | | | | | before returning early if we have already persisted that event.
| * | | Add doc to get_eventErik Johnston2015-02-031-0/+15
| | | |
| * | | New lineErik Johnston2015-02-031-1/+1
| | | |
| * | | Neaten the handling of state and auth_chain up a bitErik Johnston2015-02-031-27/+30
| | | |
| * | | Actually, the old prune_event function was non-deterministic, so no point ↵Erik Johnston2015-02-032-91/+4
| | | | | | | | | | | | | | | | keeping it around :(
| * | | Remove unused importsErik Johnston2015-02-031-5/+0
| | | |
| * | | Add new FederationBaseErik Johnston2015-02-031-0/+126
| | | |
| * | | Keep around the old (buggy) version of the prune_event function so that we ↵Erik Johnston2015-02-034-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 failErik Johnston2015-02-031-63/+72
| | | |
| * | | Set combinations is | and not +Erik Johnston2015-02-031-2/+2
| | | |
| * | | SpellingErik Johnston2015-02-031-1/+1
| | | |
| * | | Give exception better messageErik Johnston2015-02-031-1/+1
| | | |
| * | | Add FIXME note.Erik Johnston2015-02-031-0/+2
| | | |
| * | | PEP8Erik Johnston2015-02-031-1/+0
| | | |
| * | | Return rejected events if asked for it over federation.Erik Johnston2015-02-031-0/+1
| | | |
| * | | Try to ensure we don't persist an event we have already persisted. In ↵Erik Johnston2015-02-033-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 serverErik Johnston2015-02-021-16/+17
| | | |
| * | | Don't fail an entire request if one of the returned events fails a signature ↵Erik Johnston2015-02-022-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 Johnston2015-02-051-5/+12
| | | | | | | | | | | | | | | | instead of as ERROR since they were spamming the logs
* | | | Print out the auth events on failureErik Johnston2015-02-051-1/+1
| | | |
* | | | Add script to check and auth chain and current state of a roomErik Johnston2015-02-041-0/+65
| | | |
* | | | Mention new pydenticon dep.Erik Johnston2015-02-041-0/+5
| |/ / |/| |
* | | More s/instance_handle/profile_tag/David Baker2015-02-041-5/+5
| | |
* | | s/instance_handle/profile_tag/David Baker2015-02-038-37/+37
| | |
* | | Use set_tweak instead of set_soundDavid Baker2015-02-032-3/+4
| | |
* | | Merge pull request #46 from matrix-org/identiconsMark Haines2015-02-024-0/+55
|\ \ \ | | | | | | | | Add a media/v1/identicon resource for generating identicons
| * | | Add pydenticon to python_dependenciesMark Haines2015-02-021-0/+1
| | | |
| * | | Add Cache-Control header to identiconMark Haines2015-02-021-0/+3
| | | |
| * | | Fix setting identicon width and heightMark Haines2015-02-021-2/+2
| | | |
| * | | Spell height more correctlyMark Haines2015-02-021-1/+1
| | | |
| * | | Add a media/v1/identicon resource for generating identicons using pydenticonMark Haines2015-02-023-0/+51
| | | |
* | | | less obscure xargsMatthew Hodgson2015-02-021-1/+1
| | | |
* | | | Generate a list of dependencies from synapse/python_dependencies.pyMark Haines2015-02-021-0/+41
| | | |
* | | | fix typoMatthew Hodgson2015-02-021-1/+1
|/ / /
* | | Merge master into developMark Haines2015-02-023-4/+4
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: README.rst setup.py
| * fix OSX stuff and typosMatthew Hodgson2015-02-021-2/+3
| |
| * Merge pull request #45 from matrix-org/hotfixes-v0.6.1d v0.6.1dMark Haines2015-02-023-3/+4
| |\ | | | | | | Hotfixes v0.6.1d
| | * Bump version to 0.6.1dMark Haines2015-02-022-2/+2
| | |
| | * Pin the version of Twisted to 14.0.2 since we are using some of its internalsMark Haines2015-02-021-1/+2
| |/
| * Tell people to "source" the activate script for virtualenv, Remove --user ↵Mark Haines2015-02-021-7/+7
| | | | | | | | from pip install
| * Update documentation to recommend virtual envMark Haines2015-02-021-21/+15
| | | | | | | | | | Conflicts: README.rst
| * Merge branch 'hotfixes-v0.6.1c' of github.com:matrix-org/synapse v0.6.1cErik Johnston2015-02-023-4/+4
| |\
| | * Use >= for version of webclientErik Johnston2015-02-021-1/+1
| | |
| | * Bump versionErik Johnston2015-02-022-2/+2
| | |
| | * Bump version of webclient pulled in.Erik Johnston2015-02-021-2/+2
| |/
* | Ignore empty strings for display names & room names in notificationsDavid Baker2015-01-311-2/+2
| |
* | fix OSX stuff and typosMatthew Hodgson2015-01-311-2/+3
| |
* | Again, don't assume all member events have displayname.David Baker2015-01-301-1/+1
| |
* | Don't assume all member events have a display nme.David Baker2015-01-301-4/+5
| |
* | Resign events when we return them via /query_auth/Erik Johnston2015-01-301-0/+9
| |
* | s/homeserver.config/homeserver.yaml/ because that's what synctl looks for.David Baker2015-01-301-5/+5
| |
* | Add twisted to setup requires so it gets processed before setuptools_trialDavid Baker2015-01-301-0/+1
| |
* | add generate config instruction to the HS setup partDavid Baker2015-01-301-0/+9
| |
* | Tell people to "source" the activate script for virtualenv, Remove --user ↵Mark Haines2015-01-301-7/+7
| | | | | | | | from pip install
* | Update documentation to recommend virtual envMark Haines2015-01-301-30/+15
| |
* | Return empty list rather than None when there are no emphemeral events for a ↵Mark Haines2015-01-301-1/+1
| | | | | | | | room
* | Fix bug where accepting invite over federation didn't work. Add logging.Erik Johnston2015-01-301-8/+49
| |
* | Merge pull request #43 from matrix-org/rejectionsErik Johnston2015-01-3016-172/+708
|\ \ | | | | | | Rejections
| * | Briefly doc structure of query_auth API.Erik Johnston2015-01-301-0/+18
| | |
| * | Only auth_events with event if event in event.auth_eventsErik Johnston2015-01-301-1/+3
| | |
| * | Remove debug loggingErik Johnston2015-01-301-9/+0
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-3019-25/+1166
| |\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/storage/schema/im.sql
| * \ \ Merge branch 'replication_split' of github.com:matrix-org/synapse into ↵Erik Johnston2015-01-304-10/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections Conflicts: synapse/storage/schema/delta/v12.sql
| * | | | Fix bug where we superfluously asked for current state. Change API of ↵Erik Johnston2015-01-305-49/+43
| | | | | | | | | | | | | | | | | | | | /query_auth/ so that we don't duplicate events in the response.
| * | | | Revert accidental bumping of angluar_sdk depErik Johnston2015-01-301-2/+2
| | | | |
| * | | | Fix bad merge fo python_dependencies.pyErik Johnston2015-01-301-1/+0
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-3051-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 Johnston2015-01-301-1/+3
| | | | | |
| * | | | | Fix bug in timeout handling in keyclientErik Johnston2015-01-301-3/+4
| | | | | |
| * | | | | Fix regression where we no longer correctly handled the case of gaps in our ↵Erik Johnston2015-01-302-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | event graph
| * | | | | Fix bug where we changes in outlier in metadata dict propogated to other eventsErik Johnston2015-01-303-4/+8
| | | | | |
| * | | | | Initial implementation of auth conflict resolutionErik Johnston2015-01-298-81/+210
| | | | | |
| * | | | | Make post_json(...) actually send data.Erik Johnston2015-01-291-1/+1
| | | | | |
| * | | | | Add post_json(...) method to federation clientErik Johnston2015-01-291-0/+37
| | | | | |
| * | | | | Start implementing auth conflict resErik Johnston2015-01-286-52/+253
| | | | | |
| * | | | | Make it the responsibility of the replication layer to check signature and ↵Erik Johnston2015-01-263-26/+173
| | | | | | | | | | | | | | | | | | | | | | | | hashes.
* | | | | | Allow any greater version for webclientErik Johnston2015-01-301-1/+1
| | | | | |
* | | | | | Spit out server default rules too.David Baker2015-01-302-10/+17
| | | | | |
* | | | | | Merge pull request #41 from matrix-org/client_v2_syncMark Haines2015-01-307-46/+794
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Client v2 sync
| * | | | | Add doc string for __nonzero__ overrides for sync results, raise not ↵Mark Haines2015-01-301-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | implemented if the client attempts to do a gapless sync
| * | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-302-10/+2
| |\ \ \ \ \
| * | | | | | Check if the user has joined the room between incremental syncsMark Haines2015-01-301-4/+27
| | | | | | |
| * | | | | | Pass client info to the sync_configMark Haines2015-01-302-3/+4
| | | | | | |
| * | | | | | Fix token formattingMark Haines2015-01-302-5/+5
| | | | | | |
| * | | | | | Filter the recent events before applying the limit when doing an initial syncMark Haines2015-01-301-11/+10
| | | | | | |
| * | | | | | Filter the recent events before applying the limit when doing an incremental ↵Mark Haines2015-01-304-24/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sync with a gap
| * | | | | | Update todo for the filtering on syncMark Haines2015-01-291-1/+2
| | | | | | |
| * | | | | | Add basic filtering supportMark Haines2015-01-291-5/+14
| | | | | | |
| * | | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-293-164/+166
| |\ \ \ \ \ \
| * | | | | | | Fix indentMark Haines2015-01-291-1/+1
| | | | | | | |
| * | | | | | | Move typing notifs to an "emphermal" event list on the room objectMark Haines2015-01-292-7/+9
| | | | | | | |
| * | | | | | | Fix check for empty room updateMark Haines2015-01-291-1/+1
| | | | | | | |
| * | | | | | | Fix v2 initial syncMark Haines2015-01-291-1/+2
| | | | | | | |
| * | | | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-299-40/+54
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-292-2/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-2915-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 Haines2015-01-292-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes is small
| * | | | | | | | | | Remove typing TODOMark Haines2015-01-291-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Add typing notifications to syncMark Haines2015-01-292-19/+29
| | | | | | | | | | |
| * | | | | | | | | | Include transaction ids in unsigned section of events in the sync results ↵Mark Haines2015-01-292-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the clients that made those requests
| * | | | | | | | | | Add support for formatting events in the way a v2 client expectsMark Haines2015-01-291-39/+52
| | | | | | | | | | |
| * | | | | | | | | | Add ports back to demo/start.shMark Haines2015-01-282-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-2842-300/+2092
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix FormattingMark Haines2015-01-274-14/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Wait for events if the incremental sync is empty and a timeout is givenMark Haines2015-01-273-8/+61
| | | | | | | | | | | |
| * | | | | | | | | | | Start implementing incremental initial syncMark Haines2015-01-273-34/+241
| | | | | | | | | | | |
| * | | | | | | | | | | Start implementing the non-incremental sync portion of the v2 /sync APIMark Haines2015-01-264-54/+146
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-268-21/+60
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add handler for /sync APIMark Haines2015-01-261-0/+110
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-262-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py
| * | | | | | | | | | | | | Add client v2_alpha resource to synapse server resource treeMark Haines2015-01-232-1/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Start implementing the v2_alpha sync APIMark Haines2015-01-235-0/+272
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #42 from matrix-org/replication_splitMark Haines2015-01-305-886/+993
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | Replication split
| * | | | | | | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into ↵Erik Johnston2015-01-3052-333/+2390
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | replication_split
| * | | | | | | | | | | | | Split up replication_layer module into client, server and transaction queueErik Johnston2015-01-265-603/+654
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-2396-1707/+599
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add storage method have_eventsErik Johnston2015-01-231-0/+29
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Split out TransactionQueue from replication layerErik Johnston2015-01-222-289/+316
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into ↵Erik Johnston2015-01-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections
* | | | | | | | | | | | | | | | Add glob asterisks when running rules.David Baker2015-01-302-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_storageMark Haines2015-01-306-11/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rejections storage
| * | | | | | | | | | | | | | | | Remove merge conflictErik Johnston2015-01-301-3/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remember to add schema file to listErik Johnston2015-01-301-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storageErik Johnston2015-01-3014-11/+1140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py
* | | | | | | | | | | | | | | | | Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-3011-5/+1072
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | Client v2 filter
| * | | | | | | | | | | | | | | | Use 'in' to test if the key exists, remove unused _filters_for_userMark Haines2015-01-302-10/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Unused importMark Haines2015-01-301-2/+0
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-293-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_filterMark Haines2015-01-298-27/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix code-styleMark Haines2015-01-291-13/+6
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge in auth changes from developMark Haines2015-01-292-2/+3
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge changes from developMark Haines2015-01-2942-302/+2052
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Move bump schema deltaMark Haines2015-01-291-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add filter_room_state unit tests.Kegan Dougal2015-01-291-0/+56
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add basic filtering public API unit tests. Use defers in the right places.Kegan Dougal2015-01-292-5/+60
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add more unit tests for the filter algorithm.Kegan Dougal2015-01-291-5/+259
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Implement filter algorithm. Add basic event type unit tests to assert it works.Kegan Dougal2015-01-292-1/+93
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add filtering public API; outline filtering algorithm.Kegan Dougal2015-01-291-8/+52
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add filtering.filter_events function, with stub passes_filter function.Kegan Dougal2015-01-291-0/+15
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Also edit the filter column on the delta SQLKegan Dougal2015-01-291-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | s/definition/filter_json/ since definition is now used to mean a component ↵Kegan Dougal2015-01-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the filter, rather than the complete json
| * | | | | | | | | | | | | | Add filter JSON sanity checks.Kegan Dougal2015-01-284-11/+128
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Created schema deltaPaul "LeoNerd" Evans2015-01-272-1/+25
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Initial stab at real SQL storage implementation of user filter definitionsPaul "LeoNerd" Evans2015-01-274-15/+78
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | More unit-testing of REST errorsPaul "LeoNerd" Evans2015-01-271-1/+35
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move storage of user filters into real datastore layer; now have to mock it ↵Paul "LeoNerd" Evans2015-01-275-27/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out in the REST-level tests
| * | | | | | | | | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore ↵Paul "LeoNerd" Evans2015-01-273-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation nicely
| * | | | | | | | | | | | | | Initial trivial unittest of Filtering objectPaul "LeoNerd" Evans2015-01-271-0/+67
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ↵Paul "LeoNerd" Evans2015-01-273-13/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of user filters into there
| * | | | | | | | | | | | | | Use new V2AlphaRestTestCasePaul "LeoNerd" Evans2015-01-271-38/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-278-21/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Minor changes to v2_alpha filter REST test to allow the setUp method to be ↵Paul "LeoNerd" Evans2015-01-271-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shareable
| * | | | | | | | | | | | | | | Initial trivial REST test of v2_alpha filter APIPaul "LeoNerd" Evans2015-01-261-0/+74
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ↵Paul "LeoNerd" Evans2015-01-262-1/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actual filter implementation
* | | | | | | | | | | | | | | | Add room member count condition and default rule to make a noise on rooms of ↵David Baker2015-01-303-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only 2 people.
* | | | | | | | | | | | | | | | Merge pull request #38 from matrix-org/new_state_resolutionMark Haines2015-01-302-121/+441
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New state resolution
| * | | | | | | | | | | | | | | | Add a slightly more helpful commentErik Johnston2015-01-301-1/+2
| | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | Be more specific in naming columns in selects.Erik Johnston2015-01-301-1/+1
| | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | Put CREATE rejections into seperate .sqlErik Johnston2015-01-302-7/+21
| | | | | | | |_|_|/ / / / / / / | | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into ↵Erik Johnston2015-01-300-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections_storage
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-01-30125-2084/+3048
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new_state_resolution
| | | | | | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storageErik Johnston2015-01-30125-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 Baker2015-01-302-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed in 15.
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-28 11:24:22 +0000