66d36b8e41
Be explicit about what we're doing
2015-11-05 17:26:19 +00:00
2aa98ff3bc
Remove redundant test
2015-11-05 17:25:50 +00:00
5ee070d21f
Increment by one, not five
2015-11-05 17:25:33 +00:00
1ad6222ebf
COMMENTS
2015-11-05 16:29:16 +00:00
3640ddfbf6
Error handling
2015-11-05 16:10:54 +00:00
729ea933ea
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
2015-11-05 15:43:52 +00:00
347146be29
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2015-11-05 15:35:17 +00:00
7a5ea067e2
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
2015-11-05 15:35:05 +00:00
7301e05122
Implement basic pagination for search results
2015-11-05 15:04:08 +00:00
ca2f90742d
Open up /events to anonymous users for room events only
...
Squash-merge of PR #345 from daniel/anonymousevents
2015-11-05 14:32:26 +00:00
7a369e8a55
Merge pull request #347 from matrix-org/markjh/check_filter
...
Remove fields that are both unspecified and unused from the filter checks
2015-11-05 11:15:39 +00:00
05c326d445
Implement order and group by
2015-11-04 17:57:44 +00:00
4e62ffdb21
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2015-11-04 17:31:01 +00:00
f522f50a08
Allow guests to register and call /events?room_id=
...
This follows the same flows-based flow as regular registration, but as
the only implemented flow has no requirements, it auto-succeeds. In the
future, other flows (e.g. captcha) may be required, so clients should
treat this like the regular registration flow choices.
2015-11-04 17:29:07 +00:00
1758187715
Merge pull request #339 from matrix-org/daniel/removesomelies
...
Remove unused arguments and code
2015-11-04 17:26:41 +00:00
33b3e04049
Merge branch 'develop' into daniel/removesomelies
...
Conflicts:
synapse/notifier.py
2015-11-04 16:01:00 +00:00
23cfd32e64
Merge pull request #346 from matrix-org/markjh/remove_lock_manager
...
Remove the LockManager class because it wasn't being used
2015-11-04 15:49:45 +00:00
285d056629
Remove fields that are both unspecified and unused from the filter checks, check the right top level definitions in the filter
2015-11-04 15:47:19 +00:00
c452dabc3d
Remove the LockManager class because it wasn't being used
2015-11-04 14:08:15 +00:00
f74f48e9e6
Merge pull request #341 from matrix-org/markjh/v2_sync_receipts
...
Include read receipts in v2 sync
2015-11-03 18:45:13 +00:00
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
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
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
Erik Johnston