summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Don't exit if we can't work out if we're running in a git repoErik Johnston2015-02-211-53/+56
|
* Merge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse v0.7.1-r1Erik Johnston2015-02-202-2/+2
|\
| * Change version schemeErik Johnston2015-02-201-1/+1
| |
| * Bump versionErik Johnston2015-02-201-1/+1
| |
| * Add missing comma so that it generates a dict and not a setErik Johnston2015-02-201-1/+1
|/
* Update CHANGES.rst with missing changes v0.7.1Erik Johnston2015-02-191-0/+9
|
* Merge branch 'release-v0.7.1' of github.com:matrix-org/synapseErik Johnston2015-02-1955-308/+2548
|\
| * Update release dateErik Johnston2015-02-191-1/+1
| |
| * Send room ID in http notifications so clients know which room to go to if ↵David Baker2015-02-191-0/+1
| | | | | | | | the user responds to the notification.
| * Update CHANGESErik Johnston2015-02-181-0/+11
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1Erik Johnston2015-02-188-41/+106
| |\
| | * Merge pull request #82 from matrix-org/git_tag_versionErik Johnston2015-02-187-38/+103
| | |\ | | | | | | | | Git tag version
| | | * Conform to header spec take twoErik Johnston2015-02-181-1/+1
| | | |
| | | * Make /keys/ return correct Server versionErik Johnston2015-02-181-1/+5
| | | |
| | | * Make version_string conform to User-Agent and Server specErik Johnston2015-02-181-1/+1
| | | |
| | | * pyflakesErik Johnston2015-02-181-1/+0
| | | |
| | | * Use git aware version string in User-Agent and Server headersErik Johnston2015-02-185-36/+33
| | | |
| | | * When computing git version run git commands in same dir as source filesErik Johnston2015-02-181-0/+5
| | | |
| | | * Generate a version string that includes git details if run from git checkoutErik Johnston2015-02-181-1/+61
| | | |
| | * | Bump matrix-angular-sdk versionErik Johnston2015-02-181-3/+3
| | |/
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1Erik Johnston2015-02-183-9/+33
| |\|
| | * Merge pull request #80 from matrix-org/restrict-destinationsErik Johnston2015-02-181-3/+27
| | |\ | | | | | | | | Restrict the destinations that synapse can talk to
| | | * Restrict the destinations that synapse can talk toMark Haines2015-02-181-3/+27
| | | |
| | * | Merge pull request #81 from matrix-org/bugs/SYN-282Erik Johnston2015-02-181-1/+1
| | |\ \ | | | |/ | | |/| SYN-282: Don't log tracebacks for client errors
| | | * SYN-282: Don't log tracebacks for client errorsMark Haines2015-02-181-1/+1
| | |/
| | * Fix syntaxMark Haines2015-02-181-1/+1
| | |
| | * Move pynacl to the top of the depedency link list so that it isMark Haines2015-02-181-5/+5
| | | | | | | | | | | | installed before syutil
| * | Add errback to all deferreds in transaction_queueErik Johnston2015-02-181-14/+23
| | |
| * | Remove unused importErik Johnston2015-02-181-2/+0
| | |
| * | Discard destination 'localhost'Erik Johnston2015-02-181-2/+2
| | |
| * | Don't send failure to selfErik Johnston2015-02-181-0/+3
| | |
| * | Remove spurious comma. Remove temp run_on_reactorErik Johnston2015-02-181-2/+1
| | |
| * | Temporarily add a run_on_reactor() callErik Johnston2015-02-181-0/+3
| | |
| * | Don't convert DNSLookupError to a 4xx SynapseErrorErik Johnston2015-02-181-1/+1
| | |
| * | Bump versionErik Johnston2015-02-181-1/+1
| |/
| * Add .__name__ after type(e)Erik Johnston2015-02-181-2/+2
| |
| * Fix up ResponseNeverReceived to strErik Johnston2015-02-181-9/+11
| |
| * Fix pyflakesErik Johnston2015-02-181-1/+0
| |
| * strings.join() expects iterable of stringsErik Johnston2015-02-181-1/+1
| |
| * s/self._clock/self.clock/Erik Johnston2015-02-181-1/+1
| |
| * Merge branch 'keyclient_retry_scheme' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-184-107/+252
| |\ | | | | | | | | | develop
| | * More docsErik Johnston2015-02-181-1/+5
| | |
| | * Docs.Erik Johnston2015-02-181-1/+33
| | |
| | * Try to only back off if we think we failed to connect to the remoteErik Johnston2015-02-173-89/+95
| | |
| | * Only update destination_retry_timings if we have succeeded when retryingErik Johnston2015-02-171-0/+3
| | |
| | * Remove spurious selfErik Johnston2015-02-171-1/+1
| | |
| | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-171-1/+2
| | |\ | | | | | | | | | | | | keyclient_retry_scheme
| | * | Add per server retry limiting.Erik Johnston2015-02-174-122/+205
| | | | | | | | | | | | | | | | | | | | Factor out the pre destination retry logic from TransactionQueue so it can be reused in both get_pdu and crypto.keyring
| | * | Rate limit retries when fetching server keys.Erik Johnston2015-02-171-55/+71
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2015-02-188-57/+214
| |\ \ \
| | * \ \ Merge pull request #77 from matrix-org/failuresErik Johnston2015-02-184-17/+50
| | |\ \ \ | | | | | | | | | | | | Failures
| | | * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-172-2/+3
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Remove debug raiseErik Johnston2015-02-171-7/+0
| | | | | |
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-171-2/+4
| | | |\ \ \
| | | * | | | Remove unused importErik Johnston2015-02-171-1/+0
| | | | | | |
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-1734-92/+1909
| | | |\ \ \ \
| | | * | | | | Consume errors in time_bound_deferredErik Johnston2015-02-171-2/+0
| | | | | | | |
| | | * | | | | 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
| | | | | | | |
| | * | | | | | Merge pull request #79 from matrix-org/get_pdu_limitingErik Johnston2015-02-184-40/+164
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | Get pdu limiting
| | | * | | | | Rename _fail_fetch_pdu_cache to _get_pdu_cacheErik Johnston2015-02-182-9/+9
| | | | | | | |
| | | * | | | | Fix typo in function nameErik Johnston2015-02-171-1/+1
| | | | | | | |
| | | * | | | | ExpiringCache: purge every 1/2 intervalErik Johnston2015-02-171-1/+1
| | | | | | | |
| | | * | | | | Start the get_pdu cacheErik Johnston2015-02-171-0/+1
| | | | | | | |
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into get_pdu_limitingErik Johnston2015-02-171-5/+8
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Cache results of get_pdu.Erik Johnston2015-02-161-3/+39
| | | | | | | |
| | | * | | | | Factor out ExpiringCache from StateHandlerErik Johnston2015-02-162-37/+124
| | | | | | | |
| * | | | | | | Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into developErik Johnston2015-02-172-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge pull request #75 from matrix-org/dont_write_bytecodeErik Johnston2015-02-172-2/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't write bytecode
| | | * | | | | | Don't write bytecodeErik Johnston2015-02-172-2/+4
| |_|/ / / / / / |/| | | | | | |
| | * | | | | | Merge pull request #76 from matrix-org/consumeErrorsErik Johnston2015-02-176-10/+12
| |/| | | | | | |/| | | |/ / / | | | |/| | | | | |/| | | | Consume errors
| * | | | | | Use absolute path when loading delta sql filesErik Johnston2015-02-171-1/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Bump schema versionErik Johnston2015-02-172-1/+1
| | |_|_|/ | |/| | |
| * | | | Merge branch 'consumeErrors' of github.com:matrix-org/synapse into developErik Johnston2015-02-176-10/+12
| |\| | |
| | * | | We do want to consumeErrorErik Johnston2015-02-171-1/+1
| | | | |
| | * | | Use consumeErrors=True on all DeferredLists.Erik Johnston2015-02-175-9/+11
| |/ / / |/| | | | | | | | | | | | | | | | | | | This is so that the DeferredLists actually consume the error instead of propogating down the non-existent errback chain. This should reduce the number of unhandled errors we are seeing.
* | | | Merge pull request #73 from matrix-org/hotfixes-v0.7.0f v0.7.0fErik Johnston2015-02-162-2/+2
|\ \ \ \ | | | | | | | | | | Hotfixes v0.7.0f
| | * | | Change some debug logging to infoErik Johnston2015-02-171-2/+4
| | | |/ | | |/|
| | * | Merge pull request #74 from matrix-org/federation_min_depth_fixErik Johnston2015-02-161-5/+8
| | |\ \ | | | |/ | | |/| Federation min depth fix
| | | * Mark old events as outliers.Erik Johnston2015-02-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix the issue where if a remote server sends an event that references a really "old" event, then the local server will pull that in and send to all clients. We decide if an event is old if its depth is less than the minimum depth of the room.
| | | * Don't return anything from _handle_new_pdu, since we ignore the return value ↵Erik Johnston2015-02-161-4/+1
| | |/ | | | | | | | | | anyway
| | * Fix contrib/graph/graph2.py to handle FrozenDictErik Johnston2015-02-161-1/+2
| | |
| | * Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into developErik Johnston2015-02-163-3/+3
| | |\ | | |/ | |/|
| * | Bump versionErik Johnston2015-02-151-1/+1
| | |
| * | resolve_events expect lists, not dictsErik Johnston2015-02-151-1/+1
|/ /
* | we federate on port 8448 nowadays...Matthew Hodgson2015-02-141-1/+1
| |
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-131-1/+1
| |\ | |/ |/|
* | 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
| | |
| | * Merge branch 'hotfixes-0.7.0e' into developDavid Baker2015-02-132-12/+12
| | |\ | | |/ | |/|
| * | Update pushers by app id and pushkey, not user id and pushkeyDavid Baker2015-02-132-12/+12
|/ /
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-132-2/+2
| |\ | |/ |/|
* | 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
|\ \
| | * Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-1332-76/+1892
| | |\ | | | | | | | | Application Services
| | | * Fix tests which broke when event caching was introduced.Kegan Dougal2015-02-111-1/+4
| | | |
| | | * Merge branch 'develop' into application-servicesKegan Dougal2015-02-1135-387/+404
| | | |\
| | | * | Minor tweaks based on PR feedback.Kegan Dougal2015-02-112-4/+5
| | | | |
| | | * | Fix newline on __init__Kegan Dougal2015-02-111-1/+0
| | | | |
| | | * | PEP8-ifyKegan Dougal2015-02-114-9/+1
| | | | |
| | | * | Add newline to EOFKegan Dougal2015-02-111-0/+1
| | | | |
| | | * | Notify ASes for events sent by other users in a room which an AS user is a ↵Kegan Dougal2015-02-114-11/+56
| | | | | | | | | | | | | | | | | | | | part of.
| | | * | Merge branch 'develop' into application-servicesKegan Dougal2015-02-1126-115/+240
| | | |\ \
| | | * \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-0919-137/+323
| | | |\ \ \
| | | * | | | Fix bugs so lazy room joining works as intended.Kegan Dougal2015-02-093-12/+23
| | | | | | |
| | | * | | | Remove unused imports.Kegan Dougal2015-02-091-2/+2
| | | | | | |
| | | * | | | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-095-20/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens)
| | | * | | | Register a user account for the AS when the AS registers. Add 'sender' ↵Kegan Dougal2015-02-095-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | column to AS table.
| | | * | | | Add errcodes for appservice registrations.Kegan Dougal2015-02-061-4/+7
| | | | | | |
| | | * | | | Pyflakes: unused variable.Kegan Dougal2015-02-061-1/+1
| | | | | | |
| | | * | | | Grant ASes the ability to delete aliases in their own namespace.Kegan Dougal2015-02-062-7/+52
| | | | | | |
| | | * | | | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-064-24/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace.
| | | * | | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-053-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s).
| | | * | | | Dependency inject ApplicationServiceApi when creating ↵Kegan Dougal2015-02-053-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationServicesHandler.
| | | * | | | Add delta sql file.Kegan Dougal2015-02-051-0/+33
| | | | | | |
| | | * | | | Prevent user IDs in AS namespaces being created/deleted by humans.Kegan Dougal2015-02-051-0/+16
| | | | | | |
| | | * | | | Prevent aliases in AS namespaces being created/deleted by users. Check with ↵Kegan Dougal2015-02-051-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ASes when queried for room aliases via federation.
| | | * | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-4/+0
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-055-163/+222
| | | |\ \ \ \ \
| | | * | | | | | Fix unit tests.Kegan Dougal2015-02-051-0/+6
| | | | | | | | |
| | | * | | | | | Add CS extension for masquerading as users within the namespaces specified ↵Kegan Dougal2015-02-051-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by the AS.
| | | * | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-0527-401/+716
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix user query checks. HS>AS pushing now works.Kegan Dougal2015-02-052-21/+44
| | | | | | | | | |
| | | * | | | | | | Serialize events before sending to ASesKegan Dougal2015-02-051-0/+10
| | | | | | | | | |
| | | * | | | | | | Fix unit tests.Kegan Dougal2015-02-051-2/+5
| | | | | | | | | |
| | | * | | | | | | Glue AS work to general event notifications. Add more exception handling ↵Kegan Dougal2015-02-054-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when poking ASes.
| | | * | | | | | | Add unit test for appservice_handler.query_room_alias_existsKegan Dougal2015-02-051-1/+30
| | | | | | | | | |
| | | * | | | | | | Add unknown room alias check. Call it from directory_handler.get_associationKegan Dougal2015-02-052-43/+61
| | | | | | | | | |
| | | * | | | | | | Add unknown user ID check. Use store.get_aliases_for_room(room_id) when ↵Kegan Dougal2015-02-052-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | searching for services by alias.
| | | * | | | | | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-057-20/+35
| | | | | | | | | |
| | | * | | | | | | Impl push_bulk functionKegan Dougal2015-02-052-2/+19
| | | | | | | | | |
| | | * | | | | | | Add SimpleHttpClient.put_json with the same semantics as get_json.Kegan Dougal2015-02-041-2/+46
| | | | | | | | | |
| | | * | | | | | | Update user/alias query APIs to use new format of SimpleHttpClient.get_jsonKegan Dougal2015-02-042-8/+10
| | | | | | | | | |
| | | * | | | | | | Modify API for SimpleHttpClient.get_json and update usages.Kegan Dougal2015-02-043-47/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would only return the HTTP body as JSON, and discard other response information (e.g. the HTTP response code). This has now been changed to throw a CodeMessageException on a non-2xx response, with the response code and body, which can then be parsed as JSON. Affected modules include: - Registration/Login (when using an email for IS auth)
| | | * | | | | | | Add query_user/alias APIs.Kegan Dougal2015-02-042-14/+59
| | | | | | | | | |
| | | * | | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-047-5/+101
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Fix bug in store defer. Add more unit tests.Kegan Dougal2015-02-044-9/+207
| | | | | | | | | | |
| | | * | | | | | | | Begin to add unit tests for appservice glue and regex testing.Kegan Dougal2015-02-045-4/+158
| | | | | | | | | | |
| | | * | | | | | | | Add stub ApplicationServiceApi and glue it with the handler.Kegan Dougal2015-02-044-4/+39
| | | | | | | | | | |
| | | * | | | | | | | Add appservice package and move ApplicationService into it.Kegan Dougal2015-02-034-105/+138
| | | | | | | | | | |
| | | * | | | | | | | Implement restricted namespace checks. Begin fleshing out the main hook for ↵Kegan Dougal2015-02-032-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifying application services.
| | | * | | | | | | | Add namespace constants. Add restrict_to option to limit namespace checks.Kegan Dougal2015-02-032-27/+39
| | | | | | | | | | |
| | | * | | | | | | | Everyone loves SQL typosKegan Dougal2015-02-031-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Implement regex checks for app services.Kegan Dougal2015-02-032-29/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose handler.get_services_for_event which manages the checks for all services.
| | | * | | | | | | | Add defers in the right places.Kegan Dougal2015-02-021-0/+2
| | | | | | | | | | |
| | | * | | | | | | | Implement txns for AS (un)registration.Kegan Dougal2015-02-023-23/+102
| | | | | | | | | | |
| | | * | | | | | | | Actually merge into develop.Kegan Dougal2015-02-021-8/+1
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-0277-1554/+6385
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
| | | * | | | | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵Kegan Dougal2015-01-285-16/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store to read from it.
| | | * | | | | | | | | Remove unused importKegan Dougal2015-01-281-2/+0
| | | | | | | | | | | |
| | | * | | | | | | | | Log when ASes are registered/unregistered.Kegan Dougal2015-01-272-1/+5
| | | | | | | | | | | |
| | | * | | | | | | | | Use ApplicationService when registering.Kegan Dougal2015-01-273-20/+17
| | | | | | | | | | | |
| | | * | | | | | | | | Add stub methods, TODOs and docstrings for application services.Kegan Dougal2015-01-272-5/+72
| | | | | | | | | | | |
| | | * | | | | | | | | Add AS specific classes with docstrings.Kegan Dougal2015-01-271-1/+59
| | | | | | | | | | | |
| | | * | | | | | | | | Add appservice handler and store. Glue together rest > handler > store.Kegan Dougal2015-01-276-5/+107
| | | | | | | | | | | |
| | | * | | | | | | | | Parse /register and /unregister request JSON.Kegan Dougal2015-01-271-2/+78
| | | | | | | | | | | |
| | | * | | | | | | | | Add stub application services REST API.Kegan Dougal2015-01-277-1/+135
| | | | | | | | | | | |
| | * | | | | | | | | | Merge pull request #72 from matrix-org/in_memory_sqlite_for_testingMark Haines2015-02-132-10/+7
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare the database whenever a connection is opened from the db_pool so...
| | * | | | | | | | | | Prepare the database whenever a connection is opened from the db_pool so ↵Mark Haines2015-02-132-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that in-memory databases will work
| * | | | | | | | | | | Bump versionErik Johnston2015-02-131-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #71 from matrix-org/auth-conflict-resErik Johnston2015-02-132-14/+63
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | When we see a difference in current state, actually use state conflict resolution algorithm
| | * | | | | | | | | | pyflakesErik Johnston2015-02-131-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | When we see a difference in current state, actually use state conflict ↵Erik Johnston2015-02-132-14/+63
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolution algorithm
| * | | | | | | | | | 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 ↵Paul "LeoNerd" Evans2015-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SYN-202)
* | | | | | | | | | | Merge pull request #70 from matrix-org/exception-fixesMatthew Hodgson2015-02-123-18/+39
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Exception fixes
| * | | | | | | | | | | 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 ↵Paul "LeoNerd" Evans2015-02-121-0/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SYN-202)
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Hotfixes v0.7.0a
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Timeout federation requests
| | * | | | | | | | | | Fix so timing out connections to actually work.Erik Johnston2015-02-112-9/+45
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-1133-368/+353
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout-federation-requests
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-11172-3943/+8780
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout-federation-requests
| | * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | State chache
| | * \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py synapse/state.py
| | * | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use simplejson
| | * | | | | | | | | | | | | | | | | | | | 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 ↵Paul "LeoNerd" Evans2015-02-111-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_rooms_intersect() much lighter in the read-common case
| | * | | | | | | | | | | | | | | | | | | First step of making user_rooms_intersect() faster - implement in ↵Paul "LeoNerd" Evans2015-02-111-18/+20
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intersection logic in Python code terms of a DB query that is cacheable per user
| * | | | | | | | | | | | | | | | | | | Merge pull request #65 from matrix-org/get_event_cacheMark Haines2015-02-118-6/+210
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an in-memory cache for get_event in the storage layer
| | * | | | | | | | | | | | | | | | | | | 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 ↵Erik Johnston2015-02-116-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSONEncoder that understands FrozenDict
| | | | * | | | | | | | | | | | | | | | | 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-03 22:30:04 +0000