Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't expect a reflection from events stream | Erik Johnston | 2014-08-19 | 1 | -3/+1 |
| | |||||
* | Update tests | Erik Johnston | 2014-08-19 | 2 | -12/+5 |
| | |||||
* | Fix typo in merge conflict | Erik Johnston | 2014-08-19 | 1 | -2/+0 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 8 | -339/+570 |
|\ | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | Rewrite of PresenceHandler test to ensure it covers the interaction with ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -149/+279 |
| | | | | | | | | Federation as well | ||||
| * | Add a DeferredMockCallable; like mock's MockCallable but allows awaiting | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -0/+41 |
| | | | | | | | | on method calls to be made later | ||||
| * | Perform the 'REST'-level tests of Presence against the real Presence handler ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -40/+92 |
| | | | | | | | | as well, mocking out the datastore beneath it | ||||
| * | Implement and test presence dropping of remote users | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -0/+8 |
| | | |||||
| * | Rename MockHttpServer to MockHttpResource as it stands for one server ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 7 | -146/+147 |
| | | | | | | | | resource rather than an entire server | ||||
* | | SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns. | Erik Johnston | 2014-08-18 | 2 | -0/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-18 | 1 | -5/+40 |
|\| | |||||
| * | Allow room presence visibility between users who share a room | Paul "LeoNerd" Evans | 2014-08-18 | 1 | -5/+40 |
| | | |||||
* | | Change the MemoryDataStore to implement new storage api | Erik Johnston | 2014-08-18 | 1 | -99/+50 |
| | | |||||
* | | Disable the ability to GET individualy messages. We need to think about the ↵ | Erik Johnston | 2014-08-18 | 1 | -36/+36 |
| | | | | | | | | correct API to do this, as the current one doesn't make much sense. | ||||
* | | Fix some of the tests to reflect changes in the storage layer. | Erik Johnston | 2014-08-15 | 3 | -39/+11 |
|/ | |||||
* | Add a check to make sure that during state conflict res we only request a ↵ | Erik Johnston | 2014-08-15 | 1 | -0/+3 |
| | | | | PDU we don't have. | ||||
* | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 9 | -16/+14 |
| | | | | 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 | 2 | -0/+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. | ||||
* | An initial hack at storing presence state-change mtimes in database and ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 3 | -20/+62 |
| | | | | presenting age durations to clients/federation events | ||||
* | Allow advancing the MockClock's time | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+4 |
| | |||||
* | Don't mock out presence_handler's internal start/stop methods in ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -9/+5 |
| | | | | presencelike unit test; it's rude | ||||
* | Move MockClock into tests.utils so we can reüse it | Paul "LeoNerd" Evans | 2014-08-13 | 2 | -11/+11 |
| | |||||
* | Implement directory service federation by Federation Queries; avoid ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+112 |
| | | | | local_only hack; add unit tests | ||||
* | Add a HomeServer.parse_roomalias() to avoid having to ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+6 |
| | | | | RoomAlias.from_sring(..., hs=hs) - similar to parse_userid() | ||||
* | Use new Federation Query API to implement HS->HS fetching of remote users' ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 2 | -8/+30 |
| | | | | profile information instead of (ab)using the client-side REST API | ||||
* | Define the concept of a 'federation Query'; creating API for making and ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+38 |
| | | | | handling Queries on the Federation's increasingly-inaccurately-named ReplicationLayer | ||||
* | Namespace all the Federation HTTP URLs to /matrix/federation/v1/... | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -7/+8 |
| | |||||
* | Use strings instead of opaque magic-number constants for presence states; ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 3 | -24/+24 |
| | | | | rename AWAY to UNAVAILABLE | ||||
* | add in copyrights to everything, not just the synapse subdir, and add a ↵ | Matthew Hodgson | 2014-08-13 | 23 | -0/+324 |
| | | | | copyrighter.pl whilst we're at it | ||||
* | 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 | 26 | -0/+4818 |