Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 1 | -1/+0 |
|\ | |||||
| * | Remove appservice REST servlets | Kegan Dougal | 2015-03-31 | 1 | -1/+0 |
| | | |||||
* | | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 1 | -0/+10 |
|/ | | | | 2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it. | ||||
* | Build MetricsResource as a specific HomeServer dependency | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+1 |
| | |||||
* | Expose 'config' as a real HomeServer dependency key | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+1 |
| | |||||
* | Actually treat this as static content, not random Resources. | Kegan Dougal | 2015-02-23 | 1 | -0/+1 |
| | |||||
* | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 1 | -0/+10 |
|\ | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py | ||||
| * | Merge changes from develop | Mark Haines | 2015-01-29 | 1 | -0/+5 |
| |\ | |||||
| | * | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 1 | -39/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| | * \ | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py | ||||
| | * \ \ | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' into pushers | David Baker | 2014-12-18 | 1 | -15/+17 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py | ||||
| | * | | | | | Start creating a module to do generic notifications (just prints them to ↵ | David Baker | 2014-11-19 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | stdout currently!) | ||||
| * | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+5 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | of user filters into there | ||||
* / | | | | | Add stub application services REST API. | Kegan Dougal | 2015-01-27 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Remove unused import from server.py | Mark Haines | 2015-01-26 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed. | ||||
* | | | | | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Remove hs.parse_eventid | Mark Haines | 2015-01-23 | 1 | -9/+0 |
| | | | | | |||||
* | | | | | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 1 | -6/+1 |
| | | | | | |||||
* | | | | | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 1 | -6/+1 |
| | | | | | |||||
* | | | | | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 1 | -6/+0 |
| | | | | | |||||
* | | | | | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 1 | -10/+0 |
| |_|_|/ |/| | | | |||||
* | | | | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Move client v1 api rest servlets into a "client/v1" directory | Mark Haines | 2015-01-22 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Return the raw federation event rather than adding extra keys for federation ↵ | Kegan Dougal | 2015-01-08 | 1 | -2/+2 |
| | | | | | | | | | | | | data. | ||||
* | | | Add 'raw' query parameter to expose the event graph and signatures to savvy ↵ | Kegan Dougal | 2015-01-08 | 1 | -2/+2 |
| | | | | | | | | | | | | clients. | ||||
* | | | Update copyright notices | Mark Haines | 2015-01-06 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Kill off synapse.api.events.* | Erik Johnston | 2014-12-16 | 1 | -10/+0 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-11 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | Conflicts: setup.py | ||||
| * | | Get uploads working with new media repo | Mark Haines | 2014-12-02 | 1 | -0/+1 |
| |/ | |||||
* | | Start making more things use EventContext rather than event.* | Erik Johnston | 2014-12-05 | 1 | -1/+1 |
| | | |||||
* | | Convert rest and handlers to use new event structure | Erik Johnston | 2014-12-04 | 1 | -0/+8 |
| | | |||||
* | | Change DomainSpecificString so that it doesn't use a HomeServer object | Erik Johnston | 2014-12-02 | 1 | -4/+7 |
|/ | |||||
* | Add an EventValidator. Fix bugs in auth ++ storage | Erik Johnston | 2014-11-10 | 1 | -0/+5 |
| | |||||
* | Convert event ids to be of the form :example.com | Erik Johnston | 2014-10-30 | 1 | -1/+6 |
| | |||||
* | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-09-30 | 1 | -0/+12 |
|\ | | | | | | | | | | | Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py | ||||
| * | Track the IP users connect with. Add an admin column to users table. | Erik Johnston | 2014-09-26 | 1 | -0/+12 |
| | | |||||
* | | SYN-75 Verify signatures on server to server transactions | Mark Haines | 2014-09-30 | 1 | -0/+5 |
| | | |||||
* | | Add a _matrix/key/v1 resource with the verification keys of the local server | Mark Haines | 2014-09-23 | 1 | -0/+1 |
|/ | |||||
* | Merge remote-tracking branch 'origin/develop' into test-sqlite-memory | Paul "LeoNerd" Evans | 2014-09-15 | 1 | -0/+4 |
|\ | |||||
| * | Correctly handle the 'age' key in events and pdus | Erik Johnston | 2014-09-15 | 1 | -0/+4 |
| | | |||||
* | | Move database preparing code out of homserver.py into storage where it belongs | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -0/+1 |
|/ | |||||
* | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 1 | -1/+1 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Add ratelimiting function to basehandler | Mark Haines | 2014-09-02 | 1 | -0/+5 |
| | |||||
* | Fix pyflakes warnings | Mark Haines | 2014-08-28 | 1 | -5/+0 |
| | |||||
* | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -1/+6 |
|\ | | | | | | | | | | | Conflicts: synapse/handlers/room.py synapse/storage/stream.py | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-27 | 1 | -1/+14 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py | ||||
| * | | WIP: Completely change how event streaming and pagination work. This ↵ | Erik Johnston | 2014-08-26 | 1 | -1/+6 |
| | | | | | | | | | | | | reflects the change in the underlying storage model. | ||||
* | | | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -0/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Added parse_roomid() helper | Paul "LeoNerd" Evans | 2014-08-27 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -1/+9 |
|\| | | |||||
| * | | Modified /join/$identifier to support $identifier being a room ID in ↵ | Kegan Dougal | 2014-08-27 | 1 | -1/+9 |
| |/ | | | | | | | addition to a room alias. | ||||
* / | Fold federation/handler into handlers/federation | Mark Haines | 2014-08-26 | 1 | -5/+0 |
|/ | |||||
* | Add ts field to all events. | Erik Johnston | 2014-08-21 | 1 | -1/+1 |
| | |||||
* | Added /matrix/content path, HS resource_for_content_repo attribute and ↵ | Kegan Dougal | 2014-08-18 | 1 | -0/+2 |
| | | | | FileUploadResource. Added stub methods. | ||||
* | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 1 | -2/+3 |
| | | | | resource_for_federation or resource_for_client depending on what is being tested. | ||||
* | Start phasing out HttpServer: we should be using Resources instead. Added ↵ | Kegan Dougal | 2014-08-14 | 1 | -4/+4 |
| | | | | resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree. | ||||
* | Add a HomeServer.parse_roomalias() to avoid having to ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -1/+6 |
| | | | | RoomAlias.from_sring(..., hs=hs) - similar to parse_userid() | ||||
* | Don't pass host_web_client flag to register_servlets, it needs to be a ↵ | Kegan Dougal | 2014-08-13 | 1 | -3/+1 |
| | | | | Resource not a RestServlet. | ||||
* | Added a -w flag which will host the web client if specified. Currently this ↵ | Kegan Dougal | 2014-08-13 | 1 | -4/+10 |
| | | | | just delegates to the webclient RestServlet. | ||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 1 | -0/+1 |
| | |||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 1 | -0/+176 |