Daniel Wagner-Hall
2ef6de928d
Skip, rather than erroring, invalid guest requests
...
Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour.
2016-01-05 18:12:37 +00:00
Daniel Wagner-Hall
29e131df43
Merge pull request #462 from matrix-org/daniel/guestupgrade
...
Allow guests to upgrade their accounts
2016-01-05 18:01:29 +00:00
Daniel Wagner-Hall
cfd07aafff
Allow guests to upgrade their accounts
2016-01-05 18:01:18 +00:00
Erik Johnston
a178eb1bc8
Merge pull request #464 from matrix-org/erikj/crop_correct
...
Use larger thumbnails rather than smaller when method=crop
2016-01-05 17:41:07 +00:00
Erik Johnston
8737ead008
Use larger thumbnail rather than smaller.
2016-01-05 17:30:30 +00:00
Erik Johnston
90921981be
Merge pull request #461 from matrix-org/erikj/sync_leave
...
Return /sync when something under the 'leave' key has changed
2016-01-05 14:59:05 +00:00
Erik Johnston
acb19068d0
Return /sync when something under the 'leave' key has changed
2016-01-05 14:49:06 +00:00
Erik Johnston
d74c4e90d4
Merge pull request #460 from matrix-org/erikj/create_room_3pid_invite
...
Support inviting 3pids in /createRoom
2016-01-05 14:06:23 +00:00
David Baker
85ca8cb90c
comment typo
2016-01-05 13:32:39 +00:00
Erik Johnston
c3ea36304b
Use named args
2016-01-05 12:57:45 +00:00
Erik Johnston
1b5642604b
Support inviting 3pids in /createRoom
2016-01-05 11:56:21 +00:00
Erik Johnston
07c33eff43
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-01-05 10:25:13 +00:00
David Baker
4eb7b950c8
= not == in sql
2016-01-04 18:11:17 +00:00
Matthew Hodgson
dc65d0ae9d
typoe
2016-01-04 17:23:15 +00:00
Matthew Hodgson
b18b99eb14
fix another whitespace rst bug
2016-01-04 17:17:27 +00:00
Matthew Hodgson
5680be70ae
fix whitespace bug
2016-01-04 17:13:52 +00:00
David Baker
c77e7e60fc
Only joined rooms have unread_notif_count
2016-01-04 15:49:06 +00:00
David Baker
d74c6ace24
comma
2016-01-04 15:32:00 +00:00
David Baker
f1b67730fa
Add unread_notif_count in incremental_sync_with_gap
2016-01-04 14:50:36 +00:00
David Baker
92a1e74b20
fix tests
2016-01-04 14:17:35 +00:00
David Baker
c914d67cda
Rename event-actions to event_push_actions as per PR request
2016-01-04 14:05:37 +00:00
Mark Haines
f35f8d06ea
Merge remote-tracking branch 'origin/release-v0.12.0'
2016-01-04 14:02:50 +00:00
Mark Haines
d2709a5389
Bump changelog and version for v0.12.0
2016-01-04 13:57:39 +00:00
David Baker
928c575c6f
Merge remote-tracking branch 'origin/develop' into store_event_actions
2016-01-04 13:39:51 +00:00
David Baker
3051c9d002
Address minor PR issues
2016-01-04 13:39:29 +00:00
Richard van der Hoff
34c09f33da
Update CHANGES
2016-01-04 12:45:58 +00:00
Richard van der Hoff
cf3282d103
Merge pull request #459 from matrix-org/rav/fix_r0_login
...
Expose /login under r0
2016-01-04 12:41:53 +00:00
Richard van der Hoff
32d9fd0b26
Expose /login under r0
...
The spec says /login should be available at r0 and 'unstable', so make it so.
2016-01-02 17:24:28 +00:00
Mark Haines
c6e79c84de
Bump version and update changelog for v0.12.0-rc3
2015-12-23 16:15:54 +00:00
Mark Haines
8d6dde7825
Merge pull request #457 from matrix-org/markjh/cached_sync
...
Add a cache for initialSync responses that expires after 5 minutes
2015-12-23 16:04:52 +00:00
Mark Haines
d12c00bdc3
Add some docstring explaining the snapshot cache does
2015-12-23 15:18:11 +00:00
Mark Haines
ba39d3d5d7
Merge pull request #458 from matrix-org/markjh/guest_auth
...
Missing yield on guest access auth check
Needs matrix-org/sytest#125 to land first
2015-12-23 14:10:09 +00:00
Mark Haines
f3948e001f
Missing yield on guest access auth check
...
Needs matrix-org/sytest#125 to land first
2015-12-23 14:10:06 +00:00
Mark Haines
7fa71e3267
Add a unit test for the snapshot cache
2015-12-23 11:48:03 +00:00
Mark Haines
517fb9a023
Move the doc string to the public facing method
2015-12-22 18:53:47 +00:00
Mark Haines
9ac417fa88
Add a cache for initialSync responses that expires after 5 minutes
2015-12-22 18:27:56 +00:00
David Baker
d2a92c6bde
Fix merge fail with anon access stuff
2015-12-22 18:25:04 +00:00
David Baker
d79e90f078
Add mocks to make tests work again
2015-12-22 17:56:56 +00:00
David Baker
9b4cd0cd0f
pep8 & unused variable
2015-12-22 17:25:09 +00:00
David Baker
140a50f641
Merge remote-tracking branch 'origin/develop' into store_event_actions
2015-12-22 17:23:35 +00:00
David Baker
5645d9747b
Add some comments to areas that could be optimised.
2015-12-22 17:19:22 +00:00
David Baker
3fbb031745
Remove the list of problems (moved to jira issues)
2015-12-22 17:13:47 +00:00
David Baker
4c8f6a7e42
Insert push actions in a single db query rather than one per user/profile_tag
2015-12-22 17:04:31 +00:00
Mark Haines
7df276d219
Merge pull request #455 from matrix-org/markjh/guest_access
...
Allow guest access to /sync
2015-12-22 16:09:23 +00:00
Mark Haines
0ee0138325
Include the list of bad room ids in the error
2015-12-22 15:49:32 +00:00
David Baker
77f06856b6
clarify problems
2015-12-22 15:22:26 +00:00
David Baker
65c451cb38
Add bulk push rule evaluator which actually still evaluates rules one by one, but does far fewer db queries to fetch the rules
2015-12-22 15:19:34 +00:00
Mark Haines
251aafccca
Use a list comprehension
2015-12-22 14:03:24 +00:00
Mark Haines
c058625959
Merge remote-tracking branch 'origin/develop' into markjh/guest_access
...
Conflicts:
synapse/api/filtering.py
2015-12-22 13:58:18 +00:00
Mark Haines
cdd04f7055
Hook up read receipts and typing notifications for guest access
2015-12-22 11:59:55 +00:00
