Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 5 | -180/+232 |
|\ | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | 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 | ||||
| * | Rename MockHttpServer to MockHttpResource as it stands for one server ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 5 | -136/+136 |
| | | | | | | | | resource rather than an entire server | ||||
* | | SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns. | Erik Johnston | 2014-08-18 | 2 | -0/+3 |
| | | |||||
* | | 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. | ||||
* | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 2 | -4/+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 | 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 | 1 | -2/+10 |
| | | | | presenting age durations to clients/federation events | ||||
* | Use strings instead of opaque magic-number constants for presence states; ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -6/+6 |
| | | | | rename AWAY to UNAVAILABLE | ||||
* | add in copyrights to everything, not just the synapse subdir, and add a ↵ | Matthew Hodgson | 2014-08-13 | 6 | -0/+84 |
| | | | | copyrighter.pl whilst we're at it | ||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 6 | -0/+1610 |