Erik Johnston
|
42deca50c2
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
|
2016-01-25 12:49:45 +00:00 |
|
Erik Johnston
|
d685ae73b4
|
Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop
|
2016-01-25 12:35:25 +00:00 |
|
Erik Johnston
|
4021f95261
|
Move logic from rest/ to handlers/
|
2016-01-25 10:10:44 +00:00 |
|
David Baker
|
f92fe15897
|
Merge pull request #523 from matrix-org/dbkr/no_push_unless_notify
Better fix for actions with both dont_notify and tweaks
|
2016-01-22 17:27:25 +00:00 |
|
David Baker
|
3fe8c56736
|
Better fix for actions with both dont_notify and tweaks
|
2016-01-22 17:21:58 +00:00 |
|
David Baker
|
60965bd7e5
|
Revert b4a41aa542 as it's just broken.
|
2016-01-22 17:21:15 +00:00 |
|
David Baker
|
0e0e441b33
|
Merge pull request #522 from matrix-org/dbkr/no_push_unless_notify
Don't add notifications to the table unless there's actually a 'notify' action
|
2016-01-22 17:06:52 +00:00 |
|
David Baker
|
b4a41aa542
|
Don't add notifications to the table unless there's actually a 'notify' action
|
2016-01-22 16:56:48 +00:00 |
|
Erik Johnston
|
db6e26bb8c
|
Don't mutate cached values
|
2016-01-22 16:03:55 +00:00 |
|
Erik Johnston
|
88baa3865e
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
|
2016-01-22 15:57:12 +00:00 |
|
David Baker
|
74f49f99f9
|
Merge pull request #520 from matrix-org/dbkr/bulk_push_overlay_enabled
Overlay the push_rules_enabled map for users
|
2016-01-22 15:25:52 +00:00 |
|
David Baker
|
7065b75bfd
|
Don't crash if a user has no push rule enabled entries
|
2016-01-22 15:13:44 +00:00 |
|
Erik Johnston
|
7959e8b764
|
Underscores are allowed in user ids
|
2016-01-22 14:59:49 +00:00 |
|
David Baker
|
52bdd1b834
|
Overlay the push_rules_enabled map for users, otherwise they won't be able to disable server default rules.
|
2016-01-22 14:58:19 +00:00 |
|
David Baker
|
7a3fe48ba4
|
Merge pull request #519 from matrix-org/dbkr/treecache
Make LRU caching tree-based so subtrees of the cache can be invalidated cheaply.
|
2016-01-22 14:47:48 +00:00 |
|
David Baker
|
7cd418d38e
|
Don't add the member functiopn if we're not using treecache
|
2016-01-22 13:40:37 +00:00 |
|
David Baker
|
cd80019eec
|
docs
|
2016-01-22 12:21:13 +00:00 |
|
David Baker
|
d552861346
|
Revert all the bits changing keys of eeverything that used LRUCaches to tuples
|
2016-01-22 12:18:14 +00:00 |
|
David Baker
|
10f76dc5da
|
Make LRU cache not default to treecache & add options to use it
|
2016-01-22 12:10:33 +00:00 |
|
David Baker
|
5b142788d2
|
Add __contains__
|
2016-01-22 11:49:59 +00:00 |
|
David Baker
|
eaa836e8ca
|
Docs for treecache
|
2016-01-22 11:47:22 +00:00 |
|
David Baker
|
42eae4634f
|
Use new invalidate_many cache invalidation to invalidate the event_push_actions cache appropriately.
|
2016-01-22 11:22:48 +00:00 |
|
David Baker
|
8acc5cb60f
|
Add invalidate_many here too
|
2016-01-22 11:22:32 +00:00 |
|
David Baker
|
31a051b677
|
Test treecache directly
|
2016-01-22 11:22:00 +00:00 |
|
Erik Johnston
|
8f9c74e9f1
|
Fix tests
|
2016-01-22 10:48:27 +00:00 |
|
Erik Johnston
|
975903ae17
|
Sanitize filters
|
2016-01-22 10:41:30 +00:00 |
|
David Baker
|
4efcaa43c8
|
Add tests for treecache directly and test del_multi at the LruCache level too.
|
2016-01-22 10:37:37 +00:00 |
|
David Baker
|
330be18ec5
|
peppate
|
2016-01-21 19:17:32 +00:00 |
|
David Baker
|
f1f8122120
|
Change LRUCache to be tree-based so we can delete subtrees.
|
2016-01-21 19:16:25 +00:00 |
|
Erik Johnston
|
297eded261
|
Merge pull request #517 from matrix-org/erikj/push_only_room
Only fetch events for rooms and receipts
|
2016-01-21 16:12:39 +00:00 |
|
Erik Johnston
|
0e07f2e15d
|
Only fetch events for rooms and receipts
|
2016-01-21 16:10:37 +00:00 |
|
Erik Johnston
|
82b46f556d
|
Merge pull request #516 from matrix-org/erikj/push_perf
Reduce number of calls to get_unread_event_push_actions_by_room
|
2016-01-21 15:12:56 +00:00 |
|
Erik Johnston
|
8f66fe6392
|
Cache get_unread_event_push_actions_by_room_for_user
|
2016-01-21 15:02:07 +00:00 |
|
Erik Johnston
|
3a00f13436
|
Only compute badge count when necessary.
This reverts commit d726597737.
|
2016-01-21 14:56:11 +00:00 |
|
Erik Johnston
|
c6549117a2
|
Fix AttributeError
|
2016-01-21 14:02:14 +00:00 |
|
Erik Johnston
|
ed1d189e10
|
Merge pull request #515 from matrix-org/erikj/syn-606
SYN-606: Peeking does not wake up /events
|
2016-01-21 13:40:20 +00:00 |
|
Erik Johnston
|
dfe1273d14
|
Merge pull request #509 from matrix-org/erikj/dns_cache
Cache dns lookups, and use the cache if we fail to lookup servers later
|
2016-01-21 13:37:23 +00:00 |
|
Erik Johnston
|
91a222c66d
|
SYN-606: Peeking does not wake up /events
If a real user attempted to first peek into one room, and then another,
their room event stream would not be woken up for events in the later
room.
|
2016-01-21 13:22:26 +00:00 |
|
David Baker
|
0503bdb316
|
Merge pull request #514 from matrix-org/remove_member_event_rule
Remove member event rule as per SYN-607
|
2016-01-21 12:00:26 +00:00 |
|
David Baker
|
930ba003f8
|
Remove member event rule as per SYN-607
|
2016-01-21 11:50:27 +00:00 |
|
Erik Johnston
|
d54005059c
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
|
2016-01-21 10:19:15 +00:00 |
|
Erik Johnston
|
d7c85ad916
|
Add another graph contrib
|
2016-01-21 10:19:05 +00:00 |
|
David Baker
|
c1a3021771
|
Merge pull request #507 from matrix-org/push_badge_counts
Push badge counts
|
2016-01-21 10:09:11 +00:00 |
|
Erik Johnston
|
d049e81b10
|
Merge pull request #513 from matrix-org/erikj/register_user_chars
Don't explode when given a unicode username in /register/
|
2016-01-21 09:53:35 +00:00 |
|
Erik Johnston
|
c43b6dcc75
|
Fix change_password
|
2016-01-20 16:14:48 +00:00 |
|
David Baker
|
367cfab4e6
|
peppate
|
2016-01-20 16:05:09 +00:00 |
|
Erik Johnston
|
69adf8c384
|
Merge pull request #512 from matrix-org/erikj/whine_on_from
Whine if we give a from param to /sync
|
2016-01-20 15:58:44 +00:00 |
|
Erik Johnston
|
73ca8e5834
|
Whine if we give a from param to /sync
|
2016-01-20 15:42:57 +00:00 |
|
Erik Johnston
|
b088291f14
|
Don't explode when given a unicode username in /register/
|
2016-01-20 15:40:25 +00:00 |
|
Daniel Wagner-Hall
|
a2ae01cc0f
|
Merge pull request #510 from matrix-org/daniel/nonguestpeeking
Allow non-guests to peek on rooms using /events
|
2016-01-20 15:34:18 +00:00 |