Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Poke notifier on next reactor tick | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
| | |||||
* | Merge pull request #811 from matrix-org/erikj/state_users_in_room | Erik Johnston | 2016-06-03 | 5 | -28/+45 |
|\ | | | | | Use state to calculate get_users_in_room | ||||
| * | Use state to calculate get_users_in_room | Erik Johnston | 2016-06-01 | 5 | -28/+45 |
| | | |||||
* | | Merge pull request #809 from matrix-org/erikj/cache_receipts_in_room | Erik Johnston | 2016-06-03 | 2 | -4/+32 |
|\| | | | | | Add get_users_with_read_receipts_in_room cache | ||||
| * | Add get_users_with_read_receipts_in_room cache | Erik Johnston | 2016-06-01 | 2 | -4/+32 |
| | | |||||
* | | Merge pull request #821 from matrix-org/dbkr/email_unsubscribe | David Baker | 2016-06-02 | 6 | -17/+125 |
|\ \ | | | | | | | Email unsubscribe links that don't require logging in | ||||
| * | | peppate | David Baker | 2016-06-02 | 1 | -1/+3 |
| | | | |||||
| * | | Working unsubscribe links going straight to the HS | David Baker | 2016-06-02 | 4 | -6/+36 |
| | | | | | | | | | | | | and authed by macaroons that let you delete pushers and nothing else | ||||
| * | | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ↵ | David Baker | 2016-06-02 | 2 | -29/+37 |
| |\ \ | | | | | | | | | | | | | dbkr/email_unsubscribe | ||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 8 | -554/+806 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 12 | -24/+38 |
| |\ \ \ \ | |||||
| * | | | | | Email unsubscribing that may in theory, work | David Baker | 2016-06-02 | 3 | -6/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | Were it not for that fact that you can't use the base handler in the pusher because it pulls in the world. Comitting while I fix that on a different branch. | ||||
| * | | | | | WIP on unsubscribing email notifs without logging in | David Baker | 2016-06-01 | 2 | -10/+70 |
| | | | | | | |||||
* | | | | | | Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_error | David Baker | 2016-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | Fix error in email notification string formatting | ||||
| * | | | | | Fix error in email notification string formatting | David Baker | 2016-06-02 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | add some branding debugging | Matthew Hodgson | 2016-06-02 | 1 | -0/+1 |
|/ / / / / | |||||
* | | / / | Store the typing users as user_id strings. (#819) | Mark Haines | 2016-06-02 | 1 | -28/+36 |
| |_|/ / |/| | | | | | | | Rather than storing them as UserID objects. | ||||
* | | | | Fix setting the _clock in SQLBaseStore | Mark Haines | 2016-06-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | Deduplicate presence entries in sync (#818) | Mark Haines | 2016-06-02 | 1 | -0/+3 |
| | | | | |||||
* | | | | Allow external processes to mark a user as syncing. (#812) | Mark Haines | 2016-06-02 | 3 | -13/+167 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add infrastructure to the presence handler to track sync requests in external processes * Expire stale entries for dead external processes * Add an http endpoint for making users as syncing Add some docstrings and comments. * Fixes | ||||
* | | | | Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler | David Baker | 2016-06-02 | 8 | -13/+17 |
|\ \ \ \ | | |/ / | |/| | | Split out the auth handler | ||||
| * | | | Split out the auth handler | David Baker | 2016-06-02 | 8 | -13/+17 |
| | | | | |||||
* | | | | Disable INCLUDE_ALL_UNREAD_NOTIFS | Erik Johnston | 2016-06-02 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #800 from matrix-org/erikj/sync_refactor | Erik Johnston | 2016-06-02 | 1 | -537/+607 |
|\ \ \ \ | | | | | | | | | | | Refactor SyncHandler | ||||
| * | | | | Change short circuit path | Erik Johnston | 2016-05-24 | 1 | -16/+26 |
| | | | | | |||||
| * | | | | Don't send down all ephemeral events | Erik Johnston | 2016-05-24 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Only work out newly_joined_users for incremental sync | Erik Johnston | 2016-05-24 | 1 | -6/+9 |
| | | | | | |||||
| * | | | | Only include non-offline presence in initial sync | Erik Johnston | 2016-05-24 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Spell builder correctly | Erik Johnston | 2016-05-24 | 1 | -63/+63 |
| | | | | | |||||
| * | | | | Inline function. Make load_filtered_recents private | Erik Johnston | 2016-05-24 | 1 | -17/+7 |
| | | | | | |||||
| * | | | | Add comments | Erik Johnston | 2016-05-24 | 1 | -7/+105 |
| | | | | | |||||
| * | | | | Shuffle things room | Erik Johnston | 2016-05-24 | 1 | -37/+33 |
| | | | | | |||||
| * | | | | Add back concurrently_execute | Erik Johnston | 2016-05-23 | 1 | -25/+9 |
| | | | | | |||||
| * | | | | Refactor SyncHandler | Erik Johnston | 2016-05-23 | 1 | -497/+481 |
| | | | | | |||||
* | | | | | Merge pull request #814 from matrix-org/matthew/3pid_invite_auth | Matthew Hodgson | 2016-06-02 | 1 | -0/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | special case m.room.third_party_invite event auth to match invites, | ||||
| * | | | | | special case m.room.third_party_invite event auth to match invites, ↵ | Matthew Hodgson | 2016-06-01 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | otherwise they get out of sync and you get https://github.com/vector-im/vector-web/issues/1208 | ||||
* | | | | | | if an email pusher specifies a brand param, use it | Matthew Hodgson | 2016-06-02 | 2 | -3/+8 |
| |_|/ / / |/| | | | | |||||
* | | | | | Use user_id in email greeting if display name is null | David Baker | 2016-06-02 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge pull request #807 from matrix-org/erikj/push_rules_cache | Erik Johnston | 2016-06-01 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Ensure we always return boolean in push rules | ||||
| * | | | | Force boolean | Erik Johnston | 2016-05-31 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #806 from matrix-org/erikj/hash_cache | Erik Johnston | 2016-06-01 | 1 | -9/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Cache get_event_reference_hashes | ||||
| * | | | | | Cache get_event_reference_hashes | Erik Johnston | 2016-05-31 | 1 | -9/+16 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix room list spidering | David Baker | 2016-06-01 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #808 from matrix-org/dbkr/room_list_spider | David Baker | 2016-06-01 | 6 | -3/+151 |
|\ \ \ \ | | | | | | | | | | | Add secondary_directory_servers option to fetch room list from other servers | ||||
| * \ \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider | David Baker | 2016-06-01 | 9 | -48/+58 |
| |\ \ \ \ | |||||
| * | | | | | pep8 | David Baker | 2016-06-01 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Add cache to remote room lists | David Baker | 2016-05-31 | 1 | -4/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | Poll for updates from remote servers, waiting for the poll if there's no cache entry. | ||||
| * | | | | | Add vector.im to default secondary_directory_servers and add comment ↵ | David Baker | 2016-05-31 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | explaining it's not a permanent solution | ||||
| * | | | | | Apparently I am not permitted to have two blank lines here | David Baker | 2016-05-31 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Basic, un-cached support for secondary_directory_servers | David Baker | 2016-05-31 | 5 | -3/+68 |
| | | | | | | |||||
| * | | | | | Fix c+p fail | David Baker | 2016-05-31 | 1 | -17/+0 |
| | | | | | | |||||
| * | | | | | Add federation room list servlet | David Baker | 2016-05-31 | 2 | -1/+70 |
| | | | | | | |||||
* | | | | | | Limit number of notifications in an email notification | David Baker | 2016-06-01 | 1 | -2/+4 |
| |/ / / / |/| | | | | |||||
* | | | | | Fix synapse/storage/schema/delta/30/as_users.py | Mark Haines | 2016-05-31 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #805 from matrix-org/erikj/push_rules_cache | Erik Johnston | 2016-05-31 | 1 | -2/+8 |
|\ \ \ \ \ | | |_|/ / | |/| | | | Fix GET /push_rules | ||||
| * | | | | Fix typo | Erik Johnston | 2016-05-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Change fix | Erik Johnston | 2016-05-31 | 2 | -5/+8 |
| | | | | | |||||
| * | | | | Fix GET /push_rules | Erik Johnston | 2016-05-31 | 1 | -0/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #804 from matrix-org/erikj/push_rules_cache | Erik Johnston | 2016-05-31 | 2 | -9/+15 |
|\| | | | | | | | | | | | Add caches to bulk_get_push_rules* | ||||
| * | | | Add caches to bulk_get_push_rules* | Erik Johnston | 2016-05-31 | 2 | -9/+15 |
| | | | | |||||
* | | | | Move the AS handler out of the Handlers object. | Mark Haines | 2016-05-31 | 6 | -35/+33 |
| |/ / |/| | | | | | | | | | | | | | | Access it directly from the homeserver itself. It already wasn't inheriting from BaseHandler storing it on the Handlers object was already somewhat dubious. | ||||
* | | | Split out the room list handler | David Baker | 2016-05-31 | 3 | -3/+7 |
| | | | | | | | | | | | | So I can use it from federation bits without pulling in all the handlers. | ||||
* | | | Fix to allow start with postgres | Erik Johnston | 2016-05-27 | 1 | -2/+7 |
| | | | |||||
* | | | Send down correct error response if user not found | Erik Johnston | 2016-05-27 | 1 | -2/+7 |
| | | | |||||
* | | | Merge pull request #795 from matrix-org/dbkr/delete_push_actions_after_a_month | David Baker | 2016-05-24 | 4 | -7/+94 |
|\ \ \ | |/ / |/| | | Only delete push actions after 30 days | ||||
| * | | Remove debug logging | David Baker | 2016-05-23 | 1 | -1/+0 |
| | | | |||||
| * | | Oops, missing comma | David Baker | 2016-05-20 | 1 | -1/+1 |
| | | | |||||
| * | | Remove stale line | David Baker | 2016-05-20 | 1 | -2/+0 |
| | | | |||||
| * | | Handle empty events table | David Baker | 2016-05-20 | 1 | -0/+3 |
| | | | |||||
| * | | Make deleting push actions more efficient | David Baker | 2016-05-20 | 3 | -13/+68 |
| | | | | | | | | | | | | There's no index on received_ts, so manually binary search using the stream_ordering index, and only update it once an hour. | ||||
| * | | Only delete push actions after 30 days | David Baker | 2016-05-20 | 2 | -6/+38 |
| |/ | |||||
* | | Check for presence of 'avatar_url' key | David Baker | 2016-05-24 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #799 from matrix-org/matthew/quieter-email-notifs | David Baker | 2016-05-24 | 3 | -23/+72 |
|\ \ | | | | | | | Tune email notifs to make them quieter: | ||||
| * | | catch thinko in presentable names | Matthew Hodgson | 2016-05-23 | 1 | -4/+15 |
| | | | |||||
| * | | fix NPE in room ordering | Matthew Hodgson | 2016-05-23 | 1 | -2/+2 |
| | | | |||||
| * | | consistency is the better part of valour | Matthew Hodgson | 2016-05-23 | 1 | -1/+1 |
| | | | |||||
| * | | Tune email notifs to make them quieter: | Matthew Hodgson | 2016-05-23 | 2 | -18/+56 |
| |/ | | | | | | | | | | | | | | | * 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 | ||||
* / | Fix set profile error with Requester. | Negi Fazeli | 2016-05-23 | 1 | -4/+5 |
|/ | | | | | Replace flush_user with delete access token due to function removal Add a new test case for if the user is already registered | ||||
* | Allow clients to specify a server_name to avoid 'No known servers' | Kegan Dougal | 2016-05-19 | 1 | -1/+4 |
| | | | | Multiple server_names are supported via ?server_name=foo&server_name=bar | ||||
* | Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convo | Matthew Hodgson | 2016-05-18 | 1 | -1/+3 |
|\ | | | | | increment badge count per missed convo, not per msg | ||||
| * | increment badge count per missed convo, not per msg | Matthew Hodgson | 2016-05-18 | 1 | -1/+3 |
| | | |||||
* | | Add desc to get_presence_for_users | Erik Johnston | 2016-05-18 | 1 | -0/+1 |
| | | |||||
* | | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 5 | -25/+24 |
| | | |||||
* | | Move the functions for parsing app service config | Mark Haines | 2016-05-17 | 2 | -103/+109 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler | Mark Haines | 2016-05-17 | 5 | -25/+45 |
|\ \ | |||||
| * | | Merge pull request #786 from matrix-org/matthew/email_notifs_tuning | Matthew Hodgson | 2016-05-17 | 2 | -9/+30 |
| |\| | | | | | | | tune email notifs, fix CSS a bit, and add debugging details | ||||
| | * | tune email notifs, fix CSS a bit, and add debugging details | Matthew Hodgson | 2016-05-16 | 2 | -9/+30 |
| | | | |||||
| * | | Remove unused get_joined_rooms_for_user | Mark Haines | 2016-05-17 | 1 | -15/+0 |
| | | | |||||
| * | | Merge branch 'develop' into markjh/member_cleanup | Mark Haines | 2016-05-17 | 13 | -36/+63 |
| |\ \ | |||||
| | * \ | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler | Mark Haines | 2016-05-17 | 11 | -35/+48 |
| | |\ \ | | | | | | | | | | | Move the presence handler out of the Handlers object | ||||
| | * \ \ | Merge pull request #788 from matrix-org/markjh/domian | Mark Haines | 2016-05-17 | 6 | -19/+19 |
| | |\ \ \ | | | | | | | | | | | | | Spell "domain" correctly | ||||
| | * | | | | Fix emailpusher import | David Baker | 2016-05-16 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | Try importing at the root level rather than conditionally importing, as per comment | ||||
| | * | | | | os.environ requires a string | Erik Johnston | 2016-05-16 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #785 from matrix-org/erikj/cache_factor_synctly | Erik Johnston | 2016-05-16 | 1 | -0/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Make synctl read a cache factor from config file | ||||
| | | * | | | | Make synctl read a cache factor from config file | Erik Johnston | 2016-05-16 | 1 | -0/+4 |
| | | | |_|/ | | | |/| | | |||||
* | | | | | | Move SyncHandler out of the Handlers object | Mark Haines | 2016-05-16 | 4 | -9/+11 |
| | | | | | | |||||
* | | | | | | Merge branch 'markjh/liberate_presence_handler' into ↵ | Mark Haines | 2016-05-16 | 11 | -35/+48 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | markjh/liberate_sync_handler | ||||
| * | | | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ↵ | Mark Haines | 2016-05-16 | 1 | -19/+21 |
| | | | | | | | | | | | | | | | | | | | | from presence handler | ||||
| * | | | | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 11 | -17/+28 |
| |/ / / | |||||
* | | | | Remove get_joined_rooms_for_user from RoomMemberHandler | Mark Haines | 2016-05-16 | 3 | -11/+4 |
| | | | | |||||
* | | | | get_room_members is unused now | Mark Haines | 2016-05-16 | 1 | -18/+0 |
| | | | | |||||
* | | | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room | Mark Haines | 2016-05-16 | 3 | -67/+27 |
| |_|/ |/| | | |||||
* | | | Spell "domain" correctly | Mark Haines | 2016-05-16 | 6 | -19/+19 |
|/ / | | | | | | | s/domian/domain/g | ||||
* | | Clean up the blacklist/whitelist handling. | Mark Haines | 2016-05-16 | 3 | -41/+37 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'develop' into matthew/preview_url_ip_whitelist | Mark Haines | 2016-05-16 | 60 | -538/+2651 |
|\| | |||||
| * | fix matrix.to URLs | Matthew Hodgson | 2016-05-13 | 1 | -2/+2 |
| | | |||||
| * | Assert that stream replicated stream positions are ints | Mark Haines | 2016-05-13 | 3 | -7/+7 |
| | | |||||
| * | Manually expire broken caches like the who_forgot_in_room | Mark Haines | 2016-05-13 | 1 | -0/+16 |
| | | |||||
| * | Use the SlavedAccountDataStore | Mark Haines | 2016-05-13 | 1 | -10/+3 |
| | | |||||
| * | Merge branch 'develop' into dbkr/email_notifs_on_pusher | Mark Haines | 2016-05-13 | 14 | -21/+293 |
| |\ | |||||
| | * | Merge pull request #783 from matrix-org/markjh/slave_account_data | Mark Haines | 2016-05-13 | 1 | -0/+61 |
| | |\ | | | | | | | | | Add a slaved datastore for account data | ||||
| | | * | Add a slaved datastore for account data | Mark Haines | 2016-05-13 | 1 | -0/+61 |
| | | | | |||||
| | * | | Allow receipts for events we haven't seen in the db | Mark Haines | 2016-05-13 | 1 | -4/+6 |
| | | | | |||||
| | * | | Merge pull request #741 from negzi/create_user_with_expiry | Erik Johnston | 2016-05-13 | 6 | -3/+139 |
| | |\ \ | | | | | | | | | | | Create user with expiry | ||||
| | | * | | Create user with expiry | Negi Fazeli | 2016-05-13 | 6 | -3/+139 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> | ||||
| | * | | | Merge pull request #778 from matrix-org/erikj/add_pusher | Erik Johnston | 2016-05-13 | 2 | -4/+17 |
| | |\ \ \ | | | | | | | | | | | | | Fixup add_pusher | ||||
| | | * | | | Spelling | Erik Johnston | 2016-05-13 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Fixup add_pusher | Erik Johnston | 2016-05-13 | 2 | -4/+17 |
| | | | | | | |||||
| | * | | | | Merge pull request #769 from matrix-org/erikj/push_actions_delete | Erik Johnston | 2016-05-13 | 2 | -9/+29 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Delete old pushers | ||||
| | | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-05-06 | 14 | -49/+423 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/push_actions_delete | ||||
| | | * | | | | | Delete old pushers | Erik Johnston | 2016-05-03 | 2 | -9/+29 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #779 from matrix-org/erikj/receipts | Erik Johnston | 2016-05-13 | 1 | -3/+3 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use tree cache for get_linearized_receipts_for_room | ||||
| | | * | | | | | | Use tree cache for get_linearized_receipts_for_room | Erik Johnston | 2016-05-13 | 1 | -3/+3 |
| | | | |_|/ / / | | | |/| | | | | |||||
| | * | | | | | | Remove topics table | Erik Johnston | 2016-05-13 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Annotate the removed indicies with why they were removed. | Mark Haines | 2016-05-13 | 1 | -18/+15 |
| | | | | | | | | |||||
| | * | | | | | | Remove unused indices | Erik Johnston | 2016-05-13 | 1 | -0/+42 |
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This includes removing both unused indices and indices that are subsets of other indices. | ||||
| | * | | | | | Merge pull request #781 from matrix-org/markjh/replication_problems | Mark Haines | 2016-05-13 | 2 | -1/+3 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Fix a bug in replication that was causing the pusher to tight loop | ||||
| | | * | | | | | Log the stream IDs in an order that makes sense | Mark Haines | 2016-05-13 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Make sure we advance our stream position | Mark Haines | 2016-05-13 | 1 | -0/+2 |
| | | |/ / / / | |||||
| * | | | | | | Shift some of the state_group methods into the SlavedEventStore | Mark Haines | 2016-05-13 | 2 | -45/+19 |
| | | | | | | | |||||
| * | | | | | | Make email notifs work on the pusher synapse | David Baker | 2016-05-13 | 2 | -0/+48 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Plus general bugfix to email notif code | ||||
| * | | | | | missed a spot | Mark Haines | 2016-05-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | move filter_events_for_client out of base handler | Mark Haines | 2016-05-11 | 10 | -214/+251 |
| |/ / / / | |||||
| * | | | | Shuffle when we get the signing_key attribute. | Mark Haines | 2016-05-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait until we sign a message to get the signing key from the homeserver config. This means that the message handler can be created without having a signing key in the config which means that separate processes like the pusher that don't send messages and don't need to sign them can still access the handlers. | ||||
| * | | | | Merge pull request #775 from matrix-org/erikj/password_hash | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
| |\ \ \ \ | | | | | | | | | | | | | Correctly handle NULL password hashes from the database | ||||
| | * | | | | Correctly handle NULL password hashes from the database | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
| | | |_|/ | | |/| | | |||||
| * | | | | Fix typo | Mark Haines | 2016-05-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 4 | -204/+214 |
| |/ / / | |||||
| * | | | Pass through _get_state_group_for_events | David Baker | 2016-05-10 | 1 | -0/+4 |
| | | | | |||||
| * | | | StateStore, not EventsStore | David Baker | 2016-05-10 | 1 | -2/+2 |
| | | | | |||||
| * | | | Cached functions must be accessed through the dict | David Baker | 2016-05-10 | 1 | -1/+2 |
| | | | | |||||
| * | | | Pass though _get_state_group_for_events | David Baker | 2016-05-10 | 1 | -0/+4 |
| | | | | |||||
| * | | | Pass through get_state_groups | David Baker | 2016-05-10 | 1 | -0/+4 |
| | | | | |||||
| * | | | Also pass through get_profile_displayname | David Baker | 2016-05-10 | 1 | -0/+4 |
| | | | | |||||
| * | | | Uncommit accidentally commited edit to cipher list | David Baker | 2016-05-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Pass through get_events to pusher too | David Baker | 2016-05-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | Pass through _get_event_txn | David Baker | 2016-05-10 | 2 | -1/+2 |
| | | | | |||||
| * | | | unbreak schema | Matrix | 2016-05-10 | 2 | -0/+0 |
| | | | | |||||
| * | | | Merge pull request #759 from matrix-org/dbkr/email_notifs | Matthew Hodgson | 2016-05-10 | 22 | -34/+1170 |
| |\ \ \ | | | | | | | | | | | Send email notifications for missed messages | ||||
| | * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 22 | -88/+609 |
| | |\ \ \ | |||||
| | * | | | | More consistent config naming | David Baker | 2016-05-10 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Add config option to not send email notifs for new users | David Baker | 2016-05-10 | 2 | -1/+8 |
| | | | | | | |||||
| | * | | | | Make pep8 happy | David Baker | 2016-05-10 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Switch from CSS to Table layout for HTML mails so they work in Outlook ↵ | Matthew Hodgson | 2016-05-10 | 1 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aka Word Remove templates-vector and theme templates with variables instead Switch to matrix.to URLs by default for links | ||||
| | * | | | | better mail subject lines | Matthew Hodgson | 2016-05-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | fix layout; handle app naming in synapse, not jinja | Matthew Hodgson | 2016-05-05 | 2 | -16/+36 |
| | | | | | | |||||
| | * | | | | pep8 | Matthew Hodgson | 2016-05-05 | 1 | -2/+4 |
| | | | | | | |||||
| | * | | | | handle fragments correctly on mxc URLs. | Matthew Hodgson | 2016-05-05 | 1 | -14/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch to vector.im permalinks as matrix.to isn't ready yet. merge overlapping notifications together. give one message of context after a notification (in the unlikely event it exists, but it's possible thanks to throttling). include name of app in mail templates | ||||
| | * | | | | spell out emailpusher full path | Matthew Hodgson | 2016-05-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Include no context | David Baker | 2016-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | until we can de-dup between the context and other notifs | ||||
| | * | | | | Add date header & message id | David Baker | 2016-05-04 | 2 | -1/+4 |
| | | | | | | |||||
| | * | | | | Correct SQL statement for postgres | David Baker | 2016-05-04 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | In standard sql, join binds tighter than comma, so we were joining on the wrong table. Postgres follows the standard (apparently). | ||||
| | * | | | | Add db functions used for email to the pusher app | David Baker | 2016-05-04 | 1 | -0/+12 |
| | | | | | | |||||
| | * | | | | pep8 | David Baker | 2016-05-04 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | copyright | Matthew Hodgson | 2016-05-04 | 1 | -0/+22 |
| | | | | | | |||||
| | * | | | | fix assorted typos in default config | Matthew Hodgson | 2016-05-04 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Unused import | David Baker | 2016-05-04 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Catch all exceptions when creating a pusher | David Baker | 2016-05-04 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -0/+1 |
| | |\ \ \ \ | |||||
| | * | | | | | Add constant for throttle multiplier | David Baker | 2016-04-29 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Remove unused function | David Baker | 2016-04-29 | 2 | -26/+0 |
| | | | | | | | |||||
| | * | | | | | Remove unused arg | David Baker | 2016-04-29 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Docstring | David Baker | 2016-04-29 | 1 | -0/+14 |
| | | | | | | | |||||
| | * | | | | | Use explicit join | David Baker | 2016-04-29 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Oops, actually specify the user id | David Baker | 2016-04-29 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Remove unnecessary if | David Baker | 2016-04-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Put spaces at start of line | David Baker | 2016-04-29 | 1 | -16/+16 |
| | | | | | | | |||||
| | * | | | | | Try imports in config | David Baker | 2016-04-29 | 1 | -0/+7 |
| | | | | | | | |||||
| | * | | | | | Use the constant | David Baker | 2016-04-29 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Avoid `vars` builtin | David Baker | 2016-04-29 | 1 | -15/+15 |
| | | | | | | | |||||
| | * | | | | | Use named parameter format | David Baker | 2016-04-29 | 1 | -14/+22 |
| | | | | | | | |||||
| | * | | | | | Default enable email notifs to False | David Baker | 2016-04-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | pep8 | David Baker | 2016-04-29 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Remove rather pointless get function | David Baker | 2016-04-29 | 1 | -9/+1 |
| | | | | | | | |||||
| | * | | | | | Stop processing notifs once we've sent a mail | David Baker | 2016-04-29 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Correct public_baseurl default | David Baker | 2016-04-29 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Nicer get() shorthand | David Baker | 2016-04-29 | 1 | -3/+2 |
| | | | | | | | |||||
| | * | | | | | Remove redundant docstring | David Baker | 2016-04-29 | 1 | -4/+0 |
| | | | | | | | |||||
| | * | | | | | Correct default template and add text template | David Baker | 2016-04-29 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Send mail notifs with a plaintext part too | David Baker | 2016-04-29 | 2 | -7/+22 |
| | | | | | | | |||||
| | * | | | | | Add an email pusher for new users | David Baker | 2016-04-29 | 2 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | If they registered with an email address and email notifs are enabled on the HS | ||||
| | * | | | | | pep8 newline | David Baker | 2016-04-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 35 | -323/+1188 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | May as well always include room link | David Baker | 2016-04-28 | 1 | -4/+3 |
| | | | | | | | |||||
| | * | | | | | Put back real delay before mailing | David Baker | 2016-04-28 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Support file messages & fix plain text | David Baker | 2016-04-28 | 1 | -2/+3 |
| | | | | | | | |||||
| | * | | | | | Support image notifs | David Baker | 2016-04-28 | 1 | -11/+25 |
| | | | | | | | |||||
| | * | | | | | pep8 | David Baker | 2016-04-28 | 2 | -3/+6 |
| | | | | | | | |||||
| | * | | | | | Only import email pusher if email notifs are on | David Baker | 2016-04-28 | 1 | -6/+8 |
| | | | | | | | |||||
| | * | | | | | Handle room invites in email notifs | David Baker | 2016-04-28 | 2 | -8/+33 |
| | | | | | | | |||||
| | * | | | | | Linkify plain text messages too | David Baker | 2016-04-28 | 1 | -1/+12 |
| | | | | | | | |||||
| | * | | | | | Run filter_events_for_client | David Baker | 2016-04-27 | 7 | -20/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | so we don't accidentally mail out events people shouldn't see | ||||
| | * | | | | | Make html messages work | David Baker | 2016-04-27 | 1 | -10/+21 |
| | | | | | | | |||||
| | * | | | | | Better grammar for multiple messages in a room | David Baker | 2016-04-27 | 2 | -10/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Say who the messages are from if there's no room name, otherwise it's a bit nonsensical | ||||
| | * | | | | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 4 | -23/+161 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails | ||||
| | * | | | | | More variable calculation for email notifs | David Baker | 2016-04-25 | 2 | -18/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include name of the person we're sending to and add summary text at the top giving an overview of what's happened. | ||||
| | * | | | | | Typo | David Baker | 2016-04-25 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | No we don't: it's just the display name | David Baker | 2016-04-22 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Actually do UTF8 correctly | David Baker | 2016-04-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Sort member events | David Baker | 2016-04-22 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | So names of people in a room are given in order | ||||
| | * | | | | | Mime part is binary so encode it first. | David Baker | 2016-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doesn't get character enocind right yet but makes it not error. | ||||
| | * | | | | | Implement group-of-people names | David Baker | 2016-04-22 | 1 | -17/+14 |
| | | | | | | | |||||
| | * | | | | | No inlineCallbacks necessary on this | David Baker | 2016-04-22 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Flesh out email templating | David Baker | 2016-04-21 | 4 | -4/+208 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients. | ||||
| | * | | | | | Generate mails from a template | David Baker | 2016-04-20 | 4 | -31/+49 |
| | | | | | | | |||||
| | * | | | | | more pep8 | David Baker | 2016-04-20 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Send a rather basic email notif | David Baker | 2016-04-20 | 6 | -12/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also pep8 fixes | ||||
| | * | | | | | Add single instance & logging stuff | David Baker | 2016-04-19 | 1 | -8/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the stuff over from http pusher that prevents multiple instances of process running at once and sets up logging and measure blocks. | ||||
| | * | | | | | First bits of emailpusher | David Baker | 2016-04-19 | 7 | -8/+335 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly logic of when to send an email | ||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 6 | -28/+23 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge pull request #773 from matrix-org/erikj/get_domian_from_id | Erik Johnston | 2016-05-09 | 6 | -28/+23 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add and use get_domain_from_id | ||||
| | | * | | | | | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 6 | -28/+23 |
| | | | |_|_|/ | | | |/| | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 13 | -58/+479 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #764 from matrix-org/erikj/replication_logging | Erik Johnston | 2016-05-09 | 1 | -0/+9 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add some log information at returned replication streams | ||||
| | | * | | | | | Don't warn | Erik Johnston | 2016-05-05 | 1 | -2/+0 |
| | | | | | | | | |||||
| | | * | | | | | Add some log information at returned replication streams | Erik Johnston | 2016-05-05 | 1 | -0/+11 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #772 from matrix-org/erikj/get_user_cache | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add cache to get_user_by_id | ||||
| | | * | | | | | | Add cache to get_user_by_id | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Merge pull request #770 from matrix-org/erikj/transaction_reactor | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Run transaction queue on reactor | ||||
| | | * | | | | | | Run transaction queue on reactor | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that any CPU work that happens doesn't block message sending. | ||||
| | * | | | | | | Remove unused import | Erik Johnston | 2016-05-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Pull loop one level up | Erik Johnston | 2016-05-06 | 1 | -36/+41 |
| | | | | | | | | |||||
| | * | | | | | | Queue events for persistence | Erik Johnston | 2016-05-06 | 1 | -11/+144 |
| | |/ / / / / | |||||
| | * | | | | | Pull prev txn from in memory | Erik Johnston | 2016-05-06 | 1 | -5/+13 |
| | | | | | | | |||||
| | * | | | | | Don't needlessly enter transaction | Erik Johnston | 2016-05-06 | 1 | -9/+9 |
| | | | | | | | |||||
| | * | | | | | Reduce database inserts when sending transactions | Erik Johnston | 2016-05-06 | 2 | -45/+114 |
| | | | | | | | |||||
| | * | | | | | Rename openid/token to openid/request_token | Mark Haines | 2016-05-05 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Add an openidish mechanism for proving to third parties that you own a given ↵ | Mark Haines | 2016-05-05 | 7 | -2/+193 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | user_id | ||||
| * | | | | | Add bulk fetch storage API | Erik Johnston | 2016-05-05 | 3 | -11/+26 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-04 | 7 | -2/+107 |
| |\| | | | | |||||
| | * | | | | Merge pull request #762 from matrix-org/erikj/report_event | Erik Johnston | 2016-05-04 | 6 | -1/+106 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Add /report endpoint | ||||
| | | * | | | | Add primary key | Erik Johnston | 2016-05-04 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 4 | -1/+10 |
| | | | | | | | |||||
| | | * | | | | Move event_id to path | Erik Johnston | 2016-05-04 | 1 | -4/+2 |
| | | | | | | | |||||
| | | * | | | | Add /report endpoint | Erik Johnston | 2016-05-04 | 5 | -1/+99 |
| | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge pull request #757 from matrix-org/erikj/event_auth_typo | Erik Johnston | 2016-05-03 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | Fix typo in event_auth servlet path | ||||
| | | * | | | Fix typo in event_auth servlet path | Erik Johnston | 2016-04-29 | 1 | -1/+1 |
| | | | |/ | | | |/| | |||||
| * | / | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 4 | -9/+78 |
| |/ / / | |||||
* / / / | add a url_preview_ip_range_whitelist config param so we can whitelist the ↵ | Matthew Hodgson | 2016-05-01 | 3 | -7/+27 |
|/ / / | | | | | | | | | | matrix.org IP space | ||||
* / / | Fix password reset | David Baker | 2016-04-29 | 1 | -0/+1 |
|/ / | | | | | | | Default requester to None, otherwise it isn't defined when resetting using email auth |