| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| |\ |
|
| | * | priority class now dealt with in namespaced rule_id | David Baker | 2015-02-05 | 1 | -4/+0 |
| * | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 5 | -163/+222 |
| |\| |
|
| | * | Give server default rules the 'default' attribute and fix various brokenness. | David Baker | 2015-02-05 | 3 | -3/+9 |
| | * | Server default rules now of all kinds rather than all being at lowest prio. | David Baker | 2015-02-05 | 4 | -51/+98 |
| | * | namespace rule IDs to be unique within their scope and rule type. | David Baker | 2015-02-05 | 1 | -123/+129 |
| * | | 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 |
| |\| |
|
| | * | Merge branch 'federation_client_retries' of github.com:matrix-org/synapse int... | Erik Johnston | 2015-02-05 | 8 | -89/+169 |
| | |\ |
|
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien... | Erik Johnston | 2015-02-05 | 3 | -5/+82 |
| | | |\ |
|
| | | * | | Connection errors in twisted aren't RuntimeErrors | Erik Johnston | 2015-02-05 | 1 | -2/+2 |
| | | * | | Pass through list of room hosts from room alias query to federation so that i... | Erik Johnston | 2015-02-05 | 3 | -15/+22 |
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien... | Erik Johnston | 2015-02-04 | 16 | -49/+146 |
| | | |\ \ |
|
| | | * \ \ | Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder... | Erik Johnston | 2015-02-04 | 3 | -9/+15 |
| | | |\ \ \ |
|
| | | * | | | | Apply sanity to the transport client interface. Convert 'make_join' and 'send... | Erik Johnston | 2015-02-04 | 6 | -71/+130 |
| | | * | | | | When returning lists of servers from alias lookups, put the current server fi... | Erik Johnston | 2015-02-04 | 1 | -1/+10 |
| | | * | | | | Retry make_join | Erik Johnston | 2015-02-04 | 1 | -7/+12 |
| | * | | | | | Merge pull request #47 from matrix-org/signature_failures | Erik Johnston | 2015-02-05 | 9 | -272/+429 |
| | |\ \ \ \ \
| | | |/ / /
| | |/| | /
| | |_|_|/
| |/| | | |
|
| | | * | | | Change context.auth_events to what the auth_events would be bases on context.... | Erik Johnston | 2015-02-04 | 3 | -9/+15 |
| | | |/ / |
|
| | | * | | Brief comment on why we do some things on every call to persist_event and not... | Erik Johnston | 2015-02-04 | 1 | -0/+6 |
| | | * | | Fix state resolution to remember join_rules is a type of auth event. | Erik Johnston | 2015-02-04 | 1 | -1/+13 |
| | | * | | Rearrange persist_event so that do all the queries that need to be done befor... | Erik Johnston | 2015-02-04 | 3 | -72/+77 |
| | | * | | Add doc to get_event | Erik Johnston | 2015-02-03 | 1 | -0/+15 |
| | | * | | New line | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | | * | | Neaten the handling of state and auth_chain up a bit | Erik Johnston | 2015-02-03 | 1 | -27/+30 |
| | | * | | Actually, the old prune_event function was non-deterministic, so no point kee... | Erik Johnston | 2015-02-03 | 2 | -91/+4 |
| | | * | | Remove unused imports | Erik Johnston | 2015-02-03 | 1 | -5/+0 |
| | | * | | Add new FederationBase | Erik Johnston | 2015-02-03 | 1 | -0/+126 |
| | | * | | Keep around the old (buggy) version of the prune_event function so that we ca... | Erik Johnston | 2015-02-03 | 4 | -137/+92 |
| | | * | | Don't completely die if get auth_chain or querying auth_chain requests fail | Erik Johnston | 2015-02-03 | 1 | -63/+72 |
| | | * | | Set combinations is | and not + | Erik Johnston | 2015-02-03 | 1 | -2/+2 |
| | | * | | Spelling | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | | * | | Give exception better message | Erik Johnston | 2015-02-03 | 1 | -1/+1 |
| | | * | | Add FIXME note. | Erik Johnston | 2015-02-03 | 1 | -0/+2 |
| | | * | | PEP8 | Erik Johnston | 2015-02-03 | 1 | -1/+0 |
| | | * | | Return rejected events if asked for it over federation. | Erik Johnston | 2015-02-03 | 1 | -0/+1 |
| | | * | | Try to ensure we don't persist an event we have already persisted. In persist... | Erik Johnston | 2015-02-03 | 3 | -19/+68 |
| | | * | | Don't bother requesting PDUs with bad signatures from the same server | Erik Johnston | 2015-02-02 | 1 | -16/+17 |
| | | * | | Don't fail an entire request if one of the returned events fails a signature ... | Erik Johnston | 2015-02-02 | 2 | -34/+94 |
| | * | | | SYN-202: Log as WARN the 404 'Presence information not visible' errors instea... | Erik Johnston | 2015-02-05 | 1 | -5/+12 |
| | * | | | Print out the auth events on failure | Erik Johnston | 2015-02-05 | 1 | -1/+1 |
| | * | | | Add script to check and auth chain and current state of a room | Erik Johnston | 2015-02-04 | 1 | -0/+65 |
| | * | | | Mention new pydenticon dep. | Erik Johnston | 2015-02-04 | 1 | -0/+5 |
| | | |/
| |/| |
|
| | * | | More s/instance_handle/profile_tag/ | David Baker | 2015-02-04 | 1 | -5/+5 |
| | * | | s/instance_handle/profile_tag/ | David Baker | 2015-02-03 | 8 | -37/+37 |
| | * | | Use set_tweak instead of set_sound | David Baker | 2015-02-03 | 2 | -3/+4 |
| * | | | 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 |
| |\| | |
|
| | * | | Merge pull request #46 from matrix-org/identicons | Mark Haines | 2015-02-02 | 4 | -0/+55 |
| | |\ \ |
|
| | | * | | Add pydenticon to python_dependencies | Mark Haines | 2015-02-02 | 1 | -0/+1 |
| | | * | | Add Cache-Control header to identicon | Mark Haines | 2015-02-02 | 1 | -0/+3 |
| | | * | | Fix setting identicon width and height | Mark Haines | 2015-02-02 | 1 | -2/+2 |
| | | * | | Spell height more correctly | Mark Haines | 2015-02-02 | 1 | -1/+1 |
| | | * | | Add a media/v1/identicon resource for generating identicons using pydenticon | Mark Haines | 2015-02-02 | 3 | -0/+51 |
| | * | | | less obscure xargs | Matthew Hodgson | 2015-02-02 | 1 | -1/+1 |
| | * | | | Generate a list of dependencies from synapse/python_dependencies.py | Mark Haines | 2015-02-02 | 1 | -0/+41 |
| | * | | | fix typo | Matthew Hodgson | 2015-02-02 | 1 | -1/+1 |
| | |/ / |
|
| | * | | Merge master into develop | Mark Haines | 2015-02-02 | 3 | -4/+4 |
| | |\ \
| | |/
| |/| |
|
| | | * | fix OSX stuff and typos | Matthew Hodgson | 2015-02-02 | 1 | -2/+3 |
| | | * | Merge pull request #45 from matrix-org/hotfixes-v0.6.1d v0.6.1d | Mark Haines | 2015-02-02 | 3 | -3/+4 |
| | | |\ |
|
| | | | * | Bump version to 0.6.1d | Mark Haines | 2015-02-02 | 2 | -2/+2 |
| | | | * | Pin the version of Twisted to 14.0.2 since we are using some of its internals | Mark Haines | 2015-02-02 | 1 | -1/+2 |
| | | |/ |
|
| | | * | Tell people to "source" the activate script for virtualenv, Remove --user fro... | Mark Haines | 2015-02-02 | 1 | -7/+7 |
| | | * | Update documentation to recommend virtual env | Mark Haines | 2015-02-02 | 1 | -21/+15 |
| | | * | Merge branch 'hotfixes-v0.6.1c' of github.com:matrix-org/synapse v0.6.1c | Erik Johnston | 2015-02-02 | 3 | -4/+4 |
| | | |\ |
|
| | | | * | Use >= for version of webclient | Erik Johnston | 2015-02-02 | 1 | -1/+1 |
| | | | * | Bump version | Erik Johnston | 2015-02-02 | 2 | -2/+2 |
| | | | * | Bump version of webclient pulled in. | Erik Johnston | 2015-02-02 | 1 | -2/+2 |
| | | |/ |
|
| * | | | 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 |
| |\| | |
|
| | * | | Ignore empty strings for display names & room names in notifications | David Baker | 2015-01-31 | 1 | -2/+2 |
| | * | | fix OSX stuff and typos | Matthew Hodgson | 2015-01-31 | 1 | -2/+3 |
| | * | | Again, don't assume all member events have displayname. | David Baker | 2015-01-30 | 1 | -1/+1 |
| | * | | Don't assume all member events have a display nme. | David Baker | 2015-01-30 | 1 | -4/+5 |
| | * | | Resign events when we return them via /query_auth/ | Erik Johnston | 2015-01-30 | 1 | -0/+9 |
| | * | | s/homeserver.config/homeserver.yaml/ because that's what synctl looks for. | David Baker | 2015-01-30 | 1 | -5/+5 |
| | * | | Add twisted to setup requires so it gets processed before setuptools_trial | David Baker | 2015-01-30 | 1 | -0/+1 |
| | * | | add generate config instruction to the HS setup part | David Baker | 2015-01-30 | 1 | -0/+9 |
| | * | | Tell people to "source" the activate script for virtualenv, Remove --user fro... | Mark Haines | 2015-01-30 | 1 | -7/+7 |
| | * | | Update documentation to recommend virtual env | Mark Haines | 2015-01-30 | 1 | -30/+15 |
| | * | | Return empty list rather than None when there are no emphemeral events for a ... | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| | * | | Fix bug where accepting invite over federation didn't work. Add logging. | Erik Johnston | 2015-01-30 | 1 | -8/+49 |
| | * | | Merge pull request #43 from matrix-org/rejections | Erik Johnston | 2015-01-30 | 16 | -172/+708 |
| | |\ \ |
|
| | | * | | Briefly doc structure of query_auth API. | Erik Johnston | 2015-01-30 | 1 | -0/+18 |
| | | * | | Only auth_events with event if event in event.auth_events | Erik Johnston | 2015-01-30 | 1 | -1/+3 |
| | | * | | Remove debug logging | Erik Johnston | 2015-01-30 | 1 | -9/+0 |
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 19 | -25/+1166 |
| | | |\ \ |
|
| | | * \ \ | Merge branch 'replication_split' of github.com:matrix-org/synapse into reject... | Erik Johnston | 2015-01-30 | 4 | -10/+7 |
| | | |\ \ \ |
|
| | | * | | | | Fix bug where we superfluously asked for current state. Change API of /query_... | Erik Johnston | 2015-01-30 | 5 | -49/+43 |
| | | * | | | | Revert accidental bumping of angluar_sdk dep | Erik Johnston | 2015-01-30 | 1 | -2/+2 |
| | | * | | | | Fix bad merge fo python_dependencies.py | Erik Johnston | 2015-01-30 | 1 | -1/+0 |
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 51 | -326/+2392 |
| | | |\ \ \ \ |
|
| | | * | | | | | Update the current state of an event if we update auth events. | Erik Johnston | 2015-01-30 | 1 | -1/+3 |
| | | * | | | | | Fix bug in timeout handling in keyclient | Erik Johnston | 2015-01-30 | 1 | -3/+4 |
| | | * | | | | | Fix regression where we no longer correctly handled the case of gaps in our e... | Erik Johnston | 2015-01-30 | 2 | -2/+9 |
| | | * | | | | | Fix bug where we changes in outlier in metadata dict propogated to other events | Erik Johnston | 2015-01-30 | 3 | -4/+8 |
| | | * | | | | | Initial implementation of auth conflict resolution | Erik Johnston | 2015-01-29 | 8 | -81/+210 |
| | | * | | | | | Make post_json(...) actually send data. | Erik Johnston | 2015-01-29 | 1 | -1/+1 |
| | | * | | | | | Add post_json(...) method to federation client | Erik Johnston | 2015-01-29 | 1 | -0/+37 |
| | | * | | | | | Start implementing auth conflict res | Erik Johnston | 2015-01-28 | 6 | -52/+253 |
| | | * | | | | | Make it the responsibility of the replication layer to check signature and ha... | Erik Johnston | 2015-01-26 | 3 | -26/+173 |
| | * | | | | | | Allow any greater version for webclient | Erik Johnston | 2015-01-30 | 1 | -1/+1 |
| | * | | | | | | Spit out server default rules too. | David Baker | 2015-01-30 | 2 | -10/+17 |
| | * | | | | | | Merge pull request #41 from matrix-org/client_v2_sync | Mark Haines | 2015-01-30 | 7 | -46/+794 |
| | |\ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | | |
|
| | | * | | | | | Add doc string for __nonzero__ overrides for sync results, raise not implemen... | Mark Haines | 2015-01-30 | 1 | -1/+8 |
| | | * | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-30 | 2 | -10/+2 |
| | | |\ \ \ \ \ |
|
| | | * | | | | | | Check if the user has joined the room between incremental syncs | Mark Haines | 2015-01-30 | 1 | -4/+27 |
| | | * | | | | | | Pass client info to the sync_config | Mark Haines | 2015-01-30 | 2 | -3/+4 |
| | | * | | | | | | Fix token formatting | Mark Haines | 2015-01-30 | 2 | -5/+5 |
| | | * | | | | | | Filter the recent events before applying the limit when doing an initial sync | Mark Haines | 2015-01-30 | 1 | -11/+10 |
| | | * | | | | | | Filter the recent events before applying the limit when doing an incremental ... | Mark Haines | 2015-01-30 | 4 | -24/+54 |
| | | * | | | | | | Update todo for the filtering on sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| | | * | | | | | | Add basic filtering support | Mark Haines | 2015-01-29 | 1 | -5/+14 |
| | | * | | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 3 | -164/+166 |
| | | |\ \ \ \ \ \ |
|
| | | * | | | | | | | Fix indent | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | | * | | | | | | | Move typing notifs to an "emphermal" event list on the room object | Mark Haines | 2015-01-29 | 2 | -7/+9 |
| | | * | | | | | | | Fix check for empty room update | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | | * | | | | | | | Fix v2 initial sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| | | * | | | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 9 | -40/+54 |
| | | |\ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 2 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 15 | -20/+1100 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of chang... | Mark Haines | 2015-01-29 | 2 | -11/+52 |
| | | * | | | | | | | | | | Remove typing TODO | Mark Haines | 2015-01-29 | 1 | -1/+0 |
| | | * | | | | | | | | | | Add typing notifications to sync | Mark Haines | 2015-01-29 | 2 | -19/+29 |
| | | * | | | | | | | | | | Include transaction ids in unsigned section of events in the sync results for... | Mark Haines | 2015-01-29 | 2 | -12/+22 |
| | | * | | | | | | | | | | Add support for formatting events in the way a v2 client expects | Mark Haines | 2015-01-29 | 1 | -39/+52 |
| | | * | | | | | | | | | | Add ports back to demo/start.sh | Mark Haines | 2015-01-28 | 2 | -2/+2 |
| | | * | | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-28 | 42 | -300/+2092 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Fix Formatting | Mark Haines | 2015-01-27 | 4 | -14/+9 |
| | | * | | | | | | | | | | | Wait for events if the incremental sync is empty and a timeout is given | Mark Haines | 2015-01-27 | 3 | -8/+61 |
| | | * | | | | | | | | | | | Start implementing incremental initial sync | Mark Haines | 2015-01-27 | 3 | -34/+241 |
| | | * | | | | | | | | | | | Start implementing the non-incremental sync portion of the v2 /sync API | Mark Haines | 2015-01-26 | 4 | -54/+146 |
| | | * | | | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 8 | -21/+60 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Add handler for /sync API | Mark Haines | 2015-01-26 | 1 | -0/+110 |
| | | * | | | | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 2 | -1/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 2 | -1/+7 |
| | | * | | | | | | | | | | | | | Start implementing the v2_alpha sync API | Mark Haines | 2015-01-23 | 5 | -0/+272 |
| | * | | | | | | | | | | | | | | Merge pull request #42 from matrix-org/replication_split | Mark Haines | 2015-01-30 | 5 | -886/+993 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into repli... | Erik Johnston | 2015-01-30 | 52 | -333/+2390 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Split up replication_layer module into client, server and transaction queue | Erik Johnston | 2015-01-26 | 5 | -603/+654 |
| | | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-23 | 96 | -1707/+599 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Add storage method have_events | Erik Johnston | 2015-01-23 | 1 | -0/+29 |
| | | * | | | | | | | | | | | | | | Split out TransactionQueue from replication layer | Erik Johnston | 2015-01-22 | 2 | -289/+316 |
| | | * | | | | | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... | Erik Johnston | 2015-01-22 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | Add glob asterisks when running rules. | David Baker | 2015-01-30 | 2 | -4/+6 |
| | * | | | | | | | | | | | | | | | | Merge pull request #40 from matrix-org/rejections_storage | Mark Haines | 2015-01-30 | 6 | -11/+86 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | Remove merge conflict | Erik Johnston | 2015-01-30 | 1 | -3/+0 |
| | | * | | | | | | | | | | | | | | | | Remember to add schema file to list | Erik Johnston | 2015-01-30 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 14 | -11/+1140 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 11 | -5/+1072 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Use 'in' to test if the key exists, remove unused _filters_for_user | Mark Haines | 2015-01-30 | 2 | -10/+2 |
| | | * | | | | | | | | | | | | | | | | Unused import | Mark Haines | 2015-01-30 | 1 | -2/+0 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 3 | -164/+166 |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge branch 'develop' into client_v2_filter | Mark Haines | 2015-01-29 | 8 | -27/+48 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | Fix code-style | Mark Haines | 2015-01-29 | 1 | -13/+6 |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 2 | -2/+3 |
| | | | |_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge changes from develop | Mark Haines | 2015-01-29 | 42 | -302/+2052 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Move bump schema delta | Mark Haines | 2015-01-29 | 1 | -0/+0 |
| | | * | | | | | | | | | | | | | | Add filter_room_state unit tests. | Kegan Dougal | 2015-01-29 | 1 | -0/+56 |
| | | * | | | | | | | | | | | | | | Add basic filtering public API unit tests. Use defers in the right places. | Kegan Dougal | 2015-01-29 | 2 | -5/+60 |
| | | * | | | | | | | | | | | | | | Add more unit tests for the filter algorithm. | Kegan Dougal | 2015-01-29 | 1 | -5/+259 |
| | | * | | | | | | | | | | | | | | Implement filter algorithm. Add basic event type unit tests to assert it works. | Kegan Dougal | 2015-01-29 | 2 | -1/+93 |
| | | * | | | | | | | | | | | | | | Add filtering public API; outline filtering algorithm. | Kegan Dougal | 2015-01-29 | 1 | -8/+52 |
| | | * | | | | | | | | | | | | | | Add filtering.filter_events function, with stub passes_filter function. | Kegan Dougal | 2015-01-29 | 1 | -0/+15 |
| | | * | | | | | | | | | | | | | | Also edit the filter column on the delta SQL | Kegan Dougal | 2015-01-29 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | s/definition/filter_json/ since definition is now used to mean a component of... | Kegan Dougal | 2015-01-28 | 2 | -3/+3 |
| | | * | | | | | | | | | | | | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 4 | -11/+128 |
| | | * | | | | | | | | | | | | | | Created schema delta | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -1/+25 |
| | | * | | | | | | | | | | | | | | Initial stab at real SQL storage implementation of user filter definitions | Paul "LeoNerd" Evans | 2015-01-27 | 4 | -15/+78 |
| | | * | | | | | | | | | | | | | | More unit-testing of REST errors | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -1/+35 |
| | | * | | | | | | | | | | | | | | Move storage of user filters into real datastore layer; now have to mock it o... | Paul "LeoNerd" Evans | 2015-01-27 | 5 | -27/+79 |
| | | * | | | | | | | | | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement... | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -7/+22 |
| | | * | | | | | | | | | | | | | | Initial trivial unittest of Filtering object | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+67 |
| | | * | | | | | | | | | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ... | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -13/+58 |
| | | * | | | | | | | | | | | | | | Use new V2AlphaRestTestCase | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -38/+2 |
| | | * | | | | | | | | | | | | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 8 | -21/+90 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | Minor changes to v2_alpha filter REST test to allow the setUp method to be sh... | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -5/+7 |
| | | * | | | | | | | | | | | | | | | Initial trivial REST test of v2_alpha filter API | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+74 |
| | | * | | | | | | | | | | | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ... | Paul "LeoNerd" Evans | 2015-01-26 | 2 | -1/+109 |
| | * | | | | | | | | | | | | | | | | Add room member count condition and default rule to make a noise on rooms of ... | David Baker | 2015-01-30 | 3 | -6/+63 |
| | * | | | | | | | | | | | | | | | | Merge pull request #38 from matrix-org/new_state_resolution | Mark Haines | 2015-01-30 | 2 | -121/+441 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | Add a slightly more helpful comment | Erik Johnston | 2015-01-30 | 1 | -1/+2 |
| | | | | | | | * | | | | | | | | | | | Be more specific in naming columns in selects. | Erik Johnston | 2015-01-30 | 1 | -1/+1 |
| | | | | | | | * | | | | | | | | | | | Put CREATE rejections into seperate .sql | Erik Johnston | 2015-01-30 | 2 | -7/+21 |
| | | | | | | | | |_|_|/ / / / / / /
| | | | | | | |/| | | | | | | | | |
|
| | | | | | | | * | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... | Erik Johnston | 2015-01-30 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolu... | Erik Johnston | 2015-01-30 | 125 | -2084/+3048 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | |
|
| | | | | | | | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 125 | -2083/+3034 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ / / / / / / / / /
| |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | We do need Twisted 14, not 15: we use internal Twisted things that have been ... | David Baker | 2015-01-30 | 2 | -2/+2 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Include content in notification pokes | David Baker | 2015-01-29 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | Change 'from' in notification pokes to 'sender' to match client API v2. Send ... | David Baker | 2015-01-29 | 2 | -5/+14 |
| | * | | | | | | | | | | | | | | | Add default push rules including setting a sound for messages mentioning your... | David Baker | 2015-01-29 | 2 | -8/+74 |
| | * | | | | | | | | | | | | | | | Renumber priority classes so we can use 0 for defaults. | David Baker | 2015-01-29 | 1 | -5/+5 |
| | * | | | | | | | | | | | | | | | Allow kind to be set to null to delete a pusher. | David Baker | 2015-01-29 | 1 | -1/+10 |
| | | |_|_|_|/ / / / / / / / / /
| |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Code style fixes. | Mark Haines | 2015-01-29 | 8 | -26/+42 |
| | * | | | | | | | | | | | | | | Only send a badge-reset if the user actually has unread notifications. | David Baker | 2015-01-29 | 1 | -2/+7 |
| | | |_|_|/ / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | SYN-252: Supply the stream and topological parts in the correct order to the ... | Mark Haines | 2015-01-29 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | Allow the push rule delete method to take more specifiers. | David Baker | 2015-01-28 | 1 | -8/+11 |
| | * | | | | | | | | | | | | | Change uses of get_user_by_req because it returns a tuple now. | David Baker | 2015-01-28 | 2 | -4/+4 |
| | | |_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 19 | -50/+97 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ... | Mark Haines | 2015-01-28 | 2 | -3/+3 |
| | | * | | | | | | | | | | | | Add a : to the doc string after the type of the return value | Mark Haines | 2015-01-28 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | Extract the id token of the token when authing users, include the token and d... | Mark Haines | 2015-01-28 | 18 | -48/+92 |
| | | * | | | | | | | | | | | | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 13 | -31/+34 |
| | | | |_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge branch 'master' into develop | David Baker | 2015-01-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|/
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | Add matrix.org as a trusted ID server because it's now passed through on port... | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | * | | | | | | | | | | | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse v0.6.1b | Erik Johnston | 2015-01-13 | 3 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | Move pushers delta to v12 and bump schema version | David Baker | 2015-01-28 | 2 | -1/+1 |
| | * | | | | | | | | | | | | | Merge pull request #35 from matrix-org/pushers2 | David Baker | 2015-01-28 | 21 | -248/+1948 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ / / / / / /
| |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Use %s instead of + | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | * | | | | | | | | | | | | Newline | David Baker | 2015-01-28 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | Redundant parens | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | unnecessary newlines | David Baker | 2015-01-28 | 1 | -2/+0 |
| | | * | | | | | | | | | | | | More magic commas (including the place I copied it from...) | David Baker | 2015-01-28 | 1 | -4/+4 |
| | | * | | | | | | | | | | | | Google doc style | David Baker | 2015-01-28 | 1 | -4/+5 |
| | | * | | | | | | | | | | | | spaces | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | * | | | | | | | | | | | | Unnecessary newlines. | David Baker | 2015-01-28 | 1 | -5/+0 |
| | | * | | | | | | | | | | | | Unnecessary newline. | David Baker | 2015-01-28 | 1 | -1/+0 |
