Mark Haines
|
4b63b06cad
|
Merge branch 'develop' into storage_transactions
Conflicts:
synapse/api/auth.py
synapse/handlers/room.py
synapse/storage/__init__.py
|
2014-08-26 16:07:05 +01:00 |
|
Mark Haines
|
ac21dfff6d
|
Fix pyflakes errors
|
2014-08-26 16:02:59 +01:00 |
|
Kegan Dougal
|
52b64617f9
|
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
|
2014-08-26 10:04:26 +01:00 |
|
Erik Johnston
|
fea7b60cf3
|
Add 'state_key' to valid_keys
|
2014-08-26 09:40:58 +01:00 |
|
Erik Johnston
|
b52b33acf6
|
Send down state_key to clients
|
2014-08-26 09:40:29 +01:00 |
|
Kegan Dougal
|
47c3a089c5
|
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
|
2014-08-26 09:26:33 +01:00 |
|
Kegan Dougal
|
cab3095803
|
Removed member list servlet: now using generic state paths.
|
2014-08-26 09:26:07 +01:00 |
|
Mark Haines
|
1379dcae6f
|
Take a snapshot of the state of the room before performing updates
|
2014-08-22 17:00:10 +01:00 |
|
Kegan Dougal
|
f690b7b827
|
Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet to RoomStateEventRestServlet. Support generic state event sending.
|
2014-08-22 15:59:15 +01:00 |
|
Erik Johnston
|
5670da1c1e
|
Add ts field to all events.
|
2014-08-21 17:46:52 +01:00 |
|
Erik Johnston
|
063e1b22e6
|
Stop internal keys from getting into SynapseEvents
|
2014-08-21 15:06:00 +01:00 |
|
Erik Johnston
|
7c60905ee7
|
Default from param to 'END'
|
2014-08-19 15:52:10 +01:00 |
|
Erik Johnston
|
347242a5c4
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
tests/rest/test_presence.py
tests/rest/test_rooms.py
tests/utils.py
|
2014-08-19 14:48:19 +01:00 |
|
Erik Johnston
|
598a1d8ff9
|
Change the way pagination works to support out of order events.
|
2014-08-19 14:19:48 +01:00 |
|
Kegan Dougal
|
a18b1a649c
|
Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.
|
2014-08-18 17:18:54 +01:00 |
|
Erik Johnston
|
291010f100
|
Not all event streams returns SynapseEvents
|
2014-08-18 11:06:59 +01:00 |
|
Erik Johnston
|
1a1e0384ef
|
Ensure we have a 'membership' key in RoomMemberEvents
|
2014-08-18 10:59:57 +01:00 |
|
Erik Johnston
|
d260a42ca2
|
PEP8 cleanups
|
2014-08-15 16:17:36 +01:00 |
|
Erik Johnston
|
19946509a4
|
Support generic events.
|
2014-08-15 16:06:08 +01:00 |
|
Erik Johnston
|
01f089d9fb
|
Correctly return new token when returning events. Serialize events correctly.
|
2014-08-15 15:28:54 +01:00 |
|
Erik Johnston
|
114984a236
|
Start chagning the events stream to work with the new DB schema
|
2014-08-15 13:58:28 +01:00 |
|
Erik Johnston
|
d72f897f07
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
synapse/storage/stream.py
|
2014-08-15 11:50:14 +01:00 |
|
Paul "LeoNerd" Evans
|
33d62c2c66
|
Remember to reflect membership LEAVE events to the leaving member so they know it happened
|
2014-08-15 11:40:58 +01:00 |
|
Erik Johnston
|
5002efa31b
|
Reimplement the get public rooms api to work with new DB schema
|
2014-08-15 10:26:35 +01:00 |
|
Kegan Dougal
|
61933f8e52
|
Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised access_token
|
2014-08-14 13:47:39 +01:00 |
|
Kegan Dougal
|
2a793a6c42
|
Default error code BAD_PAGINATION for EventStreamErrors
|
2014-08-14 11:57:25 +01:00 |
|
Kegan Dougal
|
d253a35539
|
Added web client prefix
|
2014-08-14 11:54:37 +01:00 |
|
Kegan Dougal
|
c75add6ec8
|
Added a urls module for keeping client and federation prefixes.
|
2014-08-14 11:52:56 +01:00 |
|
Matthew Hodgson
|
aebe5ce08a
|
fix whitespace
|
2014-08-14 02:14:15 +01:00 |
|
Erik Johnston
|
6df83555cc
|
Handle a potential race in the notifier when calling get_events_for which resulted in an uncaught KeyError
|
2014-08-13 17:13:26 +01:00 |
|
Paul "LeoNerd" Evans
|
55944ccf72
|
Use strings instead of opaque magic-number constants for presence states; rename AWAY to UNAVAILABLE
|
2014-08-13 14:31:48 +01:00 |
|
Matthew Hodgson
|
f98e6380f1
|
add in whitespace after copyright statements to improve legibility
|
2014-08-13 03:14:34 +01:00 |
|
matrix.org
|
4f475c7697
|
Reference Matrix Home Server
|
2014-08-12 15:10:52 +01:00 |
|