Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 3 | -9/+13 |
|\ | |||||
| * | Modified /join/$identifier to support $identifier being a room ID in ↵ | Kegan Dougal | 2014-08-27 | 1 | -0/+2 |
| | | | | | | | | addition to a room alias. | ||||
| * | Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. ↵ | Kegan Dougal | 2014-08-26 | 2 | -9/+11 |
| | | | | | | | | Expanded the feedback constants to fully explain what type of feedback they are. | ||||
* | | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-26 | 7 | -30/+37 |
|\| | | | | | | | | | | | | | Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py | ||||
| * | Fix pyflakes errors | Mark Haines | 2014-08-26 | 2 | -5/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-08-26 | 1 | -1/+1 |
| |\ | | | | | | | | | | client_server_url_rename | ||||
| | * | Add 'state_key' to valid_keys | Erik Johnston | 2014-08-26 | 1 | -0/+1 |
| | | | |||||
| | * | Send down state_key to clients | Erik Johnston | 2014-08-26 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-08-26 | 2 | -1/+7 |
| |\| | | | | | | | | | | client_server_url_rename | ||||
| | * | Add ts field to all events. | Erik Johnston | 2014-08-21 | 1 | -1/+6 |
| | | | |||||
| | * | Stop internal keys from getting into SynapseEvents | Erik Johnston | 2014-08-21 | 1 | -0/+1 |
| | | | |||||
| * | | Removed member list servlet: now using generic state paths. | Kegan Dougal | 2014-08-26 | 4 | -11/+16 |
| | | | |||||
| * | | Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet ↵ | Kegan Dougal | 2014-08-22 | 1 | -8/+8 |
| |/ | | | | | | | to RoomStateEventRestServlet. Support generic state event sending. | ||||
* / | Take a snapshot of the state of the room before performing updates | Mark Haines | 2014-08-22 | 1 | -5/+11 |
|/ | |||||
* | Default from param to 'END' | Erik Johnston | 2014-08-19 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 1 | -1/+2 |
|\ | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | Added /matrix/content path, HS resource_for_content_repo attribute and ↵ | Kegan Dougal | 2014-08-18 | 1 | -1/+2 |
| | | | | | | | | FileUploadResource. Added stub methods. | ||||
* | | Change the way pagination works to support out of order events. | Erik Johnston | 2014-08-19 | 2 | -47/+64 |
| | | |||||
* | | Not all event streams returns SynapseEvents | Erik Johnston | 2014-08-18 | 1 | -1/+5 |
| | | |||||
* | | Ensure we have a 'membership' key in RoomMemberEvents | Erik Johnston | 2014-08-18 | 1 | -0/+2 |
| | | |||||
* | | PEP8 cleanups | Erik Johnston | 2014-08-15 | 1 | -0/+1 |
| | | |||||
* | | Support generic events. | Erik Johnston | 2014-08-15 | 2 | -5/+8 |
| | | |||||
* | | Correctly return new token when returning events. Serialize events correctly. | Erik Johnston | 2014-08-15 | 2 | -2/+3 |
| | | |||||
* | | Start chagning the events stream to work with the new DB schema | Erik Johnston | 2014-08-15 | 1 | -72/+5 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-15 | 4 | -3/+32 |
|\| | | | | | | | | | Conflicts: synapse/storage/stream.py | ||||
| * | Remember to reflect membership LEAVE events to the leaving member so they ↵ | Paul "LeoNerd" Evans | 2014-08-15 | 1 | -0/+4 |
| | | | | | | | | know it happened | ||||
| * | Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised ↵ | Kegan Dougal | 2014-08-14 | 2 | -2/+4 |
| | | | | | | | | access_token | ||||
| * | Default error code BAD_PAGINATION for EventStreamErrors | Kegan Dougal | 2014-08-14 | 1 | -1/+4 |
| | | |||||
| * | Added web client prefix | Kegan Dougal | 2014-08-14 | 1 | -1/+2 |
| | | |||||
| * | Added a urls module for keeping client and federation prefixes. | Kegan Dougal | 2014-08-14 | 1 | -0/+19 |
| | | |||||
* | | Reimplement the get public rooms api to work with new DB schema | Erik Johnston | 2014-08-15 | 2 | -1/+25 |
|/ | |||||
* | fix whitespace | Matthew Hodgson | 2014-08-14 | 1 | -0/+1 |
| | |||||
* | Handle a potential race in the notifier when calling get_events_for which ↵ | Erik Johnston | 2014-08-13 | 1 | -3/+7 |
| | | | | resulted in an uncaught KeyError | ||||
* | Use strings instead of opaque magic-number constants for presence states; ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -4/+4 |
| | | | | rename AWAY to UNAVAILABLE | ||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 10 | -0/+10 |
| | |||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 10 | -0/+1164 |