Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1049 from matrix-org/erikj/presence_users_in_room | Erik Johnston | 2016-08-30 | 2 | -10/+2 |
|\ | |||||
| * | Use state handler instead of get_users_in_room/get_joined_hosts | Erik Johnston | 2016-08-26 | 2 | -10/+2 |
* | | Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device | Mark Haines | 2016-08-26 | 3 | -32/+173 |
|\| | |||||
| * | Add is_host_joined to slave storage | Erik Johnston | 2016-08-26 | 1 | -3/+4 |
| * | Cache check_host_in_room | Erik Johnston | 2016-08-26 | 1 | -0/+35 |
| * | Make sync not pull out full state | Erik Johnston | 2016-08-25 | 1 | -0/+33 |
| * | Add desc | Erik Johnston | 2016-08-25 | 1 | -1/+2 |
| * | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 3 | -16/+66 |
| * | Pull out event ids rather than full events for state | Erik Johnston | 2016-08-25 | 1 | -17/+38 |
* | | Merge branch 'develop' into markjh/direct_to_device | Mark Haines | 2016-08-25 | 2 | -9/+13 |
|\| | |||||
| * | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 2 | -9/+13 |
* | | Fix the deduplication of incoming direct-to-device messages | Mark Haines | 2016-08-25 | 1 | -0/+4 |
* | | Add store-and-forward direct-to-device messaging | Mark Haines | 2016-08-25 | 3 | -0/+165 |
|/ | |||||
* | Merge pull request #1038 from matrix-org/erikj/receved_txn_purge | Erik Johnston | 2016-08-23 | 2 | -4/+45 |
|\ | |||||
| * | Delete old received_transactions | Erik Johnston | 2016-08-22 | 2 | -4/+45 |
* | | Merge pull request #1028 from matrix-org/dbkr/notifications_api | Erik Johnston | 2016-08-22 | 2 | -0/+55 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'develop' into dbkr/notifications_api | Matthew Hodgson | 2016-08-20 | 8 | -11/+70 |
| |\ | |||||
| * | | Explicit join | David Baker | 2016-08-18 | 1 | -2/+2 |
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-18 | 12 | -164/+382 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-11 | 38 | -657/+1984 |
| |\ \ \ | |||||
| * | | | | Include the ts the notif was received at | David Baker | 2016-05-24 | 1 | -5/+7 |
| * | | | | Add GET /notifications API | David Baker | 2016-05-23 | 2 | -0/+53 |
* | | | | | Merge pull request #1031 from matrix-org/erikj/measure_notifier | Erik Johnston | 2016-08-22 | 1 | -40/+42 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Move defer.returnValue out of Measure | Erik Johnston | 2016-08-19 | 1 | -1/+1 |
| * | | | | Measure _get_event_from_row | Erik Johnston | 2016-08-19 | 1 | -41/+43 |
* | | | | | Merge pull request #1030 from matrix-org/erikj/cache_contexts | Erik Johnston | 2016-08-19 | 7 | -9/+65 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Rename to on_invalidate | Erik Johnston | 2016-08-19 | 1 | -3/+3 |
| * | | | | Make cache_context an explicit option | Erik Johnston | 2016-08-19 | 1 | -1/+1 |
| * | | | | Move _bulk_get_push_rules_for_room to storage layer | Erik Johnston | 2016-08-19 | 1 | -0/+56 |
| * | | | | Remove lru option | Erik Johnston | 2016-08-19 | 7 | -9/+9 |
| | |_|/ | |/| | | |||||
* / | | | Make get_new_events_for_appservice use indices | Erik Johnston | 2016-08-19 | 1 | -2/+5 |
|/ / / | |||||
* | | | Add appservice worker | Erik Johnston | 2016-08-18 | 2 | -85/+93 |
* | | | Make AppserviceHandler stream events from database | Erik Johnston | 2016-08-18 | 2 | -0/+62 |
* | | | Fix push_display_name_rename schema update | Erik Johnston | 2016-08-17 | 1 | -0/+3 |
* | | | Merge pull request #1011 from matrix-org/dbkr/contains_display_name_override | David Baker | 2016-08-17 | 1 | -0/+17 |
|\ \ \ | |||||
| * | | | Add migration script | David Baker | 2016-08-16 | 1 | -0/+17 |
* | | | | Do it in storage function | Erik Johnston | 2016-08-16 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #1010 from matrix-org/erikj/refactor_deletions | Erik Johnston | 2016-08-16 | 2 | -38/+33 |
|\ \ \ | |||||
| * | | | Use cached get_user_by_access_token in slaves | Erik Johnston | 2016-08-16 | 1 | -0/+1 |
| * | | | Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to sl... | Erik Johnston | 2016-08-15 | 1 | -38/+32 |
* | | | | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ... | Erik Johnston | 2016-08-16 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add missing database corruption recovery case | Benjamin Saunders | 2016-08-14 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Doc get_next() context manager usage | Erik Johnston | 2016-08-15 | 1 | -0/+4 |
* | | | Rename table. Add docs. | Erik Johnston | 2016-08-15 | 3 | -5/+15 |
* | | | Implement cache replication stream | Erik Johnston | 2016-08-15 | 2 | -15/+43 |
* | | | Add some invalidations to a cache_stream | Erik Johnston | 2016-08-15 | 7 | -31/+117 |
* | | | Always run txn.after_callbacks | Erik Johnston | 2016-08-15 | 1 | -7/+8 |
|/ / | |||||
* | | Raise 404 when couldn't find event | Erik Johnston | 2016-08-05 | 1 | -1/+1 |
* | | Delete more tables | Erik Johnston | 2016-08-05 | 1 | -0/+5 |
* | | Tweak integrity error recovery to work as intended | Benjamin Saunders | 2016-08-04 | 1 | -0/+3 |
* | | Fix typo | Erik Johnston | 2016-08-04 | 1 | -3/+4 |
* | | Retry event persistence on IntegrityError | Erik Johnston | 2016-08-04 | 1 | -4/+65 |
* | | PEP8 | Richard van der Hoff | 2016-08-03 | 1 | -10/+10 |
* | | Include device name in /keys/query response | Richard van der Hoff | 2016-08-03 | 1 | -17/+43 |
* | | Merge branch 'rav/null_default_device_displayname' into develop | Richard van der Hoff | 2016-08-03 | 2 | -1/+21 |
|\ \ | |||||
| * | | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 2 | -1/+21 |
* | | | Remove other bit of deduplication | Erik Johnston | 2016-08-03 | 1 | -19/+0 |
* | | | Ensure we only persist an event once at a time | Erik Johnston | 2016-08-03 | 1 | -1/+18 |
|/ / | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 12 | -120/+552 |
|\ \ | |||||
| * | | Fix SQL to supply arguments in the same order | Mark Haines | 2016-07-29 | 1 | -1/+1 |
| * | | Create separate methods for getting messages to push | Mark Haines | 2016-07-28 | 1 | -45/+154 |
| * | | Comment get_unread_push_actions_for_user_in_range function | Kegan Dougal | 2016-07-28 | 1 | -2/+26 |
| * | | Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload | Richard van der Hoff | 2016-07-27 | 2 | -0/+34 |
| |\ \ | |||||
| | * | | SQL syntax fix | Richard van der Hoff | 2016-07-27 | 1 | -1/+1 |
| | * | | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 1 | -0/+15 |
| | * | | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 1 | -0/+19 |
| * | | | Fix a couple of bugs in the transaction and keyring code | Mark Haines | 2016-07-26 | 1 | -1/+2 |
| |/ / | |||||
| * | | Fix typo | Richard van der Hoff | 2016-07-26 | 1 | -1/+1 |
| * | | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device | Richard van der Hoff | 2016-07-26 | 1 | -50/+110 |
| |\ \ | |||||
| | * \ | Merge pull request #948 from matrix-org/markjh/auth_fixes | Mark Haines | 2016-07-26 | 1 | -50/+110 |
| | |\ \ | |||||
| | | * | | Fix how push_actions are redacted. | Mark Haines | 2016-07-26 | 1 | -8/+10 |
| | | * | | Don't add rejected events if we've seen them befrore. Add some comments to ex... | Mark Haines | 2016-07-26 | 1 | -5/+48 |
| | | * | | Only update the events and event_json tables for rejected events | Mark Haines | 2016-07-25 | 2 | -52/+63 |
| | | * | | Don't add the events to forward extremities if the event is rejected | Mark Haines | 2016-07-25 | 1 | -3/+6 |
| | | * | | Don't add rejections to the state_group, persist all rejections | Mark Haines | 2016-07-25 | 2 | -5/+6 |
| * | | | | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 1 | -13/+45 |
| |/ / / | |||||
| * | | | Implement updating devices | Richard van der Hoff | 2016-07-26 | 1 | -1/+26 |
| * | | | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 4 | -4/+71 |
| |/ / | |||||
| * | | fix: defer.returnValue takes one argument | Mark Haines | 2016-07-25 | 1 | -1/+1 |
| * | | background updates: fix assert again | Richard van der Hoff | 2016-07-25 | 1 | -1/+1 |
| * | | background updates: Fix assertion to do something | Richard van der Hoff | 2016-07-25 | 1 | -2/+2 |
| * | | Fix background_update tests | Richard van der Hoff | 2016-07-25 | 1 | -7/+20 |
| * | | PEP8 | Richard van der Hoff | 2016-07-22 | 1 | -1/+0 |
| * | | Create index on user_ips in the background | Richard van der Hoff | 2016-07-22 | 3 | -12/+80 |
* | | | Add more key storage funcs into slave store | Erik Johnston | 2016-07-28 | 1 | -18/+16 |
* | | | Split out a FederationReader process | Erik Johnston | 2016-07-21 | 1 | -0/+4 |
|/ / | |||||
* | | storage/client_ips: remove some dead code | Richard van der Hoff | 2016-07-21 | 1 | -3/+0 |
* | | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 1 | -1/+2 |
|\ \ | |||||
| * | | Record device_id in client_ips | Richard van der Hoff | 2016-07-20 | 1 | -1/+2 |
* | | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 3 | -1/+109 |
|/ / | |||||
* | | More doc-comments | Richard van der Hoff | 2016-07-20 | 1 | -7/+12 |
* | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 1 | -2/+4 |
|\ \ | |||||
| * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 1 | -2/+4 |
* | | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 3 | -1/+197 |
|\ \ \ | |/ / |/| | | |||||
| * | | Comment | Erik Johnston | 2016-07-20 | 1 | -0/+4 |
| * | | Add support for filters in paginate_room_events | Erik Johnston | 2016-07-14 | 1 | -1/+51 |
| * | | Add sender and contains_url field to events table | Erik Johnston | 2016-07-14 | 2 | -0/+142 |
* | | | schema fix | Richard van der Hoff | 2016-07-19 | 1 | -1/+1 |
* | | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 5 | -10/+135 |
* | | | Fix /purge_history bug | Erik Johnston | 2016-07-15 | 1 | -19/+15 |
* | | | Pull out min stream_ordering from ex_outlier_stream | Erik Johnston | 2016-07-15 | 1 | -1/+2 |
* | | | event_backwards_extremeties may not be empty | Erik Johnston | 2016-07-15 | 1 | -1/+11 |
|/ / | |||||
* | | Add a comment explaining allow_none | Mark Haines | 2016-07-08 | 1 | -0/+2 |
* | | Ensure that the guest user is in the database when upgrading accounts | Mark Haines | 2016-07-08 | 1 | -0/+13 |
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-08 | 3 | -3/+14 |
|\ \ | |||||
| * \ | Merge pull request #886 from matrix-org/markjh/async_commit | Mark Haines | 2016-06-29 | 3 | -3/+14 |
| |\ \ | |||||
| | * | | Optionally make committing to postgres asynchronous. | Mark Haines | 2016-06-20 | 3 | -3/+14 |
* | | | | Comment | Erik Johnston | 2016-07-07 | 1 | -0/+3 |
* | | | | Return 400 rather than 500 | Erik Johnston | 2016-07-07 | 1 | -1/+4 |
* | | | | Add rest servlet. Fix SQL. | Erik Johnston | 2016-07-06 | 1 | -5/+4 |
* | | | | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 3 | -83/+131 |
|\ \ \ \ | |||||
| * | | | | Remove spurious txn | Erik Johnston | 2016-07-05 | 1 | -9/+0 |
| * | | | | Fix for postgres | Erik Johnston | 2016-07-05 | 1 | -2/+2 |
| * | | | | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 1 | -23/+38 |
| * | | | | Fix typo | Mark Haines | 2016-07-05 | 1 | -1/+1 |
| * | | | | Make get_events_around more efficient on sqlite3 | Mark Haines | 2016-07-05 | 1 | -13/+49 |
| * | | | | Use true/false for boolean parameter inclusive to avoid potential for sqli, a... | Mark Haines | 2016-07-05 | 2 | -5/+7 |
| * | | | | Use different SQL for postgres and sqlite3 for when using multicolumn indexes | Mark Haines | 2016-07-04 | 2 | -59/+59 |
| * | | | | Use a query that postgresql optimises better for get_events_around | Mark Haines | 2016-07-04 | 1 | -12/+16 |
* | | | | | Add ReadWriteLock for pagination and history prune | Erik Johnston | 2016-07-05 | 1 | -2/+2 |
* | | | | | Add purge_history API | Erik Johnston | 2016-07-05 | 1 | -0/+6 |
* | | | | | Add storage function to purge history for a room | Erik Johnston | 2016-07-04 | 1 | -0/+140 |
|/ / / / | |||||
* | | | | Feature: Add deactivate account admin API | Erik Johnston | 2016-06-30 | 2 | -0/+14 |
* | | | | Implement purge_media_cache admin API | Erik Johnston | 2016-06-29 | 1 | -0/+29 |
* | | | | Track approximate last access time for remote media | Erik Johnston | 2016-06-29 | 3 | -1/+47 |
* | | | | more pep8 | David Baker | 2016-06-24 | 1 | -1/+0 |
* | | | | Use similar naming we use in email notifs for push | David Baker | 2016-06-24 | 2 | -50/+0 |
* | | | | Actually we need to order these properly | David Baker | 2016-06-22 | 1 | -2/+12 |
* | | | | Style | David Baker | 2016-06-22 | 1 | -1/+1 |
* | | | | Put most recent 20 messages in notif | David Baker | 2016-06-22 | 1 | -3/+4 |
|/ / / | |||||
* | | | Add the create_profile method back since the tests use it | Mark Haines | 2016-06-17 | 1 | -0/+6 |
* | | | Remove registered_users from the distributor. | Mark Haines | 2016-06-17 | 2 | -9/+14 |
|/ / | |||||
* | | Don't hit DB for noop replications queries | Erik Johnston | 2016-06-08 | 4 | -0/+12 |
* | | Remove dead code. | Mark Haines | 2016-06-07 | 1 | -7/+0 |
* | | Fix AS retries, but with correct ordering | Erik Johnston | 2016-06-07 | 1 | -2/+2 |
* | | Fix AS retries | Erik Johnston | 2016-06-07 | 1 | -2/+2 |
* | | Merge pull request #841 from matrix-org/erikj/event_counter | Erik Johnston | 2016-06-06 | 1 | -0/+9 |
|\ \ | |||||
| * | | Add metric counter for number of persisted events | Erik Johnston | 2016-06-06 | 1 | -0/+9 |
* | | | Add events to cache when we persist them | Erik Johnston | 2016-06-06 | 1 | -0/+41 |
|/ / | |||||
* | | Don't rely on options when inserting event into cache | Erik Johnston | 2016-06-03 | 1 | -40/+43 |
* | | Change the way we cache events | Erik Johnston | 2016-06-03 | 1 | -39/+41 |
* | | Remove event fetching from DB threads | Erik Johnston | 2016-06-03 | 5 | -194/+74 |
* | | Move insert_client_ip to a separate class | Mark Haines | 2016-06-03 | 2 | -45/+71 |
* | | 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 #825 from matrix-org/erikj/cache_push_rules | Erik Johnston | 2016-06-03 | 2 | -2/+38 |
|\ \ \ | |||||
| * | | | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 1 | -1/+37 |
| * | | | Only get local users | Erik Johnston | 2016-06-03 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #824 from matrix-org/markjh/slaved_presence_store | Mark Haines | 2016-06-03 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add a slaved store for presence | Mark Haines | 2016-06-03 | 1 | -3/+3 |
* | | | Merge pull request #811 from matrix-org/erikj/state_users_in_room | Erik Johnston | 2016-06-03 | 3 | -17/+27 |
|\ \ \ | |||||
| * | | | Use state to calculate get_users_in_room | Erik Johnston | 2016-06-01 | 3 | -17/+27 |
* | | | | Merge pull request #809 from matrix-org/erikj/cache_receipts_in_room | Erik Johnston | 2016-06-03 | 1 | -0/+28 |
|\| | | | |/ / |/| | | |||||
| * | | Add get_users_with_read_receipts_in_room cache | Erik Johnston | 2016-06-01 | 1 | -0/+28 |
* | | | Fix setting the _clock in SQLBaseStore | Mark Haines | 2016-06-02 | 1 | -0/+1 |
* | | | 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 |
| | |/ / | |/| | | |||||
* | | | | 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 typo | Erik Johnston | 2016-05-31 | 1 | -1/+1 |
| * | | | Change fix | Erik Johnston | 2016-05-31 | 1 | -2/+8 |
| |/ / | |||||
* | | | Merge pull request #804 from matrix-org/erikj/push_rules_cache | Erik Johnston | 2016-05-31 | 1 | -6/+10 |
|\| | | |||||
| * | | Add caches to bulk_get_push_rules* | Erik Johnston | 2016-05-31 | 1 | -6/+10 |
* | | | Fix to allow start with postgres | Erik Johnston | 2016-05-27 | 1 | -2/+7 |
| |/ |/| | |||||
* | | 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 |
|/ | |||||
* | Add desc to get_presence_for_users | Erik Johnston | 2016-05-18 | 1 | -0/+1 |
* | Move the functions for parsing app service config | Mark Haines | 2016-05-17 | 1 | -102/+3 |
* | get_room_members is unused now | Mark Haines | 2016-05-16 | 1 | -18/+0 |
* | Spell "domain" correctly | Mark Haines | 2016-05-16 | 1 | -2/+2 |
* | Allow receipts for events we haven't seen in the db | Mark Haines | 2016-05-13 | 1 | -4/+6 |
* | 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 | 7 | -46/+210 |
| |\ \ | |||||
| * | | | 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 |
| | |_|/ | |/| | | |||||
* | | | | 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 |
|/ / / | |||||
* | | | unbreak schema | Matrix | 2016-05-10 | 2 | -0/+0 |
* | | | Merge pull request #759 from matrix-org/dbkr/email_notifs | Matthew Hodgson | 2016-05-10 | 5 | -13/+104 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 10 | -62/+364 |
| |\ \ \ | |||||
| * | | | | Correct SQL statement for postgres | David Baker | 2016-05-04 | 1 | -2/+3 |
| * | | | | Remove unused function | David Baker | 2016-04-29 | 1 | -22/+0 |
| * | | | | 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 |
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 8 | -12/+199 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Send a rather basic email notif | David Baker | 2016-04-20 | 2 | -2/+1 |
| * | | | | First bits of emailpusher | David Baker | 2016-04-19 | 5 | -7/+118 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 1 | -5/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #773 from matrix-org/erikj/get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -5/+2 |
| |\ \ \ \ | |||||
| | * | | | | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -5/+2 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 6 | -56/+317 |
|\| | | | | |||||
| * | | | | 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 | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| | |/ / / | |||||
| * | | | | 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 | 1 | -44/+113 |
| * | | | Add an openidish mechanism for proving to third parties that you own a given ... | Mark Haines | 2016-05-05 | 3 | -1/+44 |
* | | | | Add bulk fetch storage API | Erik Johnston | 2016-05-05 | 1 | -3/+22 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-04 | 4 | -1/+45 |
|\| | | | |||||
| * | | | Add primary key | Erik Johnston | 2016-05-04 | 1 | -1/+1 |
| * | | | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 3 | -1/+8 |
| * | | | Add /report endpoint | Erik Johnston | 2016-05-04 | 3 | -1/+38 |
| | |/ | |/| | |||||
* / | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 1 | -0/+31 |
|/ / | |||||
* | | Check that somethign has happend before running the selects | Mark Haines | 2016-04-27 | 3 | -2/+14 |
* | | Simplify query and handle finishing correctly | Erik Johnston | 2016-04-22 | 2 | -17/+16 |
* | | Order NULLs first | Erik Johnston | 2016-04-21 | 2 | -5/+16 |
* | | Fix query | Erik Johnston | 2016-04-21 | 1 | -2/+2 |
* | | Use special UPDATE syntax | Erik Johnston | 2016-04-21 | 2 | -22/+14 |
* | | Typo | Erik Johnston | 2016-04-21 | 1 | -1/+1 |
* | | Need to do _background_update_progress_txn in actual transaction | Erik Johnston | 2016-04-21 | 1 | -6/+8 |
* | | Update progress when creating index | Erik Johnston | 2016-04-21 | 1 | -0/+7 |
* | | Fix SQL statement | Erik Johnston | 2016-04-21 | 1 | -3/+3 |
* | | Create index must be on a conn | Erik Johnston | 2016-04-21 | 1 | -6/+13 |
* | | Create index concurrently | Erik Johnston | 2016-04-21 | 2 | -6/+14 |
* | | Add missing run_upgrade | Erik Johnston | 2016-04-21 | 1 | -0/+4 |
* | | Optimise event_search in postgres | Erik Johnston | 2016-04-21 | 3 | -5/+137 |
* | | Add cache to _get_state_groups_from_groups | Erik Johnston | 2016-04-19 | 1 | -3/+16 |
|/ | |||||
* | Add desc arg | Erik Johnston | 2016-04-14 | 1 | -1/+5 |
* | Add index | Erik Johnston | 2016-04-14 | 1 | -0/+18 |
* | Fix query for get_unread_push_actions_for_user_in_range | Erik Johnston | 2016-04-14 | 1 | -1/+2 |
* | pep8 | David Baker | 2016-04-13 | 1 | -1/+1 |
* | Only return unread notifications | David Baker | 2016-04-13 | 1 | -9/+50 |
* | Merge pull request #716 from matrix-org/dbkr/get_pushers | David Baker | 2016-04-12 | 1 | -14/+30 |
|\ | |||||
| * | Unneccessarywhitespaceisunnecessary | David Baker | 2016-04-12 | 1 | -1/+0 |
| * | Oops, forgot the desc. | David Baker | 2016-04-12 | 1 | -1/+1 |
| * | Tidy up get_pusher functions | David Baker | 2016-04-12 | 1 | -32/+30 |
| * | Mis-named function | David Baker | 2016-04-12 | 1 | -1/+1 |
| * | Add get endpoint for pushers | David Baker | 2016-04-11 | 1 | -0/+19 |
* | | Add back backfilled parameter that was removed | Erik Johnston | 2016-04-12 | 1 | -3/+4 |
* | | Check if we've already backfilled events | Erik Johnston | 2016-04-12 | 1 | -0/+16 |
|/ | |||||
* | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions | David Baker | 2016-04-11 | 7 | -52/+209 |
|\ | |||||
| * | Fix invite pushes | David Baker | 2016-04-08 | 1 | -0/+7 |
| * | Literally a dictionary | David Baker | 2016-04-07 | 1 | -17/+17 |