Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | strings.join() expects iterable of strings | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | |||||
* | s/self._clock/self.clock/ | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'keyclient_retry_scheme' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-18 | 4 | -107/+252 |
|\ | | | | | | | develop | ||||
| * | More docs | Erik Johnston | 2015-02-18 | 1 | -1/+5 |
| | | |||||
| * | Docs. | Erik Johnston | 2015-02-18 | 1 | -1/+33 |
| | | |||||
| * | Try to only back off if we think we failed to connect to the remote | Erik Johnston | 2015-02-17 | 3 | -89/+95 |
| | | |||||
| * | Only update destination_retry_timings if we have succeeded when retrying | Erik Johnston | 2015-02-17 | 1 | -0/+3 |
| | | |||||
| * | Remove spurious self | Erik Johnston | 2015-02-17 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-17 | 1 | -1/+2 |
| |\ | | | | | | | | | | keyclient_retry_scheme | ||||
| * | | Add per server retry limiting. | Erik Johnston | 2015-02-17 | 4 | -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 Johnston | 2015-02-17 | 1 | -55/+71 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-18 | 8 | -57/+214 |
|\ \ \ | |||||
| * \ \ | Merge pull request #77 from matrix-org/failures | Erik Johnston | 2015-02-18 | 4 | -17/+50 |
| |\ \ \ | | | | | | | | | | | Failures | ||||
| | * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into failures | Erik Johnston | 2015-02-17 | 2 | -2/+3 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Remove debug raise | Erik Johnston | 2015-02-17 | 1 | -7/+0 |
| | | | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into failures | Erik Johnston | 2015-02-17 | 1 | -2/+4 |
| | |\ \ \ | |||||
| | * | | | | Remove unused import | Erik Johnston | 2015-02-17 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into failures | Erik Johnston | 2015-02-17 | 34 | -92/+1909 |
| | |\ \ \ \ | |||||
| | * | | | | | Consume errors in time_bound_deferred | Erik Johnston | 2015-02-17 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Make matrixfederationclient log more nicely | Erik Johnston | 2015-02-17 | 1 | -11/+12 |
| | | | | | | | |||||
| | * | | | | | Format the response of transaction request in a nicer way | Erik Johnston | 2015-02-17 | 2 | -6/+35 |
| | | | | | | | |||||
| | * | | | | | Actually respond with JSON to incoming transaction | Erik Johnston | 2015-02-17 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Handle recieving failures in transactions | Erik Johnston | 2015-02-17 | 1 | -1/+12 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #79 from matrix-org/get_pdu_limiting | Erik Johnston | 2015-02-18 | 4 | -40/+164 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Get pdu limiting | ||||
| | * | | | | | Rename _fail_fetch_pdu_cache to _get_pdu_cache | Erik Johnston | 2015-02-18 | 2 | -9/+9 |
| | | | | | | | |||||
| | * | | | | | Fix typo in function name | Erik Johnston | 2015-02-17 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | ExpiringCache: purge every 1/2 interval | Erik Johnston | 2015-02-17 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Start the get_pdu cache | Erik Johnston | 2015-02-17 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into get_pdu_limiting | Erik Johnston | 2015-02-17 | 1 | -5/+8 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Cache results of get_pdu. | Erik Johnston | 2015-02-16 | 1 | -3/+39 |
| | | | | | | | |||||
| | * | | | | | Factor out ExpiringCache from StateHandler | Erik Johnston | 2015-02-16 | 2 | -37/+124 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-17 | 2 | -2/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge pull request #75 from matrix-org/dont_write_bytecode | Erik Johnston | 2015-02-17 | 2 | -2/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't write bytecode | ||||
| | * | | | | | | Don't write bytecode | Erik Johnston | 2015-02-17 | 2 | -2/+4 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #76 from matrix-org/consumeErrors | Erik Johnston | 2015-02-17 | 6 | -10/+12 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | Consume errors | ||||
* | | | | | | | Use absolute path when loading delta sql files | Erik Johnston | 2015-02-17 | 1 | -1/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Bump schema version | Erik Johnston | 2015-02-17 | 2 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-17 | 6 | -10/+12 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | We do want to consumeError | Erik Johnston | 2015-02-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use consumeErrors=True on all DeferredLists. | Erik Johnston | 2015-02-17 | 5 | -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.0f | Erik Johnston | 2015-02-16 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Hotfixes v0.7.0f | ||||
* | | | | | Change some debug logging to info | Erik Johnston | 2015-02-17 | 1 | -2/+4 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #74 from matrix-org/federation_min_depth_fix | Erik Johnston | 2015-02-16 | 1 | -5/+8 |
|\ \ \ \ | |_|_|/ |/| | | | Federation min depth fix | ||||
| * | | | Mark old events as outliers. | Erik Johnston | 2015-02-16 | 1 | -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 Johnston | 2015-02-16 | 1 | -4/+1 |
|/ / / | | | | | | | | | | anyway | ||||
* | | | Fix contrib/graph/graph2.py to handle FrozenDict | Erik Johnston | 2015-02-16 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-16 | 3 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bump version | Erik Johnston | 2015-02-15 | 1 | -1/+1 |
| | | | |||||
| * | | resolve_events expect lists, not dicts | Erik Johnston | 2015-02-15 | 1 | -1/+1 |
| |/ | |||||
| * | we federate on port 8448 nowadays... | Matthew Hodgson | 2015-02-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
|\| | |||||
| * | Merge branch 'hotfixes-0.7.0e' of github.com:matrix-org/synapse v0.7.0e | Erik Johnston | 2015-02-13 | 3 | -13/+13 |
| |\ | |||||
| | * | Bump version | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'hotfixes-0.7.0e' into develop | David Baker | 2015-02-13 | 2 | -12/+12 |
|\ \ \ | | |/ | |/| | |||||
| * | | Update pushers by app id and pushkey, not user id and pushkey | David Baker | 2015-02-13 | 2 | -12/+12 |
| |/ | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-13 | 2 | -2/+2 |
|\| | |||||
| * | Bump version v0.7.0d | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | | |||||
| * | Fix wrong variable name | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse v0.7.0c | Erik Johnston | 2015-02-13 | 4 | -26/+68 |
| |\ | |||||
* | \ | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 32 | -76/+1892 |
|\ \ \ | | | | | | | | | Application Services | ||||
| * | | | Fix tests which broke when event caching was introduced. | Kegan Dougal | 2015-02-11 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 35 | -387/+404 |
| |\ \ \ | |||||
| * | | | | Minor tweaks based on PR feedback. | Kegan Dougal | 2015-02-11 | 2 | -4/+5 |
| | | | | | |||||
| * | | | | Fix newline on __init__ | Kegan Dougal | 2015-02-11 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | PEP8-ify | Kegan Dougal | 2015-02-11 | 4 | -9/+1 |
| | | | | | |||||
| * | | | | Add newline to EOF | Kegan Dougal | 2015-02-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Notify ASes for events sent by other users in a room which an AS user is a ↵ | Kegan Dougal | 2015-02-11 | 4 | -11/+56 |
| | | | | | | | | | | | | | | | | | | | | part of. | ||||
| * | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 26 | -115/+240 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 19 | -137/+323 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix bugs so lazy room joining works as intended. | Kegan Dougal | 2015-02-09 | 3 | -12/+23 |
| | | | | | | | |||||
| * | | | | | | Remove unused imports. | Kegan Dougal | 2015-02-09 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Modify auth.get_user_by_req for authing appservices directly. | Kegan Dougal | 2015-02-09 | 5 | -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 Dougal | 2015-02-09 | 5 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | column to AS table. | ||||
| * | | | | | | Add errcodes for appservice registrations. | Kegan Dougal | 2015-02-06 | 1 | -4/+7 |
| | | | | | | | |||||
| * | | | | | | Pyflakes: unused variable. | Kegan Dougal | 2015-02-06 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Grant ASes the ability to delete aliases in their own namespace. | Kegan Dougal | 2015-02-06 | 2 | -7/+52 |
| | | | | | | | |||||
| * | | | | | | Grant ASes the ability to create alias in their own namespace. | Kegan Dougal | 2015-02-06 | 4 | -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 Dougal | 2015-02-05 | 3 | -1/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s). | ||||
| * | | | | | | Dependency inject ApplicationServiceApi when creating ↵ | Kegan Dougal | 2015-02-05 | 3 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationServicesHandler. | ||||
| * | | | | | | Add delta sql file. | Kegan Dougal | 2015-02-05 | 1 | -0/+33 |
| | | | | | | | |||||
| * | | | | | | Prevent user IDs in AS namespaces being created/deleted by humans. | Kegan Dougal | 2015-02-05 | 1 | -0/+16 |
| | | | | | | | |||||
| * | | | | | | Prevent aliases in AS namespaces being created/deleted by users. Check with ↵ | Kegan Dougal | 2015-02-05 | 1 | -9/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASes when queried for room aliases via federation. | ||||
| * | | | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 1 | -4/+0 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 5 | -163/+222 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix unit tests. | Kegan Dougal | 2015-02-05 | 1 | -0/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Add CS extension for masquerading as users within the namespaces specified ↵ | Kegan Dougal | 2015-02-05 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by the AS. | ||||
| * | | | | | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 27 | -401/+716 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix user query checks. HS>AS pushing now works. | Kegan Dougal | 2015-02-05 | 2 | -21/+44 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Serialize events before sending to ASes | Kegan Dougal | 2015-02-05 | 1 | -0/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix unit tests. | Kegan Dougal | 2015-02-05 | 1 | -2/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Glue AS work to general event notifications. Add more exception handling ↵ | Kegan Dougal | 2015-02-05 | 4 | -16/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when poking ASes. | ||||
| * | | | | | | | | | Add unit test for appservice_handler.query_room_alias_exists | Kegan Dougal | 2015-02-05 | 1 | -1/+30 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add unknown room alias check. Call it from directory_handler.get_association | Kegan Dougal | 2015-02-05 | 2 | -43/+61 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add unknown user ID check. Use store.get_aliases_for_room(room_id) when ↵ | Kegan Dougal | 2015-02-05 | 2 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | searching for services by alias. | ||||
| * | | | | | | | | | Add hs_token column and generate a different token f.e application service. | Kegan Dougal | 2015-02-05 | 7 | -20/+35 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Impl push_bulk function | Kegan Dougal | 2015-02-05 | 2 | -2/+19 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add SimpleHttpClient.put_json with the same semantics as get_json. | Kegan Dougal | 2015-02-04 | 1 | -2/+46 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Update user/alias query APIs to use new format of SimpleHttpClient.get_json | Kegan Dougal | 2015-02-04 | 2 | -8/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Modify API for SimpleHttpClient.get_json and update usages. | Kegan Dougal | 2015-02-04 | 3 | -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 Dougal | 2015-02-04 | 2 | -14/+59 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-04 | 7 | -5/+101 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix bug in store defer. Add more unit tests. | Kegan Dougal | 2015-02-04 | 4 | -9/+207 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Begin to add unit tests for appservice glue and regex testing. | Kegan Dougal | 2015-02-04 | 5 | -4/+158 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add stub ApplicationServiceApi and glue it with the handler. | Kegan Dougal | 2015-02-04 | 4 | -4/+39 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add appservice package and move ApplicationService into it. | Kegan Dougal | 2015-02-03 | 4 | -105/+138 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Implement restricted namespace checks. Begin fleshing out the main hook for ↵ | Kegan Dougal | 2015-02-03 | 2 | -5/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifying application services. | ||||
| * | | | | | | | | | | Add namespace constants. Add restrict_to option to limit namespace checks. | Kegan Dougal | 2015-02-03 | 2 | -27/+39 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Everyone loves SQL typos | Kegan Dougal | 2015-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Implement regex checks for app services. | Kegan Dougal | 2015-02-03 | 2 | -29/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose handler.get_services_for_event which manages the checks for all services. | ||||
| * | | | | | | | | | | Add defers in the right places. | Kegan Dougal | 2015-02-02 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Implement txns for AS (un)registration. | Kegan Dougal | 2015-02-02 | 3 | -23/+102 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Actually merge into develop. | Kegan Dougal | 2015-02-02 | 1 | -8/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 77 | -1554/+6385 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py | ||||
| * | | | | | | | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵ | Kegan Dougal | 2015-01-28 | 5 | -16/+117 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store to read from it. | ||||
| * | | | | | | | | | | | Remove unused import | Kegan Dougal | 2015-01-28 | 1 | -2/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Log when ASes are registered/unregistered. | Kegan Dougal | 2015-01-27 | 2 | -1/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Use ApplicationService when registering. | Kegan Dougal | 2015-01-27 | 3 | -20/+17 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add stub methods, TODOs and docstrings for application services. | Kegan Dougal | 2015-01-27 | 2 | -5/+72 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add AS specific classes with docstrings. | Kegan Dougal | 2015-01-27 | 1 | -1/+59 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add appservice handler and store. Glue together rest > handler > store. | Kegan Dougal | 2015-01-27 | 6 | -5/+107 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Parse /register and /unregister request JSON. | Kegan Dougal | 2015-01-27 | 1 | -2/+78 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add stub application services REST API. | Kegan Dougal | 2015-01-27 | 7 | -1/+135 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #72 from matrix-org/in_memory_sqlite_for_testing | Mark Haines | 2015-02-13 | 2 | -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 Haines | 2015-02-13 | 2 | -10/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that in-memory databases will work | ||||
* | | | | | | | | | | | | Bump version | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #71 from matrix-org/auth-conflict-res | Erik Johnston | 2015-02-13 | 2 | -14/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | When we see a difference in current state, actually use state conflict resolution algorithm | ||||
| * | | | | | | | | | | | pyflakes | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | When we see a difference in current state, actually use state conflict ↵ | Erik Johnston | 2015-02-13 | 2 | -14/+63 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolution algorithm | ||||
* | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Bump version v0.7.0b | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-13 | 3 | -18/+39 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Reindent code to be less human-readable to keep pep8 from complaining | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Only attempt to fetch presence state of JOINed members in room initialSync ↵ | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SYN-202) | ||||
| * | | | | | | | | | | Merge pull request #70 from matrix-org/exception-fixes | Matthew Hodgson | 2015-02-12 | 3 | -18/+39 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Exception fixes | ||||
| | * | | | | | | | | | | Fix logging | Erik Johnston | 2015-02-12 | 1 | -1/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Remove unused function | Erik Johnston | 2015-02-12 | 1 | -12/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Parrellize fetching of events | Erik Johnston | 2015-02-12 | 1 | -3/+11 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Correctly handle all the places that can throw exceptions | Erik Johnston | 2015-02-12 | 4 | -15/+37 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Reindent code to be less human-readable to keep pep8 from complaining | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Appease pyflakes | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Can now remove the FIXME too | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -10/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Only attempt to fetch presence state of JOINed members in room initialSync ↵ | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -0/+1 |
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SYN-202) | ||||
* | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-12 | 2 | -8/+7 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #69 from matrix-org/hotfixes-v0.7.0a v0.7.0a | Erik Johnston | 2015-02-12 | 2 | -8/+7 |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfixes v0.7.0a | ||||
| * | | | | | | | | | | Bump version | Erik Johnston | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0a | Erik Johnston | 2015-02-12 | 1 | -7/+6 |
|/| | | | | | | | | | | |||||
| * | | | | | | | | | | Get an auth query one at a time | Erik Johnston | 2015-02-12 | 1 | -7/+6 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse v0.7.0 | Erik Johnston | 2015-02-12 | 178 | -4381/+9450 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Expand on caching | Erik Johnston | 2015-02-12 | 1 | -1/+7 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add note about alpha csv2 apis | Erik Johnston | 2015-02-12 | 1 | -2/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Typoes | Erik Johnston | 2015-02-12 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add note about push support | Erik Johnston | 2015-02-12 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Bump webclient version | Erik Johnston | 2015-02-12 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Use consistent style of heading | Erik Johnston | 2015-02-12 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Change develop to v0.7.0 | Erik Johnston | 2015-02-12 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | More rst fixes. Expand on JSON library change | Erik Johnston | 2015-02-12 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix rst formatting | Erik Johnston | 2015-02-12 | 1 | -36/+36 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Update CHANGES.rst | Erik Johnston | 2015-02-12 | 1 | -3/+10 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix rst | Erik Johnston | 2015-02-12 | 1 | -4/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Update UPGRADES to mention updated dependencies | Erik Johnston | 2015-02-12 | 1 | -0/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Set database schema version in delta | Erik Johnston | 2015-02-12 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Bump version | Erik Johnston | 2015-02-12 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Convert get_rooms to use runInteraction so the transacion has a more helpful ↵ | Erik Johnston | 2015-02-11 | 1 | -30/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description | ||||
| * | | | | | | | | | | Use encode_canonical_json for http client | Erik Johnston | 2015-02-11 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Use encode_canonical_json for pushes | Erik Johnston | 2015-02-11 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Update dependency links | Erik Johnston | 2015-02-11 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #61 from matrix-org/timeout-federation-requests | Erik Johnston | 2015-02-11 | 3 | -2/+63 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Timeout federation requests | ||||
| | * | | | | | | | | | | Fix so timing out connections to actually work. | Erik Johnston | 2015-02-11 | 2 | -9/+45 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-11 | 33 | -368/+353 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout-federation-requests | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-02-11 | 172 | -3943/+8780 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout-federation-requests | ||||
| | * | | | | | | | | | | | | PEP8 | Erik Johnston | 2015-02-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Move time_bound_deferred into Clock | Erik Johnston | 2015-02-11 | 3 | -24/+22 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Time out HTTP federation requests | Erik Johnston | 2015-02-10 | 2 | -2/+29 |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #62 from matrix-org/state-chache | Erik Johnston | 2015-02-11 | 3 | -4/+107 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State chache | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-11 | 12 | -54/+43 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-10 | 12 | -38/+64 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-10 | 1 | -0/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Remove unnecessary logging | Erik Johnston | 2015-02-10 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-10 | 1 | -26/+62 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-10 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-10 | 18 | -73/+291 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py synapse/state.py | ||||
| | * | | | | | | | | | | | | | | | | | | Oops, we do want to defer.return regardless of whether we are caching or not | Erik Johnston | 2015-02-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Move construction of object within if block | Erik Johnston | 2015-02-10 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fix tests | Erik Johnston | 2015-02-09 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-06 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | Bug fixes. | Erik Johnston | 2015-02-06 | 2 | -27/+57 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Bugfix cache layer | Erik Johnston | 2015-02-06 | 2 | -11/+22 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Add cache layer to state group resolution | Erik Johnston | 2015-02-06 | 2 | -1/+72 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #66 from matrix-org/use-simplejson | Erik Johnston | 2015-02-11 | 26 | -35/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use simplejson | ||||
| | * | | | | | | | | | | | | | | | | | | | | Bump syutil version | Erik Johnston | 2015-02-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson | Erik Johnston | 2015-02-11 | 10 | -25/+261 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Allow newer versions of syutil | Mark Haines | 2015-02-11 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'bugs/SYN-264' into develop | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -18/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Added another TODO note | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Cache the result of a get_rooms_for_user query, to make ↵ | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -7/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_rooms_intersect() much lighter in the read-common case | ||||
| | * | | | | | | | | | | | | | | | | | | | First step of making user_rooms_intersect() faster - implement in ↵ | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -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_cache | Mark Haines | 2015-02-11 | 8 | -6/+210 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an in-memory cache for get_event in the storage layer | ||||
| | * | | | | | | | | | | | | | | | | | | | Invalidate the cache for an event if it is redacted | Mark Haines | 2015-02-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Fix formatting | Mark Haines | 2015-02-11 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Add a cache for get_event | Mark Haines | 2015-02-11 | 6 | -5/+43 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Add a lru cache class | Mark Haines | 2015-02-11 | 2 | -0/+166 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | pyflakes | Erik Johnston | 2015-02-11 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | Remove more debug logging | Erik Johnston | 2015-02-11 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | Remove debug logging | Erik Johnston | 2015-02-11 | 2 | -12/+0 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | Don't unfreeze when using FreezeEvent.get_dict, as we are using a ↵ | Erik Johnston | 2015-02-11 | 6 | -13/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSONEncoder that understands FrozenDict | ||||
| | | | * | | | | | | | | | | | | | | | | | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 21 | -21/+21 |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Mention new libs in CHANGES | Erik Johnston | 2015-02-11 | 1 | -0/+2 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #63 from matrix-org/homeserver_test_setup | Mark Haines | 2015-02-11 | 25 | -360/+140 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | Factor out some of the common homeserver setup code | ||||
| | * | | | | | | | | | | | | | | | | | Factor out some of the common homeserver setup code into a | Mark Haines | 2015-02-11 | 25 | -360/+140 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup_test_homeserver function in utils. | ||||
| * | | | | | | | | | | | | | | | | | Fix bug where variable was not always defined | Erik Johnston | 2015-02-11 | 1 | -2/+1 |
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge pull request #59 from matrix-org/hotfixes-v0.6.1f v0.6.1f | Erik Johnston | 2015-02-10 | 3 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfixes v0.6.1f | ||||
| * | | | | | | | | | | | | | | | | Bump version | Erik Johnston | 2015-02-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fix prune_events to work with nested dicts | Erik Johnston | 2015-02-10 | 1 | -2/+4 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Pin the twisted version so that it doesn't pull in twisted 15. v0.6.1e | Erik Johnston | 2015-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge pull request #48 from matrix-org/hotfixes-v0.6.1e | Matthew Hodgson | 2015-02-04 | 4 | -7/+138 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfixes v0.6.1e | ||||
| * | | | | | | | | | | | | | | | | Ver bump | Erik Johnston | 2015-02-04 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Pull in python_dependencies.py from develop | Erik Johnston | 2015-02-04 | 1 | -0/+122 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Bluntly port changes of README from develop to master | Erik Johnston | 2015-02-04 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Revert "Pull in python_dependencies.py from develop" | Erik Johnston | 2015-02-04 | 1 | -122/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 47b1e1491f7f98b57f4b6894f0d4d333e64bf721. | ||||
* | | | | | | | | | | | | | | | | | Pull in python_dependencies.py from develop | Erik Johnston | 2015-02-04 | 1 | -0/+122 |
|/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge pull request #60 from matrix-org/single_source_version_and_dependencies | Mark Haines | 2015-02-10 | 3 | -39/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single source version and dependencies | ||||
| | * | | | | | | | | | | | | | | | Rename path to path_segments to make it clearer that it is a list | Mark Haines | 2015-02-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'develop' into single_source_version_and_dependencies | Mark Haines | 2015-02-10 | 7 | -12/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fix code-style | Mark Haines | 2015-02-10 | 7 | -12/+12 |
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Add the 'setup_requires' and allow easy_install since jenkins uses them | Mark Haines | 2015-02-10 | 1 | -14/+5 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Single source version and python dependencies, prevent people accidentally ↵ | Mark Haines | 2015-02-10 | 3 | -44/+43 |
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installing with easy_install, use scripts rather than entry_points to install synctl | ||||
| * | | | | | | | | | | | | | | Log all the exits from _attempt_new_transaction | Erik Johnston | 2015-02-10 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Code-style fixes | Mark Haines | 2015-02-10 | 11 | -36/+57 |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Sign auth_chains when returned by /state/ requests | Erik Johnston | 2015-02-10 | 1 | -0/+11 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #58 from matrix-org/get_event_counters | Mark Haines | 2015-02-10 | 1 | -26/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | Add performance counters for different stages of loading events | ||||
| | * | | | | | | | | | | | Fix pyflakes | Mark Haines | 2015-02-10 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add performance counters for different stages of loading events | Mark Haines | 2015-02-10 | 1 | -24/+60 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | yaml.load expects strings to be a yaml rather than file | Erik Johnston | 2015-02-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Use yaml logging config format because it is much nicer | Erik Johnston | 2015-02-10 | 1 | -1/+2 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-10 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵ | Mark Haines | 2015-02-06 | 1 | -1/+3 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | topological token to a stream token before passing it to get_recent_events_for_room | ||||
| | * | | | | | | | | | Explicitly list the RejectedReasons that we can prove | Erik Johnston | 2015-02-06 | 1 | -1/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Convert directory paths to absolute paths before daemonizing | Mark Haines | 2015-02-09 | 1 | -2/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #56 from matrix-org/room_initial_sync_perf | Mark Haines | 2015-02-09 | 4 | -21/+43 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | During room intial sync, only calculate current state once. | ||||
| | * | | | | | | | | | | During room intial sync, only calculate current state once. | Erik Johnston | 2015-02-09 | 4 | -21/+43 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #57 from matrix-org/transaction_counters | Erik Johnston | 2015-02-09 | 1 | -2/+31 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Transaction counters | ||||
| | * | | | | | | | | | | Use the transaction 'desc' rather than 'name', increment the txn_ids in | Mark Haines | 2015-02-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | txn names | ||||
| | * | | | | | | | | | | Formatting | Mark Haines | 2015-02-09 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Performance counters for database transaction names | Mark Haines | 2015-02-09 | 1 | -1/+31 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Need to use re.search if looking for matches not at the start of the string. ↵ | David Baker | 2015-02-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also comparisons with None should be 'is'. | ||||
| * | | | | | | | | | | oops | Matthew Hodgson | 2015-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | oops | Matthew Hodgson | 2015-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | only do word-boundary patches on bodies for now | Matthew Hodgson | 2015-02-09 | 2 | -2/+5 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #55 from matrix-org/profiling | Erik Johnston | 2015-02-09 | 6 | -6/+60 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Profiling |