Mark Haines
|
51ef725647
|
Use 'true' rather than '1' for archived flag
|
2015-10-08 18:13:02 +01:00 |
|
Mark Haines
|
dc72021748
|
Add a flag to initial sync to indicate we want rooms that the user has left
|
2015-10-08 17:26:23 +01:00 |
|
Mark Haines
|
dfef2b41aa
|
Update the v2 room sync format to match the current v2 spec
|
2015-10-08 15:17:43 +01:00 |
|
David Baker
|
91482cd6a0
|
Use raw string for regex here, otherwise \b is the backspace character. Fixes displayname matching.
|
2015-10-08 11:22:15 +01:00 |
|
Mark Haines
|
e3d3205cd9
|
Update the sync response to match the latest spec
|
2015-10-07 15:55:20 +01:00 |
|
Daniel Wagner-Hall
|
7c809abe86
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-06 10:24:32 -05:00 |
|
Daniel Wagner-Hall
|
db6e1e1fe3
|
Merge pull request #292 from matrix-org/daniel/useragent
Allow synapse's useragent to be customized
|
2015-10-06 10:23:21 -05:00 |
|
Daniel Wagner-Hall
|
61ee72517c
|
Remove merge thinko
|
2015-10-06 10:16:15 -05:00 |
|
Daniel Wagner-Hall
|
1cacc71050
|
Add third party invites to auth_events for joins
|
2015-10-06 10:13:28 -05:00 |
|
Mark Haines
|
fac990a656
|
Merge pull request #293 from matrix-org/markjh/remove_spamy_error_logging
Remove log line that was generated whenever an error was created.
|
2015-10-06 16:13:07 +01:00 |
|
Daniel Wagner-Hall
|
fcd9ba8802
|
Fix lint errors
|
2015-10-06 10:13:05 -05:00 |
|
Mark Haines
|
93cc60e805
|
Remove log line that was generated whenever an error was created. We are now creating error objects that aren't raised so it's probably a bit too confusing to keep
|
2015-10-06 16:10:19 +01:00 |
|
Daniel Wagner-Hall
|
d4bb28c59b
|
Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation""
This reverts commit 34d26d3687.
|
2015-10-06 09:58:21 -05:00 |
|
Daniel Wagner-Hall
|
ca6496c27c
|
Merge branch 'daniel/useragent' into daniel/3pidinvites
|
2015-10-06 09:55:21 -05:00 |
|
Daniel Wagner-Hall
|
492beb62a8
|
Use space not dash as delimiter
|
2015-10-06 09:53:33 -05:00 |
|
Daniel Wagner-Hall
|
e0b466bcfd
|
Use space not dash as delimiter
|
2015-10-06 09:32:26 -05:00 |
|
Daniel Wagner-Hall
|
287c81abf3
|
Merge branch 'develop' into daniel/useragent
|
2015-10-06 09:30:17 -05:00 |
|
Daniel Wagner-Hall
|
c05b5ef7b0
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-06 08:10:34 -05:00 |
|
Daniel Wagner-Hall
|
ddd079c8f8
|
Merge branch 'daniel/useragent' into daniel/3pidinvites
|
2015-10-05 20:52:15 -05:00 |
|
Daniel Wagner-Hall
|
b28c7da0a4
|
Preserve version string in user agent
|
2015-10-05 20:49:39 -05:00 |
|
Daniel Wagner-Hall
|
34d26d3687
|
Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"
This reverts commit 5879edbb09, reversing
changes made to b43930d4c9.
|
2015-10-05 19:10:47 -05:00 |
|
Mark Haines
|
471555b3a8
|
Move the rooms out into a room_map mapping from room_id to room.
|
2015-10-05 16:39:36 +01:00 |
|
Daniel Wagner-Hall
|
58e6a58eb7
|
Merge branch 'develop' into daniel/3pidinvites
|
2015-10-05 10:33:41 -05:00 |
|
Daniel Wagner-Hall
|
8fc52bc56a
|
Allow synapse's useragent to be customized
This will allow me to write tests which verify which server made HTTP
requests in a federation context.
|
2015-10-02 17:13:51 -05:00 |
|
Erik Johnston
|
49ebd472fa
|
Explicitly add Create event as auth event
|
2015-10-02 13:22:36 +01:00 |
|
Erik Johnston
|
40017a9a11
|
Add 'trusted_private_chat' to room creation presets
|
2015-10-02 11:22:56 +01:00 |
|
Erik Johnston
|
a086b7aa00
|
Merge pull request #275 from matrix-org/erikj/invite_state
Bundle in some room state in invites.
|
2015-10-02 11:15:43 +01:00 |
|
Erik Johnston
|
9c311dfce5
|
Also bundle in sender
|
2015-10-02 11:04:23 +01:00 |
|
Erik Johnston
|
a38d36ccd0
|
Merge pull request #279 from matrix-org/erikj/unfederatable
Add flag which disables federation of the room
|
2015-10-02 10:41:14 +01:00 |
|
Erik Johnston
|
d5e081c7ae
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
|
2015-10-02 10:33:49 +01:00 |
|
Erik Johnston
|
5879edbb09
|
Merge pull request #283 from matrix-org/erikj/atomic_join_federation
Atomically persist events when joining a room over federation/
|
2015-10-02 09:18:44 +01:00 |
|
Mark Haines
|
f31014b18f
|
Start updating the sync API to match the specification
|
2015-10-01 17:53:07 +01:00 |
|
Daniel Wagner-Hall
|
5b3e9713dd
|
Implement third party identifier invites
|
2015-10-01 17:49:52 +01:00 |
|
Kegsay
|
b43930d4c9
|
Merge pull request #291 from matrix-org/receipt-validation
Validate the receipt type before passing it on to the receipt handler
|
2015-10-01 14:44:39 +01:00 |
|
Kegan Dougal
|
bad780a197
|
Validate the receipt type before passing it on to the receipt handler
|
2015-10-01 14:01:52 +01:00 |
|
Erik Johnston
|
0a4b7226fc
|
Don't change cwd in synctl
|
2015-10-01 09:21:36 +01:00 |
|
Erik Johnston
|
0ec78b360c
|
Merge pull request #287 from matrix-org/erikj/canonical_alias
Set m.room.canonical_alias on room creation.
|
2015-09-30 17:14:55 +01:00 |
|
Erik Johnston
|
ecd0c0dfc5
|
Remove double indentation
|
2015-09-30 16:46:24 +01:00 |
|
Erik Johnston
|
83892d0d30
|
Comment
|
2015-09-30 16:41:48 +01:00 |
|
Erik Johnston
|
9d39615b7d
|
Rename var
|
2015-09-30 16:37:59 +01:00 |
|
Mark Haines
|
301141515a
|
Merge pull request #288 from matrix-org/markjh/unused_definitions
Remove some of the unused definitions from synapse
|
2015-09-28 14:22:44 +01:00 |
|
Daniel Wagner-Hall
|
741777235c
|
Merge pull request #290 from matrix-org/daniel/synctl
Allow config file path to be configurable in in synctl
|
2015-09-28 10:30:45 +01:00 |
|
Erik Johnston
|
a14665bde7
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state
|
2015-09-25 11:38:28 +01:00 |
|
Daniel Wagner-Hall
|
f87a11e0fd
|
Fix restart
|
2015-09-24 21:59:38 +00:00 |
|
Daniel Wagner-Hall
|
76328b85f6
|
Allow config file path to be configurable in in synctl
Also, allow it to be run from directories other than the synapse directory
|
2015-09-24 21:50:20 +00:00 |
|
Erik Johnston
|
17795161c3
|
Merge pull request #289 from matrix-org/markjh/fix_sql
Fix order of ON constraints in _get_rooms_for_user_where_membership
|
2015-09-24 17:39:47 +01:00 |
|
Mark Haines
|
cf1100887b
|
Fix order of ON constraints in _get_rooms_for_user_where_membership_is_txn
|
2015-09-24 17:35:10 +01:00 |
|
Mark Haines
|
314aabba82
|
Fix scripts-dev/definitions.py argparse options
|
2015-09-23 10:45:33 +01:00 |
|
Mark Haines
|
7d55314277
|
Remove unused _execute_and_decode from scripts/synapse_port_db
|
2015-09-23 10:42:02 +01:00 |
|
Mark Haines
|
1cd65a8d1e
|
synapse/storage/state.py: _make_group_id was unused
|
2015-09-23 10:37:58 +01:00 |