| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #88 from matrix-org/batched_get_pdu | Erik Johnston | 2015-03-02 | 8 | -57/+231 |
|\ |
|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu | Erik Johnston | 2015-03-02 | 32 | -147/+1212 |
| |\
| |/
|/| |
|
* | | Merge pull request #83 from matrix-org/nofile_limit_config | Erik Johnston | 2015-03-02 | 2 | -8/+33 |
|\ \ |
|
| * | | By default set soft limit to hard limit | Erik Johnston | 2015-02-20 | 2 | -7/+11 |
| * | | Rename resource variable so as to not shadow module import | Erik Johnston | 2015-02-19 | 1 | -5/+5 |
| * | | Add config option to set the soft fd limit on start | Erik Johnston | 2015-02-19 | 2 | -3/+24 |
* | | | Merge pull request #94 from matrix-org/federation_rate_limit | Erik Johnston | 2015-03-02 | 4 | -3/+275 |
|\ \ \ |
|
| * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into federation_rate_... | Erik Johnston | 2015-03-02 | 10 | -59/+284 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #95 from matrix-org/serialize_transaction_processing | Erik Johnston | 2015-03-02 | 1 | -20/+12 |
|\ \ \ \ |
|
| * | | | | If we're yielding don't add errback | Erik Johnston | 2015-03-02 | 1 | -7/+3 |
| * | | | | Process transactions serially. | Erik Johnston | 2015-03-02 | 1 | -14/+10 |
* | | | | | Merge pull request #92 from matrix-org/application-services-event-stream | Kegsay | 2015-03-02 | 9 | -39/+272 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | PEP8 | Kegan Dougal | 2015-03-02 | 1 | -1/+1 |
| * | | | | Wrap all of get_app_service_rooms in a txn. | Kegan Dougal | 2015-03-02 | 6 | -88/+67 |
| * | | | | JOIN state_events rather than parsing unrecognized_keys to pull out member st... | Kegan Dougal | 2015-03-02 | 2 | -11/+5 |
| * | | | | Modify _simple_select_list to allow an empty WHERE clause. Use it for get_all... | Kegan Dougal | 2015-03-02 | 4 | -17/+21 |
| * | | | | PR tweaks: set earlier on and use 'as json' for compat | Kegan Dougal | 2015-03-02 | 3 | -16/+12 |
| * | | | | PEP8 | Kegan Dougal | 2015-02-27 | 1 | -1/+0 |
| * | | | | Fix unit tests | Kegan Dougal | 2015-02-27 | 1 | -0/+3 |
| * | | | | Notify appservices of invites mid-poll. | Kegan Dougal | 2015-02-27 | 1 | -1/+29 |
| * | | | | Check for membership invite events correctly. | Kegan Dougal | 2015-02-26 | 1 | -2/+21 |
| * | | | | Update CHANGES | Kegan Dougal | 2015-02-26 | 1 | -0/+2 |
| * | | | | Finish impl to get new events for AS. ASes should now be able to poll /events | Kegan Dougal | 2015-02-26 | 2 | -8/+58 |
| * | | | | Finish impl to extract all room IDs an AS may be interested in when polling t... | Kegan Dougal | 2015-02-26 | 2 | -6/+36 |
| * | | | | PEP8 and pyflakes | Kegan Dougal | 2015-02-25 | 2 | -6/+3 |
| * | | | | Comment unused variables. | Kegan Dougal | 2015-02-25 | 1 | -2/+2 |
| * | | | | Fix alias query. | Kegan Dougal | 2015-02-25 | 1 | -6/+5 |
| * | | | | Add support for extracting matching room_ids and room_aliases for a given AS. | Kegan Dougal | 2015-02-25 | 3 | -2/+82 |
| * | | | | Add stub functions and work out execution flow to implement AS event stream p... | Kegan Dougal | 2015-02-25 | 4 | -12/+65 |
| | * | | | Use contextlib.contextmanager instead of a custom class | Erik Johnston | 2015-03-02 | 1 | -22/+12 |
| | * | | | Make the federation server ratelimiting configurable. | Erik Johnston | 2015-03-02 | 2 | -5/+41 |
| | * | | | Move federation rate limiting out of transport layer | Erik Johnston | 2015-02-27 | 3 | -204/+230 |
| | * | | | Document FederationRateLimiter | Erik Johnston | 2015-02-27 | 1 | -8/+51 |
| | * | | | Initial implementation of federation server rate limiting | Erik Johnston | 2015-02-26 | 2 | -5/+182 |
| |/ / /
|/| | | |
|
* | | | | SYWEB-278 Don't allow rules with no rule_id. | David Baker | 2015-02-25 | 1 | -1/+1 |
|/ / / |
|
* | | | turns uris config options should append since it's a list | David Baker | 2015-02-24 | 1 | -1/+1 |
* | | | Fix YAML syntax of turn config example | David Baker | 2015-02-24 | 1 | -1/+1 |
* | | | tabs/spaces | David Baker | 2015-02-24 | 1 | -8/+8 |
* | | | Use standard form submission so the go button on the keyboard works. | David Baker | 2015-02-24 | 1 | -3/+3 |
* | | | Merge pull request #91 from matrix-org/registration-fallback-ios-display | Kegsay | 2015-02-24 | 2 | -0/+5 |
|\ \ \ |
|
| * | | | Fallback registration page: oops. Removed dev test. | manuroe | 2015-02-24 | 1 | -1/+1 |
| * | | | Fallback registration page: added the classic viewport meta to fix the displa... | manuroe | 2015-02-24 | 2 | -1/+6 |
|/ / / |
|
* | | | %s for strings otherwise you end up sending 'u"foo"' | David Baker | 2015-02-24 | 1 | -1/+1 |
* | | | Merge pull request #89 from matrix-org/registration-fallback | Erik Johnston | 2015-02-24 | 12 | -1/+433 |
|\ \ \ |
|
| * | | | Update CHANGES and UPGRADE | Kegan Dougal | 2015-02-24 | 2 | -0/+21 |
| * | | | Set user-visible error when the server is misconfigured. | Kegan Dougal | 2015-02-24 | 1 | -0/+1 |
| * | | | Trailing comma | Kegan Dougal | 2015-02-23 | 1 | -1/+1 |
| * | | | Add jquery | Kegan Dougal | 2015-02-23 | 1 | -0/+4 |
| * | | | Get everything working | Kegan Dougal | 2015-02-23 | 2 | -24/+113 |
| * | | | Add core registration html/js | Kegan Dougal | 2015-02-23 | 6 | -0/+309 |
| * | | | Actually treat this as static content, not random Resources. | Kegan Dougal | 2015-02-23 | 4 | -31/+7 |
| * | | | Add RegisterFallbackResource to /_matrix/static/client/register | Kegan Dougal | 2015-02-23 | 4 | -0/+32 |
* | | | | Use OrderedDict for @cached backing store, so we can evict the oldest key unb... | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -7/+4 |
* | | | | Use cache.pop() instead of a separate membership test + del [] | Paul "LeoNerd" Evans | 2015-02-23 | 2 | -2/+8 |
* | | | | Fix code style warning | Mark Haines | 2015-02-23 | 1 | -1/+1 |
* | | | | Remove unused import | Mark Haines | 2015-02-23 | 1 | -2/+0 |
* | | | | Merge remote-tracking branch 'origin/develop' into performance-cache-improvem... | Paul "LeoNerd" Evans | 2015-02-23 | 8 | -3/+54 |
|\| | | |
|
* | | | | Pull the _get_event_cache.setdefault() call out of the try block, as it doesn... | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -1/+2 |
* | | | | Use the @cached decorator to implement the destination_retry_timings cache | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -9/+5 |
* | | | | RoomMemberStore no longer needs a _user_rooms_cache member | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -5/+0 |
* | | | | Allow @cached-wrapped functions to have a prefill method for setting entries | Paul "LeoNerd" Evans | 2015-02-23 | 2 | -8/+29 |
* | | | | Squash out the now-redundant ApplicationServicesCache object class | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -20/+8 |
* | | | | Remove a TODO note | Paul "LeoNerd" Evans | 2015-02-19 | 1 | -1/+0 |
* | | | | Take named arguments to @cached() decorator, add a 'max_entries' limit | Paul "LeoNerd" Evans | 2015-02-19 | 3 | -16/+114 |
* | | | | Move @cached decorator out into synapse.storage._base; add minimal docs | Paul "LeoNerd" Evans | 2015-02-19 | 2 | -27/+36 |
* | | | | Pull out the 'get_rooms_for_user' cache logic into a reüsable @cached decorator | Paul "LeoNerd" Evans | 2015-02-19 | 1 | -24/+29 |
| |/ /
|/| | |
|
| | * | Must update pending_transactions map before yield'ing | Erik Johnston | 2015-02-26 | 1 | -2/+2 |
| | * | Fix presence tests | Erik Johnston | 2015-02-23 | 1 | -15/+28 |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu | Erik Johnston | 2015-02-23 | 7 | -3/+45 |
| | |\
| | |/
| |/| |
|
| * | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-20 | 2 | -2/+2 |
| |\ \ |
|
| | * \ | 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 |
| | |/ / |
|
| * | | | Merge pull request #84 from matrix-org/disable_registration | Erik Johnston | 2015-02-20 | 5 | -1/+43 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Always allow AS to register | Erik Johnston | 2015-02-20 | 1 | -3/+5 |
| | * | | Update tests | Erik Johnston | 2015-02-19 | 2 | -0/+2 |
| | * | | Disable registration if config option was set. | Erik Johnston | 2015-02-19 | 1 | -0/+4 |
| | * | | Add config option to disable registration. | Erik Johnston | 2015-02-19 | 2 | -1/+35 |
| |/ / |
|
| | * | Revert get_auth_chain changes | Erik Johnston | 2015-02-23 | 1 | -7/+5 |
| | * | Implement and use new batched get missing pdu | Erik Johnston | 2015-02-23 | 6 | -100/+144 |
| | * | Initial stab at implementing a batched get_missing_pdus request | Erik Johnston | 2015-02-19 | 3 | -9/+135 |
| |/ |
|
| * | 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 |