summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Make matrixfederationclient log more nicelyErik Johnston2015-02-171-11/+12
* Format the response of transaction request in a nicer wayErik Johnston2015-02-172-6/+35
* Actually respond with JSON to incoming transactionErik Johnston2015-02-171-0/+2
* Handle recieving failures in transactionsErik Johnston2015-02-171-1/+12
* We do want to consumeErrorErik Johnston2015-02-171-1/+1
* Use consumeErrors=True on all DeferredLists.Erik Johnston2015-02-175-9/+11
* Bump versionErik Johnston2015-02-151-1/+1
* resolve_events expect lists, not dictsErik Johnston2015-02-151-1/+1
* Bump versionErik Johnston2015-02-131-1/+1
* Update pushers by app id and pushkey, not user id and pushkeyDavid Baker2015-02-132-12/+12
* Bump version v0.7.0dErik Johnston2015-02-131-1/+1
* Fix wrong variable nameErik Johnston2015-02-131-1/+1
* Bump versionErik Johnston2015-02-131-1/+1
* pyflakesErik Johnston2015-02-131-1/+1
* When we see a difference in current state, actually use state conflict resolu...Erik Johnston2015-02-132-14/+63
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-131-1/+1
|\
| * Bump version v0.7.0bErik Johnston2015-02-131-1/+1
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-132-16/+34
|\|
| * Reindent code to be less human-readable to keep pep8 from complainingPaul "LeoNerd" Evans2015-02-121-1/+1
| * Only attempt to fetch presence state of JOINed members in room initialSync (S...Paul "LeoNerd" Evans2015-02-121-0/+1
| * Fix loggingErik Johnston2015-02-121-1/+4
| * Remove unused functionErik Johnston2015-02-121-12/+0
| * Parrellize fetching of eventsErik Johnston2015-02-121-3/+11
| * Correctly handle all the places that can throw exceptionsErik Johnston2015-02-123-13/+32
* | Reindent code to be less human-readable to keep pep8 from complainingPaul "LeoNerd" Evans2015-02-121-1/+1
* | Appease pyflakesPaul "LeoNerd" Evans2015-02-121-1/+1
* | Can now remove the FIXME tooPaul "LeoNerd" Evans2015-02-121-10/+3
* | Only attempt to fetch presence state of JOINed members in room initialSync (S...Paul "LeoNerd" Evans2015-02-121-0/+1
|/
* Bump versionErik Johnston2015-02-121-1/+1
* Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0aErik Johnston2015-02-121-7/+6
|\
| * Get an auth query one at a timeErik Johnston2015-02-121-7/+6
* | Bump webclient versionErik Johnston2015-02-121-3/+3
* | Set database schema version in deltaErik Johnston2015-02-121-0/+2
* | Bump versionErik Johnston2015-02-121-1/+1
|/
* Convert get_rooms to use runInteraction so the transacion has a more helpful ...Erik Johnston2015-02-111-30/+37
* Use encode_canonical_json for http clientErik Johnston2015-02-111-1/+3
* Use encode_canonical_json for pushesErik Johnston2015-02-111-1/+3
* Update dependency linksErik Johnston2015-02-111-2/+2
* Merge pull request #61 from matrix-org/timeout-federation-requestsErik Johnston2015-02-113-2/+63
|\
| * Fix so timing out connections to actually work.Erik Johnston2015-02-112-9/+45
| * Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federati...Erik Johnston2015-02-116-6/+151
| |\
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federati...Erik Johnston2015-02-11100-2099/+6821
| |\ \
| * | | PEP8Erik Johnston2015-02-111-1/+0
| * | | Move time_bound_deferred into ClockErik Johnston2015-02-113-24/+22
| * | | Time out HTTP federation requestsErik Johnston2015-02-102-2/+29
* | | | Merge pull request #62 from matrix-org/state-chacheErik Johnston2015-02-112-3/+101
|\ \ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-1110-18/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-1012-38/+64
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-101-0/+11
| |\ \ \ \ \ \
| * | | | | | | Remove unnecessary loggingErik Johnston2015-02-101-6/+1
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-101-26/+62
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-101-1/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-1016-73/+206
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Oops, we do want to defer.return regardless of whether we are caching or notErik Johnston2015-02-101-1/+1
| * | | | | | | | | | Move construction of object within if blockErik Johnston2015-02-101-6/+6
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-061-1/+3
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bug fixes.Erik Johnston2015-02-062-27/+57
| * | | | | | | | | | | Bugfix cache layerErik Johnston2015-02-062-11/+22
| * | | | | | | | | | | Add cache layer to state group resolutionErik Johnston2015-02-062-1/+72
* | | | | | | | | | | | Bump syutil versionErik Johnston2015-02-111-1/+1
* | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejsonErik Johnston2015-02-117-23/+201
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow newer versions of syutilMark Haines2015-02-111-1/+1
| * | | | | | | | | | | | Merge branch 'bugs/SYN-264' into developPaul "LeoNerd" Evans2015-02-111-18/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Added another TODO notePaul "LeoNerd" Evans2015-02-111-0/+3
| | * | | | | | | | | | | Cache the result of a get_rooms_for_user query, to make user_rooms_intersect(...Paul "LeoNerd" Evans2015-02-111-7/+34
| | * | | | | | | | | | | First step of making user_rooms_intersect() faster - implement in intersectio...Paul "LeoNerd" Evans2015-02-111-18/+20
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Invalidate the cache for an event if it is redactedMark Haines2015-02-111-0/+2
| * | | | | | | | | | | Fix formattingMark Haines2015-02-111-2/+0
| * | | | | | | | | | | Add a cache for get_eventMark Haines2015-02-114-3/+39
| * | | | | | | | | | | Add a lru cache classMark Haines2015-02-111-0/+110
| |/ / / / / / / / / /
* | | | | | | | | | | pyflakesErik Johnston2015-02-112-2/+1
* | | | | | | | | | | Remove more debug loggingErik Johnston2015-02-111-2/+0
* | | | | | | | | | | Remove debug loggingErik Johnston2015-02-112-12/+0
* | | | | | | | | | | Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder...Erik Johnston2015-02-116-13/+36
* | | | | | | | | | | Blunty replace json with simplejsonErik Johnston2015-02-1121-21/+21
|/ / / / / / / / / /
* | | | | | | | | / 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
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Bump versionErik Johnston2015-02-101-1/+1
| * | | | | | | | Fix prune_events to work with nested dictsErik Johnston2015-02-101-2/+4
| * | | | | | | | Ver bumpErik Johnston2015-02-041-1/+1
| * | | | | | | | Pull in python_dependencies.py from developErik Johnston2015-02-041-0/+122
* | | | | | | | | Merge branch 'develop' into single_source_version_and_dependenciesMark Haines2015-02-107-12/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix code-styleMark Haines2015-02-107-12/+12
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* / | | | | | | | Single source version and python dependencies, prevent people accidentally in...Mark Haines2015-02-101-3/+3
|/ / / / / / / /
* | | | | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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 t...Mark Haines2015-02-061-1/+3
| | |/ / | |/| |
| * | | 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.Erik Johnston2015-02-094-21/+43
* | | | | Merge pull request #57 from matrix-org/transaction_countersErik Johnston2015-02-091-2/+31
|\ \ \ \ \
| * | | | | Use the transaction 'desc' rather than 'name', increment the txn_ids inMark Haines2015-02-091-3/+3
| * | | | | 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
* | | | | 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
|\ \ \ \
| * | | | 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 t...Erik Johnston2015-02-094-5/+24
* | | | | 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
* | | | don't give up if we can't create default avatars during testsMatthew Hodgson2015-02-071-9/+12
* | | | ...and here's the actual impl. git fail.Matthew Hodgson2015-02-072-25/+46
* | | | 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 t...Mark Haines2015-02-061-1/+3
|/ /
* | 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 a...Erik Johnston2015-02-061-56/+72
* | 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 'develop' of github.com:matrix-org/synapse into federation_clien...Erik Johnston2015-02-051-5/+12
|\ \
| * | SYN-202: Log as WARN the 404 'Presence information not visible' errors instea...Erik Johnston2015-02-051-5/+12
* | | 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 i...Erik Johnston2015-02-053-15/+22
* | | Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien...Erik Johnston2015-02-0413-45/+141
|\| |
| * | 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-023-0/+54
| |\ \
| | * | 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-022-0/+50
| * | | Generate a list of dependencies from synapse/python_dependencies.pyMark Haines2015-02-021-0/+41
| |/ /
| * | Merge master into developMark Haines2015-02-021-1/+1
| |\|
| | * Bump version to 0.6.1dMark Haines2015-02-021-1/+1
| | * Bump versionErik Johnston2015-02-021-1/+1
* | | Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder...Erik Johnston2015-02-043-9/+15
|\ \ \
| * | | Change context.auth_events to what the auth_events would be bases on context....Erik Johnston2015-02-043-9/+15
* | | | Apply sanity to the transport client interface. Convert 'make_join' and 'send...Erik Johnston2015-02-046-71/+130
* | | | When returning lists of servers from alias lookups, put the current server fi...Erik Johnston2015-02-041-1/+10
* | | | Retry make_joinErik Johnston2015-02-041-7/+12
|/ / /
* | | Brief comment on why we do some things on every call to persist_event and not...Erik Johnston2015-02-041-0/+6
* | | 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 befor...Erik Johnston2015-02-043-72/+77
* | | 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 kee...Erik Johnston2015-02-032-91/+4
* | | 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 ca...Erik Johnston2015-02-034-137/+92
* | | 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 persist...Erik Johnston2015-02-032-18/+64
* | | 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
|/ /
* | Ignore empty strings for display names & room names in notificationsDavid Baker2015-01-311-2/+2
* | 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
* | Return empty list rather than None when there are no emphemeral events for a ...Mark Haines2015-01-301-1/+1
* | 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-3015-172/+706
|\ \
| * | 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-3016-22/+552
| |\ \
| * \ \ Merge branch 'replication_split' of github.com:matrix-org/synapse into reject...Erik Johnston2015-01-303-9/+6
| |\ \ \
| * | | | Fix bug where we superfluously asked for current state. Change API of /query_...Erik Johnston2015-01-305-49/+43
| * | | | 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-3043-115/+2105
| |\ \ \ \
| * | | | | 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 e...Erik Johnston2015-01-302-2/+9
| * | | | | 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-297-81/+208
| * | | | | 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 ha...Erik Johnston2015-01-263-26/+173
* | | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add doc string for __nonzero__ overrides for sync results, raise not implemen...Mark Haines2015-01-301-1/+8
| * | | | | 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
| * | | | | | 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-292-113/+109
| |\ \ \ \ \ \
| * | | | | | | 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-291-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-2912-17/+493
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of chang...Mark Haines2015-01-292-11/+52
| * | | | | | | | | | 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 for...Mark Haines2015-01-292-12/+22
| * | | | | | | | | | 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-281-1/+1
| * | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-2835-91/+1822
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix FormattingMark Haines2015-01-274-14/+9
| * | | | | | | | | | | Wait for events if the incremental sync is empty and a timeout is givenMark Haines2015-01-272-7/+60
| * | | | | | | | | | | 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-267-21/+45
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add handler for /sync APIMark Haines2015-01-261-0/+110
| * | | | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into repli...Erik Johnston2015-01-3044-123/+2104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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-2340-199/+229
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | 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 rej...Erik Johnston2015-01-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Add glob asterisks when running rules.David Baker2015-01-302-4/+6
* | | | | | | | | | | | | | | 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-3011-8/+526
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-308-2/+458
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 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-292-113/+109
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | 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-291-2/+2
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-02 08:05:01 +0000