| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #828 from matrix-org/erikj/joined_hosts_for_room | Erik Johnston | 2016-06-03 | 1 | -16/+3 |
|\ |
|
| * | Make get_joined_hosts_for_room use get_users_in_room | Erik Johnston | 2016-06-03 | 1 | -16/+3 |
* | | Merge pull request #827 from matrix-org/markjh/more_slaved_methods | Mark Haines | 2016-06-03 | 3 | -6/+81 |
|\ \ |
|
| * | | Add methods to events, account data and receipt slaves | Mark Haines | 2016-06-03 | 3 | -6/+81 |
* | | | Merge pull request #825 from matrix-org/erikj/cache_push_rules | Erik Johnston | 2016-06-03 | 6 | -52/+71 |
|\ \ \ |
|
| * | | | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 5 | -44/+63 |
| * | | | Remove unnecessary sets | Erik Johnston | 2016-06-03 | 1 | -6/+3 |
| * | | | Only get local users | Erik Johnston | 2016-06-03 | 2 | -3/+6 |
| | |/
| |/| |
|
* | | | Merge pull request #824 from matrix-org/markjh/slaved_presence_store | Mark Haines | 2016-06-03 | 2 | -3/+62 |
|\ \ \ |
|
| * | | | Add a slaved store for presence | Mark Haines | 2016-06-03 | 2 | -3/+62 |
| | |/
| |/| |
|
* | | | Merge pull request #823 from matrix-org/markjh/more_slaved_stores | Mark Haines | 2016-06-03 | 4 | -0/+152 |
|\ \ \
| |_|/
|/| | |
|
| * | | Add a comment explaining why the filter cache doesn't need exipiring | Mark Haines | 2016-06-03 | 1 | -0/+1 |
| * | | Add slaved stores for filters, tokens, and push rules | Mark Haines | 2016-06-03 | 4 | -0/+151 |
| |/ |
|
* | | 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 | 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 | 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 |
|\ \ |
|
| * | | 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 |
| * | | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ... | David Baker | 2016-06-02 | 3 | -31/+39 |
| |\ \ |
|
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 9 | -563/+813 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 14 | -35/+44 |
| |\ \ \ \ |
|
| * | | | | | Email unsubscribing that may in theory, work | David Baker | 2016-06-02 | 3 | -6/+22 |
| * | | | | | 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 | 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 | 2 | -30/+38 |
| |_|/ /
|/| | | |
|
* | | | | 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 | 4 | -22/+174 |
* | | | | Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler | David Baker | 2016-06-02 | 10 | -24/+23 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Split out the auth handler | David Baker | 2016-06-02 | 10 | -24/+23 |
* | | | | 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 |
|\ \ \ \ |
|
| * | | | | 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, otherwise... | Matthew Hodgson | 2016-06-01 | 1 | -0/+18 |
* | | | | | | if an email pusher specifies a brand param, use it | Matthew Hodgson | 2016-06-02 | 2 | -3/+8 |
| |_|/ / /
|/| | | | |
|
* | | | | | Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none | David Baker | 2016-06-02 | 1 | -0/+2 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | 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 |
|\ \ \ \ |
|
| * | | | | 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 | Erik Johnston | 2016-05-31 | 1 | -9/+16 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge pull request #813 from matrix-org/dbkr/fix_room_list_spidering | Erik Johnston | 2016-06-01 | 1 | -1/+1 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | 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 | 7 | -3/+153 |
|\ \ \ \ |
|
| * | | | | Inject fake room list handler in tests | David Baker | 2016-06-01 | 1 | -0/+2 |
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider | David Baker | 2016-06-01 | 12 | -53/+71 |
| |\ \ \ \ |
|
| * | | | | | pep8 | David Baker | 2016-06-01 | 1 | -1/+3 |
| * | | | | | Add cache to remote room lists | David Baker | 2016-05-31 | 1 | -4/+30 |
| * | | | | | Add vector.im to default secondary_directory_servers and add comment explaini... | David Baker | 2016-05-31 | 1 | -0/+4 |
| * | | | | | 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 |
* | | | | | | Merge pull request #810 from matrix-org/dbkr/limit_email_notifs | David Baker | 2016-06-01 | 1 | -2/+4 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Limit number of notifications in an email notification | David Baker | 2016-06-01 | 1 | -2/+4 |
|/ / / / / |
|
* | | | | | handle emotes & notices correctly in email notifs | Matthew Hodgson | 2016-05-31 | 2 | -2/+10 |
* | | | | | 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 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* | Erik Johnston | 2016-05-31 | 2 | -9/+15 |
* | | | | Merge pull request #803 from matrix-org/markjh/liberate_appservice_handler | Mark Haines | 2016-05-31 | 7 | -38/+36 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Move the AS handler out of the Handlers object. | Mark Haines | 2016-05-31 | 7 | -38/+36 |
|/ / / |
|
* | | | Merge pull request #802 from matrix-org/dbkr/split_room_list_handler | David Baker | 2016-05-31 | 3 | -3/+7 |
|\ \ \ |
|
| * | | | Split out the room list handler | David Baker | 2016-05-31 | 3 | -3/+7 |
|/ / / |
|
* | | | 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 |
|\ \ \
| |/ /
|/| | |
|
| * | | 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 |
| * | | 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 |
* | | tweak mail notifs | Matrix | 2016-05-24 | 1 | -6/+8 |
* | | Merge pull request #799 from matrix-org/matthew/quieter-email-notifs | David Baker | 2016-05-24 | 5 | -25/+79 |
|\ \ |
|
| * | | 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 |
| * | | fix debug text | Matthew Hodgson | 2016-05-23 | 2 | -2/+7 |
| * | | 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 |
* | | | Merge pull request #798 from negzi/bugfix_create_user_feature | Erik Johnston | 2016-05-24 | 2 | -13/+30 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix set profile error with Requester. | Negi Fazeli | 2016-05-23 | 2 | -13/+30 |
|/ / |
|
* / | Fix link to A-S spec | Richard van der Hoff | 2016-05-23 | 1 | -2/+1 |
|/ |
|
* | Merge pull request #794 from matrix-org/kegan/join-with-server-name | Kegsay | 2016-05-19 | 1 | -1/+4 |
|\ |
|
| * | Allow clients to specify a server_name to avoid 'No known servers' | Kegan Dougal | 2016-05-19 | 1 | -1/+4 |
|/ |
|
* | 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 | Matthew Hodgson | 2016-05-18 | 1 | -1/+3 |
* | | Add desc to get_presence_for_users | Erik Johnston | 2016-05-18 | 1 | -0/+1 |
* | | Merge pull request #792 from matrix-org/markjh/liberate_typing_handler | Mark Haines | 2016-05-17 | 8 | -36/+27 |
|\ \ |
|
| * | | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 8 | -36/+27 |
|/ / |
|
* | | Merge pull request #791 from matrix-org/markjh/app_service_config | Mark Haines | 2016-05-17 | 2 | -103/+109 |
|\ \ |
|
| * | | Move the functions for parsing app service config | Mark Haines | 2016-05-17 | 2 | -103/+109 |
|/ / |
|
* | | Merge pull request #790 from matrix-org/markjh/liberate_sync_handler | Mark Haines | 2016-05-17 | 4 | -9/+11 |
|\ \ |
|
| * \ | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler | Mark Haines | 2016-05-17 | 7 | -25/+61 |
| |\ \
| |/ /
|/| | |
|
* | | | Merge pull request #786 from matrix-org/matthew/email_notifs_tuning | Matthew Hodgson | 2016-05-17 | 4 | -9/+46 |
|\ \ \
| | |/
| |/| |
|
| * | | tweak text | Matthew Hodgson | 2016-05-16 | 1 | -2/+2 |
| * | | tune email notifs, fix CSS a bit, and add debugging details | Matthew Hodgson | 2016-05-16 | 4 | -9/+46 |
* | | | Merge pull request #789 from matrix-org/markjh/member_cleanup | Mark Haines | 2016-05-17 | 8 | -174/+37 |
|\ \ \ |
|
| * | | | 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 | 14 | -37/+64 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler | Mark Haines | 2016-05-17 | 12 | -36/+49 |
|\ \ \ \ |
|
* \ \ \ \ | Merge pull request #788 from matrix-org/markjh/domian | Mark Haines | 2016-05-17 | 6 | -19/+19 |
|\ \ \ \ \ |
|
* | | | | | | Fix emailpusher import | David Baker | 2016-05-16 | 1 | -1/+11 |
* | | | | | | 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 | 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 markjh/liberate_sync_han... | Mark Haines | 2016-05-16 | 12 | -36/+49 |
| | | | | |/|
| | | | |/|/
| | | | |/|
| | | |/| | |
|
| | | * | | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ... | Mark Haines | 2016-05-16 | 1 | -19/+21 |
| | | * | | | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 12 | -18/+29 |
| |_|/ / /
|/| | | | |
|
| | | * | | 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 | 2 | -36/+0 |
| | | * | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room | Mark Haines | 2016-05-16 | 5 | -112/+33 |
| | |/ / |
|
| | * / | Spell "domain" correctly | Mark Haines | 2016-05-16 | 6 | -19/+19 |
| |/ /
|/| | |
|
* | | | Merge pull request #760 from matrix-org/matthew/preview_url_ip_whitelist | Matthew Hodgson | 2016-05-16 | 4 | -42/+58 |
|\ \ \
| |/ /
|/| | |
|
| * | | Clean up the blacklist/whitelist handling. | Mark Haines | 2016-05-16 | 3 | -41/+37 |
| * | | Merge branch 'develop' into matthew/preview_url_ip_whitelist | Mark Haines | 2016-05-16 | 75 | -544/+3178 |
| |\ \
| |/ /
|/| | |
|
* | | | fix logo | Matrix | 2016-05-13 | 1 | -1/+1 |
| |/
|/| |
|
* | | rogue img | Matthew Hodgson | 2016-05-13 | 1 | -1/+0 |
* | | 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 |
* | | Merge pull request #780 from matrix-org/dbkr/email_notifs_on_pusher | Mark Haines | 2016-05-13 | 3 | -12/+43 |
|\ \ |
|
| * | | 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 | 19 | -27/+511 |
| |\ \
| |/ /
|/| | |
|
* | | | Merge pull request #783 from matrix-org/markjh/slave_account_data | Mark Haines | 2016-05-13 | 2 | -0/+117 |
|\ \ \ |
|
| * | | | Add a slaved datastore for account data | Mark Haines | 2016-05-13 | 2 | -0/+117 |
* | | | | Merge pull request #784 from matrix-org/markjh/receipts_fix | Mark Haines | 2016-05-13 | 1 | -4/+6 |
|\ \ \ \ |
|
| * | | | | 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 | 10 | -9/+301 |
|\ \ \ \ |
|
| * | | | | Create user with expiry | Negi Fazeli | 2016-05-13 | 10 | -9/+301 |
* | | | | | Merge pull request #778 from matrix-org/erikj/add_pusher | Erik Johnston | 2016-05-13 | 2 | -4/+17 |
|\ \ \ \ \ |
|
| * | | | | | 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 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actio... | Erik Johnston | 2016-05-06 | 15 | -49/+433 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | 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 | Erik Johnston | 2016-05-13 | 1 | -3/+3 |
| | |_|/ / / / /
| |/| | | | | | |
|
* | | | | | | | | Merge pull request #782 from matrix-org/erikj/remove_indices | Erik Johnston | 2016-05-13 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \
| |_|_|_|_|/ / /
|/| | | | | | | |
|
| * | | | | | | | 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 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #781 from matrix-org/markjh/replication_problems | Mark Haines | 2016-05-13 | 2 | -1/+3 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | 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 |
| |_|_|_|/ /
|/| | | | | |
|
* | | | | | | Merge pull request #777 from matrix-org/markjh/move_filter_for_client | Mark Haines | 2016-05-13 | 11 | -215/+252 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | 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 |
|/ / / / / |
|
* | | | | | Merge pull request #776 from matrix-org/markjh/lazy_signing_key | Mark Haines | 2016-05-11 | 1 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | Shuffle when we get the signing_key attribute. | Mark Haines | 2016-05-11 | 1 | -2/+2 |
|/ / / / / |
|
* | | | | | 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 | Erik Johnston | 2016-05-11 | 1 | -1/+4 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge pull request #774 from matrix-org/markjh/shuffle_base_handler | Mark Haines | 2016-05-11 | 4 | -204/+214 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | 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 | 31 | -34/+1470 |
|\ \ \ \ |
|
| * \ \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 23 | -88/+619 |
| |\ \ \ \ |
|
| * | | | | | 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 ak... | Matthew Hodgson | 2016-05-10 | 13 | -302/+240 |
| * | | | | | Switch from CSS to Table layout for HTML mails so they work in Outlook aka Word | Matthew Hodgson | 2016-05-09 | 1 | -0/+7 |
| * | | | | | 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 | 7 | -22/+45 |
| * | | | | | fix app branding | Matthew Hodgson | 2016-05-05 | 3 | -3/+3 |
| * | | | | | pep8 | Matthew Hodgson | 2016-05-05 | 1 | -2/+4 |
| * | | | | | fix room.txt | Matthew Hodgson | 2016-05-05 | 1 | -4/+7 |
| * | | | | | First cut at Vector-branded mail templates | Matthew Hodgson | 2016-05-05 | 7 | -0/+229 |
| * | | | | | handle fragments correctly on mxc URLs. | Matthew Hodgson | 2016-05-05 | 1 | -14/+45 |
| * | | | | | spell out emailpusher full path | Matthew Hodgson | 2016-05-05 | 1 | -1/+1 |
| * | | | | | Include no context | David Baker | 2016-05-04 | 1 | -1/+1 |
| * | | | | | 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 |
| * | | | | | 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 |
| * | | | | | | Include res in the manifest | David Baker | 2016-04-29 | 1 | -0/+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 | 5 | -7/+50 |
| * | | | | | | Add an email pusher for new users | David Baker | 2016-04-29 | 2 | -0/+27 |
| * | | | | | | 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 | 42 | -454/+1371 |
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| * | | | | | | Remove vector specific style | David Baker | 2016-04-28 | 1 | -14/+0 |
| * | | | | | | Some basic css to make it halfway legible | David Baker | 2016-04-28 | 3 | -16/+58 |
| * | | | | | | Fix notification link | David Baker | 2016-04-28 | 1 | -1/+1 |
| * | | | | | | 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 | 2 | -7/+6 |
| * | | | | | | Support image notifs | David Baker | 2016-04-28 | 2 | -15/+33 |
| * | | | | | | 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 | 3 | -13/+42 |
| * | | | | | | Add the jinja template for individual notifs | David Baker | 2016-04-28 | 1 | -0/+32 |
| * | | | | | | 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 |
| * | | | | | | Make html messages work | David Baker | 2016-04-27 | 1 | -10/+21 |