| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 a media/v1/identicon resource for generating identicons | ||||
| | | * | 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 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: README.rst setup.py | ||||
| | | * | 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 |
| | | |\ | | | | | | | | | Hotfixes v0.6.1d | ||||
| | | | * | 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 ↵ | Mark Haines | 2015-02-02 | 1 | -7/+7 |
| | | | | | | | | | | | | | from pip install | ||||
| | | * | Update documentation to recommend virtual env | Mark Haines | 2015-02-02 | 1 | -21/+15 |
| | | | | | | | | | | | | | | | | Conflicts: README.rst | ||||
| | | * | 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 ↵ | 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 | ||||
| | * | | 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 ↵ | Mark Haines | 2015-01-30 | 1 | -7/+7 |
| | | | | | | | | | | | | | from pip install | ||||
| | * | | 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 |
| | | | | | | | | | | | | | room | ||||
| | * | | 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 |
| | |\ \ | | | | | | | | | Rejections | ||||
| | | * | | 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 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/schema/im.sql | ||||
| | | * \ \ | Merge branch 'replication_split' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 4 | -10/+7 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections Conflicts: synapse/storage/schema/delta/v12.sql | ||||
| | | * | | | | Fix bug where we superfluously asked for current state. Change API of ↵ | Erik Johnston | 2015-01-30 | 5 | -49/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | /query_auth/ so that we don't duplicate events in the response. | ||||
| | | * | | | | 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 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| | | * | | | | | 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 ↵ | Erik Johnston | 2015-01-30 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event graph | ||||
| | | * | | | | | 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 ↵ | Erik Johnston | 2015-01-26 | 3 | -26/+173 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashes. | ||||
| | * | | | | | | 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 |
| | |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Client v2 sync | ||||
| | | * | | | | | Add doc string for __nonzero__ overrides for sync results, raise not ↵ | Mark Haines | 2015-01-30 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implemented if the client attempts to do a gapless sync | ||||
| | | * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sync with a gap | ||||
| | | * | | | | | | 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 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| | | * | | | | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of ↵ | Mark Haines | 2015-01-29 | 2 | -11/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes is small | ||||
| | | * | | | | | | | | | | 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 ↵ | Mark Haines | 2015-01-29 | 2 | -12/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the clients that made those requests | ||||
| | | * | | | | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| | | * | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | Replication split | ||||
| | | * | | | | | | | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 52 | -333/+2390 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | replication_split | ||||
| | | * | | | | | | | | | | | | | 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 ↵ | Erik Johnston | 2015-01-22 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections | ||||
| | * | | | | | | | | | | | | | | | | Add glob asterisks when running rules. | David Baker | 2015-01-30 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Means that now you can't do exact matches even in override rules, but I think we can live with that. Advantage is that you'll now always get back what was put in to the API. | ||||
| | * | | | | | | | | | | | | | | | | Merge pull request #40 from matrix-org/rejections_storage | Mark Haines | 2015-01-30 | 6 | -11/+86 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rejections storage | ||||
| | | * | | | | | | | | | | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py | ||||
| | * | | | | | | | | | | | | | | | | | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 11 | -5/+1072 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | Client v2 filter | ||||
| | | * | | | | | | | | | | | | | | | | 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 |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | split the storage and management of filters from the actual filter code and don't have to load a filter from the db each time we filter an event | ||||
| | | * | | | | | | | | | | | | | | 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 ↵ | Kegan Dougal | 2015-01-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the filter, rather than the complete json | ||||
| | | * | | | | | | | | | | | | | | 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 ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 5 | -27/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out in the REST-level tests | ||||
| | | * | | | | | | | | | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -7/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation nicely | ||||
| | | * | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of user filters into there | ||||
| | | * | | | | | | | | | | | | | | 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 ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shareable | ||||
| | | * | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actual filter implementation | ||||
| | * | | | | | | | | | | | | | | | | Add room member count condition and default rule to make a noise on rooms of ↵ | David Baker | 2015-01-30 | 3 | -6/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only 2 people. | ||||
| | * | | | | | | | | | | | | | | | | Merge pull request #38 from matrix-org/new_state_resolution | Mark Haines | 2015-01-30 | 2 | -121/+441 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New state resolution | ||||
| | | * | | | | | | | | | | | | | | | | 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 ↵ | Erik Johnston | 2015-01-30 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections_storage | ||||
| | | * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 125 | -2084/+3048 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new_state_resolution | ||||
| | | | | | | | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 125 | -2083/+3034 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| | * | | | | | | | | | | | | | | | | We do need Twisted 14, not 15: we use internal Twisted things that have been ↵ | David Baker | 2015-01-30 | 2 | -2/+2 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed in 15. | ||||
| | * | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sender display names where they exist. | ||||
| | * | | | | | | | | | | | | | | | Add default push rules including setting a sound for messages mentioning ↵ | David Baker | 2015-01-29 | 2 | -8/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | your username / display name | ||||
| | * | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor | ||||
| | * | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract the device id and token id from the access token when autheniticating users | ||||
| | | * | | | | | | | | | | | | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ↵ | Mark Haines | 2015-01-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identifier | ||||
| | | * | | | | | | | | | | | | 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 ↵ | Mark Haines | 2015-01-28 | 18 | -48/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
| | | * | | | | | | | | | | | | 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 ↵ | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address). | ||||
| | | * | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | Pushers branch (with fixes) | ||||
| | | * | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Better style | David Baker | 2015-01-28 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Another superfluous newline | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Ah, the comma of doom. | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Brackets are nicer | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Unnecessary new line | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Easy on the newlines | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | 2015 | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | doc style fix | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | It is 2015 | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Oops, bad merge: needed to change the base class of the rest servlets too. | David Baker | 2015-01-28 | 3 | -6/+7 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | More code style things | David Baker | 2015-01-28 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Brackets rather than slashes at end | David Baker | 2015-01-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Redundant bracketing & missed space | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Update copyright | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Unused import | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 51 | -299/+527 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| | | * | | | | | | | | | | | | Reset badge count to zero when last active time is bumped | David Baker | 2015-01-28 | 4 | -3/+76 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Oops, remove debugging | David Baker | 2015-01-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | or of course we could just return the deferred | David Baker | 2015-01-27 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in ↵ | David Baker | 2015-01-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the cb gets executed. | ||||
| | | * | | | | | | | | | | | | Unbreak bad presence merge - don't add these blocks together with an and: ↵ | David Baker | 2015-01-27 | 1 | -12/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they're different things. | ||||
| | | * | | | | | | | | | | | | Support membership events and more camelcase/underscores | David Baker | 2015-01-26 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Add brackets to make get room name / alias work | David Baker | 2015-01-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Pushers should only try & look for rejected devices in something that's a ↵ | David Baker | 2015-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list or tuple. | ||||
| | | * | | | | | | | | | | | | Add API to delete push rules. | David Baker | 2015-01-23 | 2 | -1/+49 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Use push settings! | David Baker | 2015-01-23 | 3 | -26/+117 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | more pep8 suggestions | David Baker | 2015-01-23 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | more pep8 | David Baker | 2015-01-23 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Make string format tuple an actual tuple | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | redundant parens | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | stray space | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | make per-device rules work | David Baker | 2015-01-23 | 1 | -5/+15 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Add slightly pedantic trailing slash error. | David Baker | 2015-01-23 | 2 | -3/+19 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | right super() param | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fix adding rules without before/after & add the rule that we couldn't find ↵ | David Baker | 2015-01-23 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the error | ||||
| | | * | | | | | | | | | | | | This really serves me right for ever making a map called 'map'. | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-23 | 1 | -273/+193 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | As yet fairly untested GET API for push rules | David Baker | 2015-01-22 | 3 | -15/+145 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | oops, this is not its own schema file | David Baker | 2015-01-22 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Insufficient newlines | David Baker | 2015-01-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 91 | -1712/+645 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py | ||||
| | | * | | | | | | | | | | | | | | Oops: second part of commit dc938606 | David Baker | 2015-01-22 | 6 | -7/+45 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Add rest API & store for creating push rules | David Baker | 2015-01-22 | 2 | -0/+391 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make unrecognised request error look more like synapse errors because it makes it easier to throw them from within rest classes. | ||||
| | | * | | | | | | | | | | | | | | use underscores everywhere, not camelcase. | David Baker | 2015-01-20 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | add instance_handles to pushers so we have a way to refer to them even if ↵ | David Baker | 2015-01-20 | 7 | -27/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the push token changes. | ||||
| | | * | | | | | | | | | | | | | | Require device language when adding a pusher. | David Baker | 2015-01-16 | 5 | -5/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because this seems like it might be useful to do sooner rather than later. | ||||
| | | * | | | | | | | | | | | | | | Send room name and first alias in notification poke. | David Baker | 2015-01-15 | 3 | -3/+61 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Don't make the pushers' event streams cause people to appear online | David Baker | 2015-01-15 | 2 | -22/+25 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Honour the 'rejected' return from push gateways | David Baker | 2015-01-13 | 6 | -19/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a timestamp to push tokens so we know the last time they we got them from the device. Send it to the push gateways so it can determine whether its failure is more recent than the token. Stop and remove pushers that have been rejected. | ||||
| | | * | | | | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 150 | -438/+1097 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Split out function to decide whether to notify or a given event | David Baker | 2015-01-13 | 1 | -2/+17 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | If we didn't get any events, advance the token or we'll just keep not ↵ | David Baker | 2014-12-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getting the same events again. | ||||
| | | * | | | | | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2014-12-18 | 99 | -2160/+4634 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py | ||||
| | | * | | | | | | | | | | | | | | | | schema version is now 10 | David Baker | 2014-12-18 | 2 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Merge branch 'master' into pushers | David Baker | 2014-12-18 | 13 | -12/+63 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | Thank you, pyflakes | David Baker | 2014-12-18 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | ...and bump SCHEMA_VERSION | David Baker | 2014-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Rename the pusher SQL delta to v9 which the next free one | David Baker | 2014-12-18 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | after a few rethinks, a working implementation of pushers. | David Baker | 2014-12-18 | 8 | -73/+158 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant. | David Baker | 2014-12-03 | 7 | -130/+213 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | convert to spaces before I start a holy war | David Baker | 2014-12-02 | 1 | -205/+205 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2014-12-02 | 44 | -248/+6663 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP ↵ | David Baker | 2014-11-21 | 7 | -20/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pokes work or not yet but the retry semantics are pretty good. | ||||
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 8 | -342/+373 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 35 | -140/+193 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'http_client_refactor' into pushers | David Baker | 2014-11-20 | 11 | -93/+170 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | remove random half-line | David Baker | 2014-11-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Start creating a module to do generic notifications (just prints them to ↵ | David Baker | 2014-11-19 | 12 | -3/+449 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stdout currently!) | ||||
| | | | | | | | | | | | | | | | | | * | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 1 | -8/+6 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | |_|/ / / / / / | | | | | | | | | | | | | | | |/| | / / / / / | | | | | | | | | | | | | | | | | |/ / / / / | rejections_storage | ||||
| | | | | | | | | | | | | | | | * | | | | | | | Remove commented line | Erik Johnston | 2015-01-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |