summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hotfixes-0.7.0e' of github.com:matrix-org/synapse v0.7.0eErik Johnston2015-02-133-13/+13
|\
| * 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
* Merge branch 'develop' of github.com:matrix-org/synapse v0.7.0cErik Johnston2015-02-134-26/+68
|\
| * Bump versionErik Johnston2015-02-131-1/+1
| * Merge pull request #71 from matrix-org/auth-conflict-resErik Johnston2015-02-132-14/+63
| |\
| | * 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-133-18/+39
| |\ | |/ |/|
* | 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
* | Merge pull request #70 from matrix-org/exception-fixesMatthew Hodgson2015-02-123-18/+39
|\ \
| * | 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-124-15/+37
| | * 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
| |/
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-122-8/+7
| |\ | |/ |/|
* | Merge pull request #69 from matrix-org/hotfixes-v0.7.0a v0.7.0aErik Johnston2015-02-122-8/+7
|\ \ | |/ |/|
| * 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
* | Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse v0.7.0Erik Johnston2015-02-12178-4381/+9450
|\ \
| * | Expand on cachingErik Johnston2015-02-121-1/+7
| * | Add note about alpha csv2 apisErik Johnston2015-02-121-2/+3
| * | TypoesErik Johnston2015-02-121-2/+2
| * | Add note about push supportErik Johnston2015-02-121-0/+1
| * | Bump webclient versionErik Johnston2015-02-121-3/+3
| * | Use consistent style of headingErik Johnston2015-02-121-2/+2
| * | Change develop to v0.7.0Erik Johnston2015-02-121-2/+2
| * | More rst fixes. Expand on JSON library changeErik Johnston2015-02-121-2/+4
| * | Fix rst formattingErik Johnston2015-02-121-36/+36
| * | Update CHANGES.rstErik Johnston2015-02-121-3/+10
| * | Fix rstErik Johnston2015-02-121-4/+4
| * | Update UPGRADES to mention updated dependenciesErik Johnston2015-02-121-0/+14
| * | 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-1133-368/+353
| | |\
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federati...Erik Johnston2015-02-11172-3943/+8780
| | |\ \
| | * | | 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-113-4/+107
| |\ \ \
| | * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-1112-54/+43
| | |\ \ \
| | * \ \ \ 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-1018-73/+291
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| | * | | | | | | | | Fix testsErik Johnston2015-02-091-1/+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
| * | | | | | | | | | | Merge pull request #66 from matrix-org/use-simplejsonErik Johnston2015-02-1126-35/+43
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Bump syutil versionErik Johnston2015-02-111-1/+1
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejsonErik Johnston2015-02-1110-25/+261
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #65 from matrix-org/get_event_cacheMark Haines2015-02-118-6/+210
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | 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-116-5/+43
| | * | | | | | | | | | | Add a lru cache classMark Haines2015-02-112-0/+166
| | | | * | | | | | | | | 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
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 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 into aMark Haines2015-02-1125-360/+140
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
* | | | | | | | | | 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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 in...Mark Haines2015-02-103-44/+43
| |/ / / / / / /
| * | | | | | | 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
| * | | Merge pull request #53 from matrix-org/default_avatar_identiconsMatthew Hodgson2015-02-073-25/+88
| |\ \ \
| | * | | 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 sc...Matthew Hodgson2015-02-071-0/+24
| * | | | 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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update to README.rstTurnedToDust2015-02-061-0/+38
| | | |/ | | |/|
| * | | 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 'federation_client_retries' of github.com:matrix-org/synapse int...Erik Johnston2015-02-058-89/+169
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien...Erik Johnston2015-02-053-5/+82
| | |\
| | * | 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-0416-49/+146
| | |\ \
| | * \ \ Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder...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
| * | | | | Merge pull request #47 from matrix-org/signature_failuresErik Johnston2015-02-059-272/+429
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Change context.auth_events to what the auth_events would be bases on context....Erik Johnston2015-02-043-9/+15
| | |/ /
| | * | 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-033-19/+68
| | * | 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
| * | | SYN-202: Log as WARN the 404 'Presence information not visible' errors instea...Erik Johnston2015-02-051-5/+12
| * | | 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 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
| |\ \ | |/ / |/| / | |/
* | 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
|\ \
| * | 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 fro...Mark Haines2015-02-021-7/+7
* | Update documentation to recommend virtual envMark Haines2015-02-021-21/+15
* | 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 fro...Mark Haines2015-01-301-7/+7
| * 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
| * 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
| |\
| | * 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
| | |\
| | * \ Merge branch 'replication_split' of github.com:matrix-org/synapse into reject...Erik Johnston2015-01-304-10/+7
| | |\ \
| | * | | Fix bug where we superfluously asked for current state. Change API of /query_...Erik Johnston2015-01-305-49/+43
| | * | | 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
| | |\ \ \
| | * | | | 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-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 ha...Erik Johnston2015-01-263-26/+173