| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | generate id in the main thread | David Baker | 2016-04-07 | 1 | -3/+3 |
| * | Oops, inequality fail | David Baker | 2016-04-07 | 1 | -1/+1 |
| * | pep8 | David Baker | 2016-04-07 | 1 | -0/+1 |
| * | Fix port script for changes merged from develop | David Baker | 2016-04-07 | 1 | -1/+4 |
| * | Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_act... | David Baker | 2016-04-07 | 14 | -107/+91 |
| |\ |
|
| * | | Send badge count pushes. | David Baker | 2016-04-07 | 1 | -3/+6 |
| * | | pep8 | David Baker | 2016-04-06 | 4 | -4/+8 |
| * | | Make pushers use the event_push_actions table instead of listening on an even... | David Baker | 2016-04-06 | 6 | -49/+188 |
* | | | Merge pull request #688 from matrix-org/matthew/preview_urls | Matthew Hodgson | 2016-04-11 | 2 | -1/+83 |
|\ \ \ |
|
| * | | | move local_media_repository_url_cache.sql to schema v31 | Matthew Hodgson | 2016-04-08 | 1 | -0/+0 |
| * | | | fix error checking for new SQL | Matthew Hodgson | 2016-04-08 | 1 | -2/+2 |
| * | | | fix SQL based on PR feedback | Matthew Hodgson | 2016-04-08 | 1 | -2/+4 |
| * | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-07 | 18 | -140/+280 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 14 | -162/+346 |
| |\ \ \ |
|
| * | | | | pep8 | Matthew Hodgson | 2016-04-03 | 1 | -1/+2 |
| * | | | | add a persistent cache of URL lookups, and fix up the in-memory one to work | Matthew Hodgson | 2016-04-03 | 2 | -1/+80 |
* | | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 5 | -151/+0 |
* | | | | | Add tests for redactions | Mark Haines | 2016-04-07 | 1 | -1/+1 |
| |_|/ /
|/| | | |
|
* | | | | Merge pull request #697 from matrix-org/markjh/slaveI | Mark Haines | 2016-04-06 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Add a slaved events store class | Mark Haines | 2016-04-06 | 1 | -2/+2 |
* | | | | | Merge pull request #698 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-04-06 | 9 | -68/+51 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Don't require config to create database | Erik Johnston | 2016-04-06 | 9 | -68/+51 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #694 from matrix-org/markjh/caches | Mark Haines | 2016-04-06 | 2 | -33/+34 |
|\ \ \ \ |
|
| * | | | | Move _get_cache_dict into the SQLBaseStore | Mark Haines | 2016-04-06 | 2 | -33/+34 |
| |/ / / |
|
* / / / | Make the cache objects be per instance rather than being global | Mark Haines | 2016-04-06 | 3 | -5/+5 |
|/ / / |
|
* | | | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 2 | -1/+21 |
|\ \ \ |
|
| * | | | Fix stuck invites | Erik Johnston | 2016-04-05 | 2 | -1/+21 |
* | | | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 4 | -31/+151 |
|\| | | |
|
| * | | | Docs and indents | Erik Johnston | 2016-04-04 | 2 | -13/+27 |
| * | | | Add upgrade path, rename table | Erik Johnston | 2016-04-04 | 2 | -6/+20 |
| * | | | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 4 | -31/+123 |
* | | | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 1 | -0/+16 |
|\| | |
| |_|/
|/| | |
|
| * | | Use computed prev event ids | Erik Johnston | 2016-04-01 | 1 | -0/+16 |
* | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 3 | -13/+20 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use google style doc strings. | Mark Haines | 2016-04-01 | 3 | -13/+20 |
* | | | Merge pull request #684 from matrix-org/markjh/backfill_id_gen | Mark Haines | 2016-04-01 | 11 | -61/+71 |
|\ \ \ |
|
| * | | | Assert that the step != 0 | Mark Haines | 2016-04-01 | 1 | -0/+1 |
| * | | | use google style doc strings | Mark Haines | 2016-04-01 | 1 | -11/+12 |
| * | | | Rename direction to step, apply checks consistently | Mark Haines | 2016-04-01 | 2 | -16/+16 |
| * | | | Use a stream id generator for backfilled ids | Mark Haines | 2016-04-01 | 11 | -61/+69 |
| |/ / |
|
* / / | Fix the invalidation of the names and aliases cache | Mark Haines | 2016-04-01 | 1 | -1/+1 |
|/ / |
|
* | | Move the check for backfilled outside the for loop | Mark Haines | 2016-03-31 | 1 | -5/+5 |
* | | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 1 | -40/+50 |
* | | Merge pull request #676 from matrix-org/markjh/replicate_stateIII | Mark Haines | 2016-03-31 | 2 | -2/+114 |
|\ \ |
|
| * | | Use a namedtuple rather than tuple unpacking | Mark Haines | 2016-03-31 | 1 | -2/+9 |
| * | | Add replication streams for ex outliers and current state resets | Mark Haines | 2016-03-30 | 2 | -1/+97 |
| * | | Add a entry to current_state_resets table when the current state is reset | Mark Haines | 2016-03-30 | 1 | -0/+9 |
* | | | return the state_group for backfill | Mark Haines | 2016-03-30 | 1 | -1/+2 |
|/ / |
|
* | | Add a replication stream for state groups | Mark Haines | 2016-03-30 | 2 | -1/+35 |
* | | Use a stream id generator to assign state group ids | Mark Haines | 2016-03-30 | 3 | -49/+59 |
|/ |
|
* | Don't bother interning keys that are already interned | Erik Johnston | 2016-03-23 | 1 | -3/+1 |
* | Intern all the things | Erik Johnston | 2016-03-23 | 3 | -17/+17 |
* | String intern | Erik Johnston | 2016-03-23 | 1 | -3/+9 |
* | Merge pull request #664 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-03-23 | 1 | -0/+23 |
|\ |
|
| * | Comment about weird SQL | Erik Johnston | 2016-03-23 | 1 | -1/+3 |
| * | SQLite and postgres doesn't share a true literal | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| * | Ensure all old public rooms have aliases | Erik Johnston | 2016-03-23 | 1 | -0/+21 |
* | | Merge pull request #663 from matrix-org/erikj/invite_for_user | Erik Johnston | 2016-03-23 | 1 | -6/+4 |
|\ \ |
|
| * | | Make get_invites return RoomsForUser | Erik Johnston | 2016-03-23 | 1 | -6/+4 |
| |/ |
|
* | | Merge pull request #665 from matrix-org/erikj/dont_cache_events | Erik Johnston | 2016-03-23 | 3 | -23/+30 |
|\ \ |
|
| * | | Don't cache events in get_recent_events_for_room | Erik Johnston | 2016-03-23 | 1 | -14/+19 |
| * | | Don't cache events in get_current_state_for_key | Erik Johnston | 2016-03-23 | 2 | -9/+11 |
| |/ |
|
* / | Make StateHandler._state_cache only store event_ids. | Erik Johnston | 2016-03-22 | 1 | -0/+25 |
|/ |
|
* | Bump get_unread_event_push_actions_by_room_for_user cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
* | Bump get_aliases_for_room cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
* | Merge pull request #660 from matrix-org/erikj/state_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
|\ |
|
| * | Don't cache events in _state_group_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
* | | Merge pull request #659 from matrix-org/erikj/state_cache_factor | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
|\ \ |
|
| * | | Make stateGroupCache honour CACHE_SIZE_FACTOR | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
| |/ |
|
* | | Merge pull request #657 from matrix-org/erikj/roomlist | Erik Johnston | 2016-03-22 | 1 | -0/+8 |
|\ \
| |/
|/| |
|
| * | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+8 |
* | | Remove unused backfilled parameter from persist_event | Mark Haines | 2016-03-21 | 1 | -18/+4 |
|/ |
|
* | Dedupe requested event list in _get_events | Erik Johnston | 2016-03-18 | 1 | -14/+12 |
* | Remove dead code left over from presence changes | Mark Haines | 2016-03-17 | 1 | -24/+0 |
* | Add a comment to offer a hint to an explanation for why we have a unique cons... | Mark Haines | 2016-03-16 | 1 | -0/+1 |
* | Fix a couple of errors when deleting pushers | Mark Haines | 2016-03-15 | 1 | -2/+2 |
* | Add replication stream for pushers | Mark Haines | 2016-03-15 | 4 | -17/+82 |
* | Thats not how transactions work. | Erik Johnston | 2016-03-11 | 1 | -13/+16 |
* | Implement logout | Erik Johnston | 2016-03-11 | 1 | -14/+35 |
* | Fix SQL statement | Erik Johnston | 2016-03-11 | 1 | -1/+1 |
* | Merge pull request #641 from matrix-org/dbkr/fix_change_password | Erik Johnston | 2016-03-11 | 1 | -21/+18 |
|\ |
|
| * | more pep8 | David Baker | 2016-03-11 | 1 | -1/+1 |
| * | Make select more sensible when dseleting access tokens, rename pusher deletio... | David Baker | 2016-03-11 | 1 | -5/+3 |
| * | Delete old, unused methods and rename new one to just be `user_delete_access_... | David Baker | 2016-03-11 | 1 | -15/+2 |
| * | Dear PyCharm, please indent sensibly for me. Thx. | David Baker | 2016-03-11 | 1 | -1/+1 |
| * | Fix cache invalidation so deleting access tokens (which we did when changing ... | David Baker | 2016-03-11 | 1 | -8/+20 |
* | | Merge pull request #635 from matrix-org/erikj/sync_order | Erik Johnston | 2016-03-11 | 1 | -3/+6 |
|\ \
| |/
|/| |
|
| * | Add comment | Erik Johnston | 2016-03-09 | 1 | -0/+3 |
| * | Return the correct token form | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| * | Use topological orders for initial sync timeline | Erik Johnston | 2016-03-09 | 1 | -2/+2 |
* | | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 1 | -6/+34 |
* | | Update users table in a batched manner | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
|/ |
|
* | Ensure integer is an integer | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
* | Merge pull request #632 from matrix-org/markjh/py3v2 | Mark Haines | 2016-03-08 | 6 | -6/+6 |
|\ |
|
| * | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 6 | -6/+6 |
* | | Merge branch 'develop' into daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 7 | -86/+302 |
|\| |
|
| * | Prefill from the correct stream | Mark Haines | 2016-03-04 | 1 | -1/+1 |
| * | prefill the push rules stream change cache | Mark Haines | 2016-03-04 | 1 | -2/+9 |
| * | s/stream_ordering/event_stream_ordering/ in push | Mark Haines | 2016-03-04 | 2 | -26/+30 |
| * | /FNARG/d | Mark Haines | 2016-03-04 | 1 | -1/+0 |
| * | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 8 | -26/+126 |
| |\ |
|
| | * | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 2 | -1/+30 |
| | |\ |
|
| | | * | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 2 | -1/+30 |
| * | | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 2 | -68/+62 |
| * | | | Hook push rules up to the replication API | Mark Haines | 2016-03-02 | 1 | -0/+6 |
| * | | | Add a stream for push rule updates | Mark Haines | 2016-03-01 | 5 | -74/+251 |
* | | | | Idempotent-ise schema update script | Daniel Wagner-Hall | 2016-03-08 | 1 | -1/+5 |
| |/ /
|/| | |
|
* | | | Merge pull request #571 from matrix-org/daniel/asids | Daniel Wagner-Hall | 2016-03-03 | 6 | -25/+96 |
|\ \ \
| |/ /
|/| | |
|
| * | | Mark AS users with their AS's ID | Daniel Wagner-Hall | 2016-02-11 | 6 | -26/+97 |
* | | | Merge pull request #489 from matrix-org/markjh/replication | Mark Haines | 2016-03-01 | 5 | -2/+164 |
|\ \ \ |
|
| * | | | Add a /replication API for extracting the updates that happened on | Mark Haines | 2016-03-01 | 5 | -2/+164 |
| | |/
| |/| |
|
* / | | Load the current id in the IdGenerator constructor | Mark Haines | 2016-03-01 | 12 | -77/+52 |
|/ / |
|
* | | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 1 | -0/+25 |
* | | Generate guest access token on 3pid invites | Daniel Wagner-Hall | 2016-02-24 | 2 | -0/+68 |
* | | Create a new stream_id per presence update | Erik Johnston | 2016-02-23 | 1 | -6/+9 |
* | | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 10 | -65/+211 |
|\ \ |
|
| * | | Close cursor | Erik Johnston | 2016-02-18 | 1 | -0/+1 |
| * | | Remove unused param from get_max_token | Erik Johnston | 2016-02-18 | 6 | -13/+11 |
| * | | Prefix TS fields with _ts | Erik Johnston | 2016-02-18 | 3 | -16/+17 |
| * | | Initial cut | Erik Johnston | 2016-02-17 | 5 | -55/+201 |
* | | | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 2 | -7/+6 |
* | | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 1 | -82/+86 |
|\| | |
|
| * | | Make adding push rules idempotent | Mark Haines | 2016-02-16 | 1 | -82/+86 |
* | | | Respond to federated invite with non-empty context | Daniel Wagner-Hall | 2016-02-17 | 1 | -4/+4 |
|/ / |
|
* | | Fix SYN-627, events are in incorrect room in /sync | Erik Johnston | 2016-02-11 | 1 | -1/+1 |
* | | Return events in correct order for /events | Erik Johnston | 2016-02-11 | 1 | -8/+11 |
|/ |
|
* | Batch fetch _get_state_groups_from_groups | Erik Johnston | 2016-02-10 | 1 | -32/+34 |
* | Use _simple_select_many for _get_state_group_for_events | Erik Johnston | 2016-02-10 | 1 | -16/+10 |
* | Merge pull request #568 from matrix-org/erikj/unread_notif | Erik Johnston | 2016-02-10 | 2 | -39/+32 |
|\ |
|
| * | Rename functions | Erik Johnston | 2016-02-10 | 2 | -4/+4 |
| * | Atomically persit push actions when we persist the event | Erik Johnston | 2016-02-09 | 2 | -39/+32 |
* | | Change a log from debug to info | Erik Johnston | 2016-02-09 | 1 | -1/+1 |
|/ |
|
* | Invalidate get_last_receipt_event_id_for_user cache | Erik Johnston | 2016-02-09 | 1 | -0/+5 |
* | Don't load all ephemeral state for a room on every sync | Erik Johnston | 2016-02-09 | 1 | -0/+14 |