3fd8a07fca
Merge pull request #788 from matrix-org/markjh/domian
...
Spell "domain" correctly
2016-05-17 10:09:34 +01:00
f68eea808a
Move SyncHandler out of the Handlers object
2016-05-16 20:19:26 +01:00
53e171f345
Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_handler
2016-05-16 20:08:32 +01:00
80cb9becd8
Remove get_joined_rooms_for_user from RoomMemberHandler
2016-05-16 20:06:55 +01:00
816df9f267
get_room_members is unused now
2016-05-16 19:51:43 +01:00
821306120a
Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room
2016-05-16 19:48:07 +01:00
1a3a2002ff
Spell "domain" correctly
...
s/domian/domain/g
2016-05-16 19:17:23 +01:00
e168abbcff
Don't inherit PresenceHandler from BaseHandler, remove references to self.hs from presence handler
2016-05-16 19:08:40 +01:00
e501e9ecb2
tweak text
2016-05-16 19:02:22 +01:00
cbd2adc95e
tune email notifs, fix CSS a bit, and add debugging details
2016-05-16 18:58:38 +01:00
3b86ecfa79
Move the presence handler out of the Handlers object
2016-05-16 18:56:37 +01:00
647781ca56
Fix emailpusher import
...
Try importing at the root level rather than conditionally importing, as per comment
2016-05-16 18:41:32 +01:00
c39f305067
os.environ requires a string
2016-05-16 17:21:30 +01:00
678c8a7f1e
Merge pull request #785 from matrix-org/erikj/cache_factor_synctly
...
Make synctl read a cache factor from config file
2016-05-16 17:07:35 +01:00
c5c5a7403b
Make synctl read a cache factor from config file
2016-05-16 17:01:57 +01:00
2d98c960ec
Merge pull request #760 from matrix-org/matthew/preview_url_ip_whitelist
...
add a url_preview_ip_range_whitelist config param
2016-05-16 13:13:26 +01:00
eb79110beb
Clean up the blacklist/whitelist handling.
...
Always set the config key with an empty list, even if a list isn't specified.
This means that the codepaths are the same for both the empty list and
for a missing key. Since the behaviour is the same for both cases this
makes the code somewhat easier to reason about.
2016-05-16 13:03:59 +01:00
dd95eb4cb5
Merge branch 'develop' into matthew/preview_url_ip_whitelist
2016-05-16 12:59:41 +01:00
60d53f9e95
Count number of GC collects
2016-05-16 09:34:42 +01:00
c0112fabc2
fix logo
2016-05-13 18:07:21 +01:00
0e8364c7f5
rogue img
2016-05-13 17:53:31 +01:00
782471b7e1
fix matrix.to URLs
2016-05-13 17:50:16 +01:00
0466454b00
Assert that stream replicated stream positions are ints
2016-05-13 17:33:44 +01:00
077468f6a9
Merge pull request #780 from matrix-org/dbkr/email_notifs_on_pusher
...
Make email notifs work on the pusher synapse
2016-05-13 17:27:46 +01:00
b3f29dc1e5
Manually expire broken caches like the who_forgot_in_room
2016-05-13 17:16:27 +01:00
f03ddc98ec
Use the SlavedAccountDataStore
2016-05-13 17:01:28 +01:00
1f71f386f6
Merge branch 'develop' into dbkr/email_notifs_on_pusher
2016-05-13 16:59:56 +01:00
206eb9fd94
Shift some of the state_group methods into the SlavedEventStore
2016-05-13 16:58:14 +01:00
7d6e89ed22
Add a comment
2016-05-13 16:31:08 +01:00
21018c2c13
Merge pull request #783 from matrix-org/markjh/slave_account_data
...
Add a slaved datastore for account data
2016-05-13 15:56:04 +01:00
a8affd606e
Merge pull request #784 from matrix-org/markjh/receipts_fix
...
Allow receipts for events we haven't seen in the db
2016-05-13 15:55:26 +01:00
b7381d5338
Allow receipts for events we haven't seen in the db
2016-05-13 15:46:41 +01:00
3abab26458
Add a slaved datastore for account data
2016-05-13 15:34:06 +01:00
99b5a2e560
Merge pull request #741 from negzi/create_user_with_expiry
...
Create user with expiry
2016-05-13 14:46:53 +01:00
ba5c616ff4
Merge pull request #778 from matrix-org/erikj/add_pusher
...
Fixup add_pusher
2016-05-13 14:43:23 +01:00
0c11c1be88
Spelling
2016-05-13 14:42:25 +01:00
e00e8f2166
Merge pull request #769 from matrix-org/erikj/push_actions_delete
...
Delete old pushers
2016-05-13 14:41:36 +01:00
fd8e921b6e
Merge pull request #779 from matrix-org/erikj/receipts
...
Use tree cache for get_linearized_receipts_for_room
2016-05-13 14:41:21 +01:00
024cda9a97
Merge pull request #782 from matrix-org/erikj/remove_indices
...
Remove unused indices
2016-05-13 14:40:45 +01:00
c9aff0736c
Remove topics table
2016-05-13 14:40:38 +01:00
40aa6e8349
Create user with expiry
...
- Add unittests for client, api and handler
Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
2016-05-13 15:34:15 +02:00
9295fa30a8
Annotate the removed indicies with why they were removed.
2016-05-13 14:16:57 +01:00
5e50058473
Remove unused indices
...
This includes removing both unused indices and indices that are subsets
of other indices.
2016-05-13 13:28:07 +01:00
cdda850ce1
Merge pull request #781 from matrix-org/markjh/replication_problems
...
Fix a bug in replication that was causing the pusher to tight loop
2016-05-13 12:05:19 +01:00
0e792e7903
Log the stream IDs in an order that makes sense
2016-05-13 11:54:44 +01:00
3547e66bc6
Make sure we advance our stream position
2016-05-13 11:53:00 +01:00
6da7f39d95
Use tree cache for get_linearized_receipts_for_room
2016-05-13 11:41:23 +01:00
b5e646a18c
Make email notifs work on the pusher synapse
...
Plus general bugfix to email notif code
2016-05-13 11:36:50 +01:00
048b3ece36
Merge pull request #777 from matrix-org/markjh/move_filter_for_client
...
move filter_events_for_client out of base handler
2016-05-13 11:30:22 +01:00
13d37c3c56
Fixup add_pusher
2016-05-13 11:25:02 +01:00
Mark Haines