Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 1 | -1/+42 |
|\ | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | 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 | ||||
| * | Rename MockHttpServer to MockHttpResource as it stands for one server ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -1/+2 |
| | | | | | | | | resource rather than an entire server | ||||
* | | Change the MemoryDataStore to implement new storage api | Erik Johnston | 2014-08-18 | 1 | -99/+50 |
| | | |||||
* | | Fix some of the tests to reflect changes in the storage layer. | Erik Johnston | 2014-08-15 | 1 | -22/+2 |
|/ | |||||
* | Allow advancing the MockClock's time | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+4 |
| | |||||
* | Move MockClock into tests.utils so we can reüse it | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+10 |
| | |||||
* | add in copyrights to everything, not just the synapse subdir, and add a ↵ | Matthew Hodgson | 2014-08-13 | 1 | -0/+15 |
| | | | | copyrighter.pl whilst we're at it | ||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 1 | -0/+252 |