Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change CHANGELOG | Erik Johnston | 2016-06-09 | 1 | -1/+1 |
| | |||||
* | Bump version and changelog | Erik Johnston | 2016-06-09 | 2 | -1/+11 |
| | |||||
* | Update commit hash in changelog v0.16.0-rc2 | Erik Johnston | 2016-06-08 | 1 | -1/+1 |
| | |||||
* | Bump version and changelog to v0.16.0-rc2 | Erik Johnston | 2016-06-08 | 2 | -1/+28 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.0 | Erik Johnston | 2016-06-08 | 22 | -398/+997 |
|\ | |||||
| * | Merge pull request #850 from matrix-org/erikj/gc_threshold | Erik Johnston | 2016-06-08 | 2 | -0/+28 |
| |\ | | | | | | | Add gc_threshold to pusher and synchrotron | ||||
| | * | Add gc_threshold to pusher and synchrotron | Erik Johnston | 2016-06-07 | 2 | -0/+28 |
| | | | |||||
| * | | Merge pull request #852 from matrix-org/erikj/gc_metrics | Erik Johnston | 2016-06-08 | 1 | -0/+4 |
| |\ \ | | | | | | | | | Add GC counts to metrics | ||||
| | * | | Don't track total objects as its too expensive to calculate | Erik Johnston | 2016-06-07 | 1 | -1/+0 |
| | | | | |||||
| | * | | Record some more GC metrics | Erik Johnston | 2016-06-07 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge pull request #851 from matrix-org/markjh/jenkins_synchrotron | Mark Haines | 2016-06-07 | 1 | -0/+84 |
| |\ \ \ | | |/ / | |/| | | Add script for running sytest with dendron | ||||
| | * | | Add script for running sytest with dendron | Mark Haines | 2016-06-07 | 1 | -0/+84 |
| | | | | |||||
| * | | | Merge pull request #849 from matrix-org/erikj/gc_threshold | Erik Johnston | 2016-06-07 | 4 | -6/+38 |
| |\ \ \ | | | |/ | | |/| | Allow setting of gc.set_thresholds | ||||
| | * | | Allow setting of gc.set_thresholds | Erik Johnston | 2016-06-07 | 4 | -6/+38 |
| | |/ | |||||
| * | | Merge pull request #848 from matrix-org/markjh/unusedIV | Mark Haines | 2016-06-07 | 4 | -54/+0 |
| |\ \ | | |/ | |/| | Remove dead code. | ||||
| | * | Remove dead code. | Mark Haines | 2016-06-07 | 4 | -54/+0 |
| |/ | | | | | | | | | | | | | | | | | | | | | Loading push rules now happens in the datastore, so we can remove the methods that loaded them outside the datastore. The ``waiting_for_join_list`` in federation handler is populated by anything, so can be removed. The ``_get_members_events_txn`` method isn't called from anywhere so can be removed. | ||||
| * | Merge pull request #847 from matrix-org/erikj/gc_tick | Erik Johnston | 2016-06-07 | 1 | -8/+6 |
| |\ | | | | | | | Change the way we do stats for GC | ||||
| | * | Also record number of unreachable objects | Erik Johnston | 2016-06-07 | 1 | -2/+4 |
| | | | |||||
| | * | Change the way we do stats | Erik Johnston | 2016-06-07 | 1 | -7/+3 |
| |/ | |||||
| * | Merge pull request #771 from matrix-org/erikj/gc_tick | Erik Johnston | 2016-06-07 | 1 | -0/+26 |
| |\ | | | | | | | Manually run GC on reactor tick. | ||||
| | * | Count number of GC collects | Erik Johnston | 2016-05-16 | 1 | -5/+11 |
| | | | |||||
| | * | Add a comment | Erik Johnston | 2016-05-13 | 1 | -0/+5 |
| | | | |||||
| | * | Manually run GC on reactor tick. | Erik Johnston | 2016-05-09 | 1 | -0/+15 |
| | | | | | | | | | | | | This also adds a metric for amount of time spent in GC. | ||||
| * | | Merge pull request #846 from matrix-org/markjh/user_joined_notifier | Mark Haines | 2016-06-07 | 1 | -8/+6 |
| |\ \ | | | | | | | | | Notify users for events in rooms they join. | ||||
| | * | | Notify users for events in rooms they join. | Mark Haines | 2016-06-07 | 1 | -8/+6 |
| |/ / | | | | | | | | | | | | | | | | Change how the notifier updates the map from room_id to user streams on receiving a join event. Make it update the map when it notifies for the join event, rather than using the "user_joined_room" distributor signal | ||||
| * | | Fix AS retries, but with correct ordering | Erik Johnston | 2016-06-07 | 2 | -6/+6 |
| | | | |||||
| * | | Fix AS retries | Erik Johnston | 2016-06-07 | 2 | -5/+5 |
| | | | |||||
| * | | Merge pull request #845 from matrix-org/markjh/synchrotron_presence | Mark Haines | 2016-06-06 | 1 | -1/+4 |
| |\ \ | | | | | | | | | Fix a KeyError in the synchrotron presence | ||||
| | * | | Fix a KeyError in the synchrotron presence | Mark Haines | 2016-06-06 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge pull request #844 from matrix-org/markjh/yield_on_sleep | Mark Haines | 2016-06-06 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Yield on the sleeps intended to backoff replication | ||||
| | * | | | Yield on the sleeps intended to backoff replication | Mark Haines | 2016-06-06 | 2 | -2/+2 |
| | |/ / | |||||
| * | | | .values() returns list of sets | Erik Johnston | 2016-06-06 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge pull request #842 from matrix-org/erikj/presence_timer | Erik Johnston | 2016-06-06 | 1 | -33/+37 |
| |\ \ \ | | |/ / | |/| | | Fire after 30s not 8h | ||||
| | * | | Fix typos | Erik Johnston | 2016-06-06 | 1 | -32/+36 |
| | | | | |||||
| | * | | Fire after 30s not 8h | Erik Johnston | 2016-06-06 | 1 | -1/+1 |
| |/ / | |||||
| * | | 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 | ||||
| | * | | Add metric counter for number of persisted events | Erik Johnston | 2016-06-06 | 1 | -0/+9 |
| | | | | |||||
| * | | | Merge pull request #840 from matrix-org/erikj/event_write_through | Erik Johnston | 2016-06-06 | 1 | -0/+41 |
| |\ \ \ | | |/ / | |/| | | Add events to cache when we persist them | ||||
| | * | | Add events to cache when we persist them | Erik Johnston | 2016-06-06 | 1 | -0/+41 |
| |/ / | |||||
| * | | Merge pull request #836 from matrix-org/erikj/change_event_cache | Erik Johnston | 2016-06-03 | 1 | -54/+59 |
| |\ \ | | | | | | | | | Change the way we cache events | ||||
| | * | | 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 |
| | | | | |||||
| * | | | Merge pull request #837 from matrix-org/markjh/synchrotron_presence_list | Mark Haines | 2016-06-03 | 1 | -5/+10 |
| |\ \ \ | | |/ / | |/| | | Add get_presence_list_accepted to the broken caches in synchrotron | ||||
| | * | | Fix spelling | Mark Haines | 2016-06-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add get_presence_list_accepted to the broken caches in synchrotron | Mark Haines | 2016-06-03 | 1 | -4/+9 |
| |/ / | |||||
| * | | Merge pull request #835 from matrix-org/erikj/get_event_txn | Erik Johnston | 2016-06-03 | 7 | -200/+75 |
| |\ \ | | | | | | | | | Remove event fetching from DB threads | ||||
| | * | | Remove event fetching from DB threads | Erik Johnston | 2016-06-03 | 7 | -200/+75 |
| | | | | |||||
| * | | | Merge pull request #834 from matrix-org/dbkr/fix_email_from | David Baker | 2016-06-03 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | Fix email notif From | ||||
| | * | | 3rd time lucky: we'd already calculated it above | David Baker | 2016-06-03 | 1 | -3/+1 |
| | | | | |||||
| | * | | Oops, we're using the dict form | David Baker | 2016-06-03 | 1 | -1/+3 |
| | | | | |||||
| | * | | Add substitutions to email notif From | David Baker | 2016-06-03 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-06-03 | 2 | -5/+91 |
| |\ \ | |/ / |/| | | |||||
* | | | Note that v0.15.x was never released v0.16.0-rc1 | Erik Johnston | 2016-06-03 | 1 | -0/+2 |
| | | | |||||
* | | | Bump changelog and version | Erik Johnston | 2016-06-03 | 2 | -1/+51 |
| | | | |||||
* | | | Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-06-03 | 2 | -5/+39 |
|\ \ \ | | | | | | | | | | | | | release-v0.16.0 | ||||
| * | | | Bump changelog and version v0.15.0-rc1 | Erik Johnston | 2016-04-26 | 2 | -5/+39 |
| | | | | |||||
| | * | | Merge pull request #831 from matrix-org/markjh/synchrotronII | Mark Haines | 2016-06-03 | 1 | -0/+510 |
| | |\ \ | | | | | | | | | | | Add a separate process that can handle /sync requests | ||||
| | | * | | Clear the list of ongoing syncs on shutdown | Mark Haines | 2016-06-03 | 1 | -0/+9 |
| | | | | | |||||
| | | * | | Appease flake8 | Mark Haines | 2016-06-03 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Use ClientIpStore to record client ips | Mark Haines | 2016-06-03 | 1 | -3/+4 |
| | | | | | |||||
| | | * | | Merge branch 'develop' into markjh/synchrotronII | Mark Haines | 2016-06-03 | 14 | -128/+197 |
| | | |\ \ | |||||
| | | * | | | Send updates to the syncing users every ten seconds or immediately if ↵ | Mark Haines | 2016-06-03 | 1 | -10/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | they've just come online | ||||
| | | * | | | Add a separate process that can handle /sync requests | Mark Haines | 2016-06-03 | 1 | -0/+467 |
| | | | | | | |||||
| | * | | | | Merge pull request #832 from matrix-org/erikj/presence_coount | Erik Johnston | 2016-06-03 | 1 | -5/+9 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | Change def of small delta in presence stream. Add metrics. | ||||
| | | * | | | Change metric style | Erik Johnston | 2016-06-03 | 1 | -5/+4 |
| | | | | | | |||||
| | | * | | | Presence metrics. Change def of small delta | Erik Johnston | 2016-06-03 | 1 | -5/+10 |
| | | | | | | |||||
| | * | | | | Merge pull request #833 from matrix-org/markjh/client_ips | Mark Haines | 2016-06-03 | 2 | -45/+71 |
| |/| | | | |/| | | | | | | | | | | | Move insert_client_ip to a separate class | ||||
| | * | | | | Move insert_client_ip to a separate class | Mark Haines | 2016-06-03 | 2 | -45/+71 |
| |/ / / / |/| | | | | |||||
* | | | | | Fix typo | Erik Johnston | 2016-06-03 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #822 from matrix-org/matthew/brand-from-header | Matthew Hodgson | 2016-06-03 | 2 | -2/+9 |
|\ \ \ \ | | | | | | | | | | | brand the email from header | ||||
| * \ \ \ | Merge branch 'develop' into matthew/brand-from-header | Matthew Hodgson | 2016-06-03 | 35 | -206/+690 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-06-03 | 2 | -10/+34 |
|\ \ \ \ \ | |||||
| * | | | | | Pull out update_results_dict | Erik Johnston | 2016-06-03 | 1 | -8/+7 |
| | | | | | | |||||
| * | | | | | Small optimisation to CacheListDescriptor | Erik Johnston | 2016-06-03 | 3 | -14/+21 |
| | | | | | | |||||
| * | | | | | Make cachedList go a bit faster | Erik Johnston | 2016-06-03 | 2 | -20/+46 |
| | | | | | | |||||
* | | | | | | Merge pull request #830 from matrix-org/erikj/metrics_perf | Erik Johnston | 2016-06-03 | 8 | -70/+82 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Change CacheMetrics to be quicker | ||||
| * | | | | | Change CacheMetrics to be quicker | Erik Johnston | 2016-06-03 | 8 | -70/+82 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | We change it so that each cache has an individual CacheMetric, instead of having one global CacheMetric. This means that when a cache tries to increment a counter it does not need to go through so many indirections. | ||||
* | | | | | Merge pull request #829 from matrix-org/erikj/poke_notifier | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Poke notifier on next reactor tick | ||||
| * | | | | | Poke notifier on next reactor tick | Erik Johnston | 2016-06-03 | 1 | -4/+7 |
| |/ / / / | |||||
* | | | | | 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 | ||||
| * | | | | | 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 | ||||
| * | | | | | Add methods to events, account data and receipt slaves | Mark Haines | 2016-06-03 | 3 | -6/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the methods needed by /sync to the slaved events, account data and receipt stores. | ||||
* | | | | | | 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 | ||||
| * | | | | | | 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 | ||||
| * | | | | | | 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 slaved stores for filters, tokens, and push rules | ||||
| * | | | | | 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 | ||||
| * | | | | | 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 | 3 | -31/+39 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | dbkr/email_unsubscribe | ||||
| * \ \ \ \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | |||||
| | | | | | * | | | brand the email from header | Matthew Hodgson | 2016-06-02 | 2 | -2/+9 |
| |_|_|_|_|/ / / |/| | | | | | | | |||||
* | | | | | | | | 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 |
| |_|/ / / / |/| | | | | | | | | | | | 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 | 4 | -22/+174 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 10 | -24/+23 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | Split out the auth handler | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | 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 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | 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 | ||||
| * | | | | | | 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 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #813 from matrix-org/dbkr/fix_room_list_spidering | Erik Johnston | 2016-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Fix room list spidering | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add secondary_directory_servers option to fetch room list from other servers | ||||
| * | | | | | | Inject fake room list handler in tests | David Baker | 2016-06-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise it tries to start the remote public room list updating looping call which breaks. | ||||
| * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | |||||
* | | | | | | | | 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 | ||||
| * | | | | | | | 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 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 |
| | | | | | | |||||
* | | | | | | 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. | ||||
| * | | | | | Move the AS handler out of the Handlers object. | Mark Haines | 2016-05-31 | 7 | -38/+36 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Access it directly from the homeserver itself. It already wasn't inheriting from BaseHandler storing it on the Handlers object was already somewhat dubious. | ||||
* | | | | | 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 | ||||
| * | | | | | 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 |
| | | | | |||||
* | | | | 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 |
|\ \ \ \ | | | | | | | | | | | 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 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | | Merge pull request #798 from negzi/bugfix_create_user_feature | Erik Johnston | 2016-05-24 | 2 | -13/+30 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix set profile error with Requester. | ||||
| * | | | | Fix set profile error with Requester. | Negi Fazeli | 2016-05-23 | 2 | -13/+30 |
|/ / / / | | | | | | | | | | | | | | | | | Replace flush_user with delete access token due to function removal Add a new test case for if the user is already registered | ||||
* / / / | 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' | ||||
| * | | | 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 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | 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 |
|\ \ \ \ | | | | | | | | | | | Move SyncHandler out of the Handlers object | ||||
| * \ \ \ | 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 |
|\ \ \ \ \ | | |/ / / | |/| | | | tune email notifs, fix CSS a bit, and add debugging details | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Cleanup room member handler | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | 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 | 12 | -36/+49 |
| | | | | |/| | | | | | | |/|/ / / | | | | |/| | | | | | |/| | | | | 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 | 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 |
| |/ / / / |/| | | | | | | | | | | | | | | s/domian/domain/g | ||||
* | | | | | Merge pull request #760 from matrix-org/matthew/preview_url_ip_whitelist | Matthew Hodgson | 2016-05-16 | 4 | -42/+58 |
|\ \ \ \ \ | |/ / / / |/| | | | | add a url_preview_ip_range_whitelist config param | ||||
| * | | | | 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 | 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 |
|\ \ \ \ | | | | | | | | | | | Make email notifs work on the pusher synapse | ||||
| * | | | | 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 | ||||
| * | | | | | 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 | ||||
| * | | | | | | 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 | ||||
| * | | | | | | Create user with expiry | Negi Fazeli | 2016-05-13 | 10 | -9/+301 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 15 | -49/+433 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | 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 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #782 from matrix-org/erikj/remove_indices | Erik Johnston | 2016-05-13 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Remove unused indices | ||||
| * | | | | | | | | 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 | ||||
* | | | | | | | Merge pull request #777 from matrix-org/markjh/move_filter_for_client | Mark Haines | 2016-05-13 | 11 | -215/+252 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | move filter_events_for_client out of base handler | ||||
| * | | | | | | 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. |