6ca4d3ae9a
Add vector.im to default secondary_directory_servers and add comment explaining it's not a permanent solution
2016-05-31 17:24:50 +01:00
963e3ed282
Apparently I am not permitted to have two blank lines here
2016-05-31 17:22:53 +01:00
d240796ded
Basic, un-cached support for secondary_directory_servers
2016-05-31 17:20:07 +01:00
70ecb415f5
Fix c+p fail
2016-05-31 12:00:54 +01:00
e1625d62a8
Add federation room list servlet
2016-05-31 11:55:57 +01:00
163e48c0e3
Merge pull request #802 from matrix-org/dbkr/split_room_list_handler
...
Split out the room list handler
2016-05-31 11:32:44 +01:00
887c6e6f05
Split out the room list handler
...
So I can use it from federation bits without pulling in all the handlers.
2016-05-31 11:05:16 +01:00
85b992f621
Fix to allow start with postgres
2016-05-27 10:44:44 +01:00
cc84f7cb8e
Send down correct error response if user not found
2016-05-27 10:35:15 +01:00
209ba4d024
Merge pull request #795 from matrix-org/dbkr/delete_push_actions_after_a_month
...
Only delete push actions after 30 days
2016-05-24 16:22:13 +01:00
b007ee4606
Check for presence of 'avatar_url' key
2016-05-24 15:12:05 +01:00
95b86e6dad
tweak mail notifs
2016-05-24 14:52:29 +01:00
cbf8d146ac
Merge pull request #799 from matrix-org/matthew/quieter-email-notifs
...
Tune email notifs to make them quieter:
2016-05-24 14:30:51 +01:00
d16cc52b5d
Merge pull request #798 from negzi/bugfix_create_user_feature
...
Fix set profile error with Requester.
2016-05-24 10:13:53 +01:00
680f1d9387
catch thinko in presentable names
2016-05-23 22:55:11 +01:00
cb8a321bdd
fix NPE in room ordering
2016-05-23 22:54:56 +01:00
d437882581
fix debug text
2016-05-23 22:54:32 +01:00
88ea5ab2c3
consistency is the better part of valour
2016-05-23 19:33:45 +01:00
989bdc9e56
Tune email notifs to make them quieter:
...
* After initial 10 minute window, only alert every 24h for room notifs
* Reset room state after 6h of idleness
* Synchronise throttles for messages sent in the same notif, so the 24 hourly notifs 'line up'
* Fix the email subjects to say what triggered the notification
* Order the rooms in reverse activity order in the email, so the 'reason' room should always come first
2016-05-23 19:24:11 +01:00
6fe04ffef2
Fix set profile error with Requester.
...
Replace flush_user with delete access token due to function removal
Add a new test case for if the user is already registered
2016-05-23 19:50:28 +02:00
31b5395ab6
Remove debug logging
2016-05-23 16:32:01 +01:00
09804c9862
Fix link to A-S spec
2016-05-23 16:29:38 +01:00
c2da3406fc
Oops, missing comma
2016-05-20 18:03:31 +01:00
ccffb0965d
Remove stale line
2016-05-20 17:59:10 +01:00
18d68bfee4
Handle empty events table
2016-05-20 17:58:09 +01:00
d4503e25ed
Make deleting push actions more efficient
...
There's no index on received_ts, so manually binary search using the stream_ordering index, and only update it once an hour.
2016-05-20 17:56:10 +01:00
149fa411e2
Only delete push actions after 30 days
2016-05-20 15:25:12 +01:00
60ff2e7984
Merge pull request #794 from matrix-org/kegan/join-with-server-name
...
Allow clients to specify a server_name to avoid 'No known servers'
2016-05-19 14:13:11 +01:00
332d7e9b97
Allow clients to specify a server_name to avoid 'No known servers'
...
Multiple server_names are supported via ?server_name=foo&server_name=bar
2016-05-19 13:50:52 +01:00
6fb51eaf7b
Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convo
...
increment badge count per missed convo, not per msg
2016-05-18 13:56:38 +01:00
e837df6adb
increment badge count per missed convo, not per msg
2016-05-18 11:53:25 +01:00
42368ea8db
Add desc to get_presence_for_users
2016-05-18 11:38:10 +01:00
ee660c6b9b
Merge pull request #792 from matrix-org/markjh/liberate_typing_handler
...
Move typing handler out of the Handlers object
2016-05-17 16:06:17 +01:00
0cb441fedd
Move typing handler out of the Handlers object
2016-05-17 15:58:46 +01:00
5adf627551
Merge pull request #791 from matrix-org/markjh/app_service_config
...
Move the functions for parsing app service config
2016-05-17 11:40:49 +01:00
6a30a0bfd3
Move the functions for parsing app service config
2016-05-17 11:28:58 +01:00
c4c98ce8da
Merge pull request #790 from matrix-org/markjh/liberate_sync_handler
...
Move SyncHandler out of the Handlers object
2016-05-17 10:54:39 +01:00
523d5bcd0b
Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler
2016-05-17 10:43:58 +01:00
43e1e0489c
Merge pull request #786 from matrix-org/matthew/email_notifs_tuning
...
tune email notifs, fix CSS a bit, and add debugging details
2016-05-17 10:43:24 +01:00
1ed33784a6
Merge pull request #789 from matrix-org/markjh/member_cleanup
...
Cleanup room member handler
2016-05-17 10:43:19 +01:00
526bf8126f
Remove unused get_joined_rooms_for_user
2016-05-17 10:20:51 +01:00
425e6b4983
Merge branch 'develop' into markjh/member_cleanup
2016-05-17 10:13:16 +01:00
b153f5b150
Merge pull request #787 from matrix-org/markjh/liberate_presence_handler
...
Move the presence handler out of the Handlers object
2016-05-17 10:09:43 +01:00
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
David Baker