Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #97 from matrix-org/hotfixes-v0.7.1-r3 v0.7.1-r3 | Erik Johnston | 2015-03-03 | 2 | -2/+2 |
|\ | |||||
| * | Bump syweb dependency | Erik Johnston | 2015-03-03 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #87 from brabo/master | Mark Haines | 2015-02-23 | 1 | -0/+2 |
|\ | |||||
| * | added "cd ~/.synapse" before setup of the homeserver to generate our files in... | brabo | 2015-02-22 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #86 from matrix-org/v0.7.1-r2 v0.7.1-r2 | Erik Johnston | 2015-02-21 | 2 | -54/+57 |
|\ | |||||
| * | Bump version | Erik Johnston | 2015-02-21 | 1 | -1/+1 |
| * | Don't exit if we can't work out if we're running in a git repo | Erik Johnston | 2015-02-21 | 1 | -53/+56 |
|/ | |||||
* | Merge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse v0.7.1-r1 | Erik Johnston | 2015-02-20 | 2 | -2/+2 |
|\ | |||||
| * | Change version scheme | Erik Johnston | 2015-02-20 | 1 | -1/+1 |
| * | Bump version | Erik Johnston | 2015-02-20 | 1 | -1/+1 |
| * | Add missing comma so that it generates a dict and not a set | Erik Johnston | 2015-02-20 | 1 | -1/+1 |
|/ | |||||
* | Update CHANGES.rst with missing changes v0.7.1 | Erik Johnston | 2015-02-19 | 1 | -0/+9 |
* | Merge branch 'release-v0.7.1' of github.com:matrix-org/synapse | Erik Johnston | 2015-02-19 | 55 | -308/+2548 |
|\ | |||||
| * | Update release date | Erik Johnston | 2015-02-19 | 1 | -1/+1 |
| * | Send room ID in http notifications so clients know which room to go to if the... | David Baker | 2015-02-19 | 1 | -0/+1 |
| * | Update CHANGES | Erik Johnston | 2015-02-18 | 1 | -0/+11 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1 | Erik Johnston | 2015-02-18 | 8 | -41/+106 |
| |\ | |||||
| | * | Merge pull request #82 from matrix-org/git_tag_version | Erik Johnston | 2015-02-18 | 7 | -38/+103 |
| | |\ | |||||
| | | * | Conform to header spec take two | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | | * | Make /keys/ return correct Server version | Erik Johnston | 2015-02-18 | 1 | -1/+5 |
| | | * | Make version_string conform to User-Agent and Server spec | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | | * | pyflakes | Erik Johnston | 2015-02-18 | 1 | -1/+0 |
| | | * | Use git aware version string in User-Agent and Server headers | Erik Johnston | 2015-02-18 | 5 | -36/+33 |
| | | * | When computing git version run git commands in same dir as source files | Erik Johnston | 2015-02-18 | 1 | -0/+5 |
| | | * | Generate a version string that includes git details if run from git checkout | Erik Johnston | 2015-02-18 | 1 | -1/+61 |
| | * | | Bump matrix-angular-sdk version | Erik Johnston | 2015-02-18 | 1 | -3/+3 |
| | |/ | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1 | Erik Johnston | 2015-02-18 | 3 | -9/+33 |
| |\| | |||||
| | * | Merge pull request #80 from matrix-org/restrict-destinations | Erik Johnston | 2015-02-18 | 1 | -3/+27 |
| | |\ | |||||
| | | * | Restrict the destinations that synapse can talk to | Mark Haines | 2015-02-18 | 1 | -3/+27 |
| | * | | Merge pull request #81 from matrix-org/bugs/SYN-282 | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | SYN-282: Don't log tracebacks for client errors | Mark Haines | 2015-02-18 | 1 | -1/+1 |
| | |/ | |||||
| | * | Fix syntax | Mark Haines | 2015-02-18 | 1 | -1/+1 |
| | * | Move pynacl to the top of the depedency link list so that it is | Mark Haines | 2015-02-18 | 1 | -5/+5 |
| * | | Add errback to all deferreds in transaction_queue | Erik Johnston | 2015-02-18 | 1 | -14/+23 |
| * | | Remove unused import | Erik Johnston | 2015-02-18 | 1 | -2/+0 |
| * | | Discard destination 'localhost' | Erik Johnston | 2015-02-18 | 1 | -2/+2 |
| * | | Don't send failure to self | Erik Johnston | 2015-02-18 | 1 | -0/+3 |
| * | | Remove spurious comma. Remove temp run_on_reactor | Erik Johnston | 2015-02-18 | 1 | -2/+1 |
| * | | Temporarily add a run_on_reactor() call | Erik Johnston | 2015-02-18 | 1 | -0/+3 |
| * | | Don't convert DNSLookupError to a 4xx SynapseError | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| * | | Bump version | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| |/ | |||||
| * | Add .__name__ after type(e) | Erik Johnston | 2015-02-18 | 1 | -2/+2 |
| * | Fix up ResponseNeverReceived to str | Erik Johnston | 2015-02-18 | 1 | -9/+11 |
| * | Fix pyflakes | Erik Johnston | 2015-02-18 | 1 | -1/+0 |
| * | 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 d... | Erik Johnston | 2015-02-18 | 4 | -107/+252 |
| |\ | |||||
| | * | 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 keyclient_retry_... | Erik Johnston | 2015-02-17 | 1 | -1/+2 |
| | |\ | |||||
| | * | | Add per server retry limiting. | Erik Johnston | 2015-02-17 | 4 | -122/+205 |
| | * | | 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 |
| | |\ \ \ | |||||
| | | * \ \ | 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 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | 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 | Erik Johnston | 2015-02-17 | 2 | -2/+4 |
| |_|/ / / / / / |/| | | | | | | | |||||
| | * | | | | | | Merge pull request #76 from matrix-org/consumeErrors | Erik Johnston | 2015-02-17 | 6 | -10/+12 |
| |/| | | | | | |/| | | |/ / / | | | |/| | | | | |/| | | | | |||||
| * | | | | | | 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 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #73 from matrix-org/hotfixes-v0.7.0f v0.7.0f | Erik Johnston | 2015-02-16 | 2 | -2/+2 |
|\ \ \ \ | |||||
| | * | | | 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 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Mark old events as outliers. | Erik Johnston | 2015-02-16 | 1 | -1/+7 |
| | | * | Don't return anything from _handle_new_pdu, since we ignore the return value ... | Erik Johnston | 2015-02-16 | 1 | -4/+1 |
| | |/ | |||||
| | * | 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 |
| | |\ | |||||
| | | * | 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 pa... | Kegan Dougal | 2015-02-11 | 4 | -11/+56 |
| | | * | | 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 |
| | | * | | | | Register a user account for the AS when the AS registers. Add 'sender' column... | Kegan Dougal | 2015-02-09 | 5 | -4/+14 |
| | | * | | | | 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 m.login.application_service registration procedure. | Kegan Dougal | 2015-02-05 | 3 | -1/+44 |
| | | * | | | | Dependency inject ApplicationServiceApi when creating ApplicationServicesHand... | Kegan Dougal | 2015-02-05 | 3 | -11/+9 |
| | | * | | | | 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 A... | Kegan Dougal | 2015-02-05 | 1 | -9/+33 |
| | | * | | | | 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 by... | Kegan Dougal | 2015-02-05 | 1 | -0/+23 |
| | | * | | | | | | 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 when... | Kegan Dougal | 2015-02-05 | 4 | -16/+42 |
| | | * | | | | | | | 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 searc... | Kegan Dougal | 2015-02-05 | 2 | -5/+20 |
| | | * | | | | | | | 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 |
| | | * | | | | | | | 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 n... | Kegan Dougal | 2015-02-03 | 2 | -5/+35 |
| | | * | | | | | | | | 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 |
| | | * | | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Add basic application_services SQL, and hook up parts of the appservice store... | Kegan Dougal | 2015-01-28 | 5 | -16/+117 |
| | | * | | | | | | | | | 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 that... | Mark Haines | 2015-02-13 | 2 | -10/+7 |
| * | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | pyflakes | Erik Johnston | 2015-02-13 | 1 | -1/+1 |
| | * | | | | | | | | | | When we see a difference in current state, actually use state conflict resolu... | Erik Johnston | 2015-02-13 | 2 | -14/+63 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | 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 (S... | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -0/+1 |
* | | | | | | | | | | | Merge pull request #70 from matrix-org/exception-fixes | Matthew Hodgson | 2015-02-12 | 3 | -18/+39 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 (S... | Paul "LeoNerd" Evans | 2015-02-12 | 1 | -0/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 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 timeout-federati... | Erik Johnston | 2015-02-11 | 33 | -368/+353 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federati... | Erik Johnston | 2015-02-11 | 172 | -3943/+8780 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | 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 user_rooms_intersect(... | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -7/+34 |
| | * | | | | | | | | | | | | | | | | | | | First step of making user_rooms_intersect() faster - implement in intersectio... | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -18/+20 |
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #65 from matrix-org/get_event_cache | Mark Haines | 2015-02-11 | 8 | -6/+210 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | 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 JSONEncoder... | Erik Johnston | 2015-02-11 | 6 | -13/+36 |
| | | | * | | | | | | | | | | | | | | | | | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 21 | -21/+21 |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |