6a3a840b19
Merge pull request #343 from matrix-org/erikj/fix_retries
...
Fix broken cache for getting retry times.
2015-11-03 17:51:49 +00:00
a3bfef35fd
Merge branch 'develop' into markjh/v2_sync_receipts
...
Conflicts:
synapse/handlers/sync.py
2015-11-03 17:31:17 +00:00
6797fcd9ab
Merge pull request #335 from matrix-org/markjh/room_tags
...
Add APIs for adding and removing tags from rooms
2015-11-03 16:45:53 +00:00
97d792b28f
Don't rearrange transaction_queue
2015-11-03 16:31:08 +00:00
7ce264ce5f
Fix broken cache for getting retry times. This meant we retried remote destinations way more frequently than we should
2015-11-03 16:24:03 +00:00
8a0407c7e6
Merge branch 'develop' into paul/tiny-fixes
2015-11-03 16:08:48 +00:00
06986e46a3
That TODO was done
2015-11-03 14:28:51 +00:00
5897e773fd
Spell "deferred" more correctly
2015-11-03 14:27:35 +00:00
2657140c58
Include read receipts in v2 sync
2015-11-02 17:54:04 +00:00
eacb068ac2
Retry dead servers a lot less often
2015-11-02 16:56:30 +00:00
57be722c46
Include room tags in v2 /sync
2015-11-02 16:23:15 +00:00
771ca56c88
Remove more unused parameters
2015-11-02 15:31:57 +00:00
ddd8566f41
Store room tag content and return the content in the m.tag event
2015-11-02 15:11:31 +00:00
192241cf2a
Remove unused arguments and code
2015-11-02 15:10:59 +00:00
3eb62873f6
Merge pull request #338 from matrix-org/daniel/fixdb
...
Add missing column
2015-11-02 14:54:31 +00:00
0e36756383
Merge branch 'develop' into markjh/room_tags
2015-11-02 10:57:00 +00:00
fb46937413
Support clients supplying older tokens, fix short poll test
2015-10-30 16:38:35 +00:00
79b65f3875
Include tags in v1 room initial sync
2015-10-30 16:28:19 +00:00
621e84d9a0
Add missing column
2015-10-30 16:25:53 +00:00
fdf73c6855
Include room tags v1 /initialSync
2015-10-30 16:22:32 +00:00
0f432ba551
Merge pull request #337 from matrix-org/markjh/v2_sync_joining
...
Don't mark newly joined room timelines as limited in an incremental sync
2015-10-30 11:18:08 +00:00
d58edd98e9
Update the other place check_joined_room is called
2015-10-30 11:15:37 +00:00
5cf22f0596
Don't mark newly joined room timelines as limited in an incremental sync
2015-10-29 19:58:51 +00:00
f6e6f3d87a
Make search API honour limit set in filter
2015-10-29 16:17:47 +00:00
f40b0ed5e1
Inform the client of new room tags using v1 /events
2015-10-29 15:21:09 +00:00
5d80dad99e
Merge pull request #336 from matrix-org/erikj/search
...
Optionally return event contexts with search results
2015-10-28 18:39:40 +00:00
e83c4b8e3e
Merge pull request #334 from matrix-org/erikj/context_api
...
Add room context api
2015-10-28 18:26:01 +00:00
a2e5f7f3d8
Optionally return event contexts with search results
2015-10-28 18:25:11 +00:00
2f6ad79a80
Merge branch 'erikj/context_api' into erikj/search
2015-10-28 17:53:24 +00:00
a89b86dc47
Fix pyflakes errors
2015-10-28 16:45:57 +00:00
892e70ec84
Add APIs for adding and removing tags from rooms
2015-10-28 16:06:57 +00:00
56dbcd1524
Docs
2015-10-28 14:05:50 +00:00
234d6f9f3e
Merge pull request #332 from matrix-org/rav/full_state_sync
...
Implement full_state incremental sync
2015-10-28 14:04:39 +00:00
5cb298c934
Add room context api
2015-10-28 13:45:56 +00:00
d0b1968a4c
Merge pull request #331 from matrix-org/rav/500_on_missing_sigil
...
Fix a 500 error resulting from empty room_ids
2015-10-27 15:20:57 +00:00
c79c4f9b14
Implement full_state incremental sync
...
A hopefully-complete implementation of the full_state incremental sync, as
specced at https://github.com/matrix-org/matrix-doc/pull/133 .
This actually turns out to be a relatively simple modification to the initial
sync implementation.
2015-10-26 18:47:18 +00:00
f69a5c9134
Fix a 500 error resulting from empty room_ids
...
POST /_matrix/client/api/v1/rooms//send/a.b.c gave a 500 error, because we
assumed that rooms always had at least one character.
2015-10-26 18:44:03 +00:00
a299fede9d
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into release-v0.10.1
2015-10-26 18:16:31 +00:00
f73de2004e
Use correct service url
2015-10-26 18:12:09 +00:00
cea2039b56
Merge pull request #330 from matrix-org/erikj/login_fallback
...
Add login fallback
2015-10-26 17:57:00 +00:00
f7e14bb535
Merge pull request #329 from matrix-org/erikj/static
...
Move static folder into synapse
2015-10-26 17:35:37 +00:00
87961d8dcf
Add login fallback
2015-10-26 17:35:24 +00:00
fa1cf5ef34
Move static folder into synapse
...
This is because otherwise it won't get picked up by python packaging.
This also fixes the problem where the "static" folder was found if
synapse wasn't started from that directory.
2015-10-26 15:37:44 +00:00
3f0a57eb9b
Merge pull request #328 from matrix-org/erikj/search
...
Pull out sender when computing search results
2015-10-26 10:24:19 +00:00
4cf633d5e9
Pull out sender when computing search results
2015-10-23 15:41:36 +01:00
b8e37ed944
Merge pull request #327 from matrix-org/erikj/search
...
Implement rank function for SQLite FTS
2015-10-23 15:27:51 +01:00
0c36098c1f
Implement rank function for SQLite FTS
2015-10-23 13:23:48 +01:00
216c976399
Merge pull request #323 from matrix-org/daniel/sizelimits
...
Reject events which are too large
2015-10-23 11:26:03 +01:00
259d10f0e4
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
2015-10-23 11:11:56 +01:00
b051781ddb
Merge pull request #325 from matrix-org/markjh/filter_dicts
...
Support filtering events represented as dicts.
2015-10-22 17:14:52 +01:00
Erik Johnston