Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Split RoomMemberHandler into base and master class | Erik Johnston | 2018-03-13 | 2 | -98/+139 | |
* | | | | | | | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer | Erik Johnston | 2018-03-13 | 18 | -33/+33 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | s/replication_client/federation_client/ | Erik Johnston | 2018-03-13 | 17 | -29/+29 | |
| * | | | | | | | s/replication_server/federation_server | Erik Johnston | 2018-03-13 | 3 | -4/+4 | |
* | | | | | | | | Merge pull request #2981 from matrix-org/erikj/factor_remote_leave | Erik Johnston | 2018-03-13 | 1 | -22/+54 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_rem... | Erik Johnston | 2018-03-13 | 21 | -120/+154 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Add docstring | Erik Johnston | 2018-03-13 | 1 | -0/+26 | |
| * | | | | | | | Factor out _remote_reject_invite in RoomMember | Erik Johnston | 2018-03-13 | 1 | -22/+28 | |
* | | | | | | | | Merge pull request #2979 from matrix-org/erikj/no_handlers | Erik Johnston | 2018-03-13 | 29 | -112/+41 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Don't build handlers on workers unnecessarily | Erik Johnston | 2018-03-13 | 5 | -5/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Remove unused ReplicationLayer | Erik Johnston | 2018-03-13 | 2 | -59/+0 | |
| * | | | | | | Fix tests | Erik Johnston | 2018-03-13 | 10 | -21/+22 | |
| * | | | | | | Split replication layer into two | Erik Johnston | 2018-03-13 | 12 | -27/+19 | |
* | | | | | | | Merge pull request #2980 from matrix-org/erikj/rm_priv | Erik Johnston | 2018-03-13 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make functions private that can be | Erik Johnston | 2018-03-13 | 1 | -7/+7 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2982 from matrix-org/erikj/fix_extra_users | Erik Johnston | 2018-03-13 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | extra_users is actually a list of UserIDs | Erik Johnston | 2018-03-13 | 2 | -5/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2983 from matrix-org/erikj/rename_register_3pid | Erik Johnston | 2018-03-13 | 2 | -11/+25 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Refactor get_or_register_3pid_guest | Erik Johnston | 2018-03-13 | 2 | -11/+25 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2984 from matrix-org/erikj/fix_rest_regeix | Erik Johnston | 2018-03-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | RoomMembershipRestServlet doesn't handle /forget | Erik Johnston | 2018-03-13 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2975 from matrix-org/rav/measure_persist_events | Richard van der Hoff | 2018-03-13 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add Measure block for persist_events | Richard van der Hoff | 2018-03-13 | 1 | -4/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2977 from matrix-org/erikj/replication_move_props | Erik Johnston | 2018-03-13 | 4 | -22/+13 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Move property setting from ReplicationLayer to FederationBase | Erik Johnston | 2018-03-13 | 4 | -22/+13 | |
* | | | | | | | Merge pull request #2976 from matrix-org/erikj/replication_registry | Erik Johnston | 2018-03-13 | 12 | -70/+98 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix docstring types | Erik Johnston | 2018-03-13 | 1 | -2/+2 | |
| |/ / / / / | ||||||
| * | | | | | Fix tests | Erik Johnston | 2018-03-13 | 2 | -10/+8 | |
| * | | | | | Split out edu/query registration to a separate class | Erik Johnston | 2018-03-13 | 10 | -60/+90 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2962 from matrix-org/rav/purge_history_txns | Richard van der Hoff | 2018-03-12 | 3 | -11/+175 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 3 | -8/+161 | |
| * | | | | | Return an error when doing two purges on a room | Richard van der Hoff | 2018-03-12 | 1 | -3/+14 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2961 from matrix-org/rav/run_in_background | Richard van der Hoff | 2018-03-12 | 2 | -28/+33 | |
|\ \ \ \ \ | ||||||
| * | | | | | Factor run_in_background out from preserve_fn | Richard van der Hoff | 2018-03-08 | 2 | -28/+33 | |
* | | | | | | Merge pull request #2965 from matrix-org/rav/request_logging | Richard van der Hoff | 2018-03-12 | 2 | -34/+96 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add some docstrings to help figure this out | Richard van der Hoff | 2018-03-09 | 1 | -2/+26 | |
| * | | | | | | Add a metric which increments when a request is received | Richard van der Hoff | 2018-03-09 | 2 | -2/+26 | |
| * | | | | | | refactor JsonResource | Richard van der Hoff | 2018-03-09 | 1 | -32/+46 | |
* | | | | | | | Merge pull request #2944 from matrix-org/erikj/fix_sync_race | Erik Johnston | 2018-03-07 | 3 | -30/+102 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix up log message | Erik Johnston | 2018-03-07 | 1 | -1/+1 | |
| * | | | | | | Fix typo | Erik Johnston | 2018-03-07 | 1 | -2/+2 | |
| * | | | | | | Fix race in sync when joining room | Erik Johnston | 2018-03-07 | 3 | -30/+102 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2949 from krombel/use_bcrypt_checkpw | Richard van der Hoff | 2018-03-06 | 2 | -3/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | use bcrypt.checkpw | Krombel | 2018-03-05 | 2 | -3/+5 | |
* | | | | | | | Merge pull request #2946 from matrix-org/rav/timestamp_to_purge | Richard van der Hoff | 2018-03-06 | 4 | -14/+96 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Provide a means to pass a timestamp to purge_history | Richard van der Hoff | 2018-03-05 | 4 | -14/+96 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2948 from matrix-org/erikj/kill_as_sync | Erik Johnston | 2018-03-06 | 4 | -163/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove ability for AS users to call /events and /sync | Erik Johnston | 2018-03-05 | 4 | -163/+14 | |
* | | | | | | | | Merge pull request #2947 from matrix-org/erikj/split_directory_store | Erik Johnston | 2018-03-05 | 2 | -28/+30 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix cache invalidation on deletion | Erik Johnston | 2018-03-05 | 1 | -1/+4 | |
| * | | | | | | | Split Directory store | Erik Johnston | 2018-03-05 | 2 | -27/+26 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2943 from matrix-org/rav/fix_find_first_stream_ordering_a... | Richard van der Hoff | 2018-03-05 | 2 | -12/+138 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix comment typo | Richard van der Hoff | 2018-03-05 | 1 | -1/+1 | |
| * | | | | | | Test and fix find_first_stream_ordering_after_ts | Richard van der Hoff | 2018-03-05 | 2 | -15/+120 | |
| * | | | | | | Add find_first_stream_ordering_after_ts | Richard van der Hoff | 2018-03-05 | 1 | -0/+21 | |
* | | | | | | | Merge pull request #2934 from matrix-org/erikj/cache_fix | Erik Johnston | 2018-03-05 | 2 | -13/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix bug with delayed cache invalidation stream | Erik Johnston | 2018-03-02 | 2 | -13/+15 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2929 from matrix-org/erikj/split_regististration_store | Erik Johnston | 2018-03-05 | 2 | -72/+64 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Split registration store | Erik Johnston | 2018-03-02 | 2 | -72/+64 | |
* | | | | | | | Merge pull request #2933 from matrix-org/erikj/3pid_yield | Erik Johnston | 2018-03-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add missing yield during 3pid signature checks | Erik Johnston | 2018-03-02 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2928 from matrix-org/erikj/read_marker_caches | Erik Johnston | 2018-03-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Fix typo in getting replication account data processing | Erik Johnston | 2018-03-01 | 1 | -1/+1 | |
* | | | | | | Merge pull request #2925 from matrix-org/erikj/split_sig_fed | Erik Johnston | 2018-03-01 | 3 | -180/+152 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Remove unused DataStore | Erik Johnston | 2018-03-01 | 1 | -1/+0 | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_sig_fed | Erik Johnston | 2018-03-01 | 7 | -445/+428 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Stub out broken function only used for cache | Erik Johnston | 2018-03-01 | 1 | -1/+3 | |
| * | | | | | | Split out SignatureStore and EventFederationStore | Erik Johnston | 2018-03-01 | 3 | -174/+148 | |
* | | | | | | | Merge pull request #2927 from matrix-org/erikj/read_marker_caches | Erik Johnston | 2018-03-01 | 4 | -5/+46 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Fewer lies are better | Erik Johnston | 2018-03-01 | 1 | -2/+2 | |
| * | | | | | | Improve caching for read_marker API | Erik Johnston | 2018-03-01 | 3 | -3/+41 | |
| * | | | | | | Add some caches to help read marker API | Erik Johnston | 2018-03-01 | 3 | -2/+5 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2926 from matrix-org/erikj/member_handler_move | Erik Johnston | 2018-03-01 | 11 | -40/+52 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Move back to hs.is_mine | Erik Johnston | 2018-03-01 | 1 | -7/+6 | |
| * | | | | | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 11 | -45/+58 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2924 from matrix-org/erikj/split_stream_store | Erik Johnston | 2018-03-01 | 3 | -219/+208 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_stre... | Erik Johnston | 2018-03-01 | 6 | -225/+221 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #2923 from matrix-org/erikj/stream_ago_worker | Erik Johnston | 2018-03-01 | 3 | -80/+85 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Default stream_ordering_*_ago to None | Erik Johnston | 2018-03-01 | 1 | -2/+2 | |
| * | | | | | | Fix comment typo | Erik Johnston | 2018-03-01 | 1 | -1/+1 | |
| * | | | | | | Calculate stream_ordering_month_ago correctly on workers | Erik Johnston | 2018-03-01 | 3 | -80/+85 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #2922 from matrix-org/erikj/split_room_store | Erik Johnston | 2018-03-01 | 2 | -135/+125 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Split up RoomStore | Erik Johnston | 2018-03-01 | 2 | -135/+125 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2921 from matrix-org/rav/unyielding_make_deferred_yieldable | Richard van der Hoff | 2018-03-01 | 1 | -9/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Rewrite make_deferred_yieldable avoiding inlineCallbacks | Richard van der Hoff | 2018-03-01 | 1 | -9/+11 | |
| | * | | | | Remove unused variables | Erik Johnston | 2018-03-01 | 1 | -8/+1 | |
| | * | | | | Document abstract class and method better | Erik Johnston | 2018-03-01 | 1 | -8/+13 | |
| | * | | | | Split out stream store | Erik Johnston | 2018-03-01 | 3 | -210/+202 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #2920 from matrix-org/erikj/retry_send_event | Erik Johnston | 2018-03-01 | 1 | -6/+43 | |
|\ \ \ \ \ | ||||||
| * | | | | | Log in the correct places | Erik Johnston | 2018-03-01 | 1 | -2/+4 | |
| * | | | | | Don't do preserve_fn for every request | Erik Johnston | 2018-03-01 | 1 | -1/+2 | |
| * | | | | | Add some logging | Erik Johnston | 2018-03-01 | 1 | -0/+2 | |
| * | | | | | Make repl send_event idempotent and retry on timeouts | Erik Johnston | 2018-03-01 | 1 | -6/+38 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2875 from matrix-org/erikj/push_actions_worker | Erik Johnston | 2018-03-01 | 3 | -30/+88 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Check event auth on the worker | Erik Johnston | 2018-03-01 | 1 | -16/+16 | |
| * | | | | Correctly send ratelimit and extra_users params | Erik Johnston | 2018-03-01 | 2 | -1/+15 | |
| * | | | | Fixup comments | Erik Johnston | 2018-03-01 | 1 | -4/+4 | |
| * | | | | Calculate push actions on worker | Erik Johnston | 2018-02-28 | 3 | -26/+70 | |
* | | | | | Merge pull request #2913 from matrix-org/erikj/store_push | Erik Johnston | 2018-02-28 | 6 | -98/+101 | |
|\| | | | | ||||||
| * | | | | Move storage functions for push calculations | Erik Johnston | 2018-02-27 | 6 | -98/+101 | |
|/ / / / | ||||||
* | | | | Merge pull request #2904 from matrix-org/erikj/receipt_cache_invalidation | Erik Johnston | 2018-02-27 | 2 | -14/+16 | |
|\ \ \ \ | ||||||
| * | | | | Fix missing invalidations for receipt storage | Erik Johnston | 2018-02-21 | 2 | -14/+16 | |
* | | | | | Merge pull request #2903 from matrix-org/erikj/split_roommember_store | Erik Johnston | 2018-02-27 | 2 | -207/+187 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_room... | Erik Johnston | 2018-02-23 | 13 | -594/+647 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Update copyright | Erik Johnston | 2018-02-23 | 3 | -0/+3 | |
| * | | | | | | Split out RoomMemberStore | Erik Johnston | 2018-02-21 | 2 | -206/+184 | |
* | | | | | | | Merge pull request #2901 from matrix-org/erikj/split_as_stores | Erik Johnston | 2018-02-27 | 2 | -37/+29 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add comment | Erik Johnston | 2018-02-27 | 1 | -0/+4 | |
| * | | | | | | | Update copyright | Erik Johnston | 2018-02-23 | 2 | -0/+2 | |
| * | | | | | | | Split AS stores | Erik Johnston | 2018-02-21 | 2 | -37/+23 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2892 from matrix-org/erikj/batch_inserts_push_actions | Erik Johnston | 2018-02-26 | 4 | -28/+53 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update comments | Erik Johnston | 2018-02-21 | 1 | -3/+4 | |
| * | | | | | | | Fix unit tests | Erik Johnston | 2018-02-20 | 2 | -5/+7 | |
| * | | | | | | | Batch inserts into event_push_actions_staging | Erik Johnston | 2018-02-20 | 2 | -23/+45 | |
* | | | | | | | | Merge pull request #2894 from matrix-org/erikj/handle_unpersisted_events_push | Erik Johnston | 2018-02-26 | 3 | -35/+62 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/handle_unp... | Erik Johnston | 2018-02-26 | 15 | -687/+747 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #2900 from matrix-org/erikj/split_event_push_actions | Erik Johnston | 2018-02-23 | 2 | -91/+77 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_even... | Erik Johnston | 2018-02-23 | 12 | -507/+570 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #2902 from matrix-org/erikj/split_events_store | Erik Johnston | 2018-02-23 | 3 | -370/+405 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Split EventsWorkerStore into separate file | Erik Johnston | 2018-02-23 | 3 | -361/+401 | |
| * | | | | | | | | | Update copyright | Erik Johnston | 2018-02-23 | 2 | -0/+2 | |
| * | | | | | | | | | Remove redundant clock | Erik Johnston | 2018-02-23 | 1 | -3/+0 | |
| * | | | | | | | | | _event_persist_queue shouldn't be in worker store | Erik Johnston | 2018-02-23 | 1 | -4/+4 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Split out get_events and co into a worker store | Erik Johnston | 2018-02-21 | 2 | -356/+352 | |
* | | | | | | | | | Merge pull request #2899 from matrix-org/erikj/split_pushers | Erik Johnston | 2018-02-23 | 2 | -13/+10 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update copyright | Erik Johnston | 2018-02-23 | 2 | -0/+2 | |
| * | | | | | | | | | Split PusherStore | Erik Johnston | 2018-02-21 | 2 | -13/+8 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2898 from matrix-org/erikj/split_push_rules_store | Erik Johnston | 2018-02-23 | 3 | -45/+64 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update copyright | Erik Johnston | 2018-02-23 | 3 | -0/+3 | |
| * | | | | | | | | | Split PushRulesStore | Erik Johnston | 2018-02-21 | 3 | -45/+61 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2897 from matrix-org/erikj/split_account_data | Erik Johnston | 2018-02-23 | 4 | -69/+74 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update copyright | Erik Johnston | 2018-02-23 | 3 | -0/+3 | |
| * | | | | | | | | Use absolute imports | Erik Johnston | 2018-02-23 | 3 | -5/+5 | |
| * | | | | | | | | Split AccountDataStore and TagStore | Erik Johnston | 2018-02-21 | 4 | -67/+69 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #2893 from matrix-org/erikj/delete_from_staging_fed | Erik Johnston | 2018-02-21 | 1 | -9/+17 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Delete from push_actions_staging in federation too | Erik Johnston | 2018-02-20 | 1 | -9/+17 | |
| | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | Update copyright | Erik Johnston | 2018-02-23 | 2 | -0/+2 | |
| | * | | | | | Split out EventPushActionWorkerStore | Erik Johnston | 2018-02-21 | 2 | -91/+76 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #2896 from matrix-org/erikj/split_receipts_store | Erik Johnston | 2018-02-20 | 3 | -74/+84 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Raise exception in abstract method | Erik Johnston | 2018-02-20 | 1 | -1/+1 | |
| * | | | | | | Fix comment | Erik Johnston | 2018-02-20 | 2 | -2/+2 | |
| * | | | | | | Use abstract base class to access stream IDs | Erik Johnston | 2018-02-20 | 2 | -17/+34 | |
| * | | | | | | Split ReceiptsStore | Erik Johnston | 2018-02-20 | 3 | -76/+69 | |
|/ / / / / / | ||||||
| | * | | | | Actually use new param | Erik Johnston | 2018-02-21 | 1 | -1/+3 | |
| | * | | | | Fix test | Erik Johnston | 2018-02-20 | 1 | -1/+1 | |
| | * | | | | Ensure all push actions are deleted from staging | Erik Johnston | 2018-02-20 | 2 | -2/+19 | |
| | * | | | | Refactor _set_push_actions_for_event_and_users_txn to use events_and_contexts | Erik Johnston | 2018-02-20 | 2 | -33/+41 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #2868 from matrix-org/erikj/refactor_media_storage | Erik Johnston | 2018-02-20 | 1 | -26/+11 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Make store_file use store_into_file | Erik Johnston | 2018-02-14 | 1 | -26/+11 | |
* | | | | | Merge pull request #2888 from bachp/pynacl-1.2.1 | Richard van der Hoff | 2018-02-19 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Update pynacl dependency to 1.2.1 or higher | Pascal Bach | 2018-02-19 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #2882 from matrix-org/rav/fix_purge_tablescan | Richard van der Hoff | 2018-02-16 | 1 | -1/+0 | |
|\ \ \ \ | ||||||
| * | | | | (Really) fix tablescan of event_push_actions on purge | Richard van der Hoff | 2018-02-16 | 1 | -1/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #2874 from matrix-org/erikj/creator_push_actions | Erik Johnston | 2018-02-16 | 9 | -46/+140 | |
|\ \ \ \ | ||||||
| * | | | | Fix typo of double is_highlight | Erik Johnston | 2018-02-16 | 1 | -1/+1 | |
| * | | | | Comments | Erik Johnston | 2018-02-16 | 3 | -1/+9 | |
| * | | | | Fix unit test | Erik Johnston | 2018-02-15 | 1 | -4/+6 | |
| * | | | | Ensure that we delete staging push actions on errors | Erik Johnston | 2018-02-15 | 2 | -3/+25 | |
| * | | | | Remove context.push_actions | Erik Johnston | 2018-02-15 | 5 | -20/+11 | |
| * | | | | Update event_push_actions table from staging table | Erik Johnston | 2018-02-15 | 2 | -22/+39 | |
| * | | | | Store push actions in staging area | Erik Johnston | 2018-02-15 | 3 | -0/+54 | |
|/ / / / | ||||||
* | | | | Merge pull request #2873 from matrix-org/erikj/event_creator_no_state | Erik Johnston | 2018-02-15 | 3 | -8/+51 | |
|\ \ \ \ | ||||||
| * | | | | Don't serialize current state over replication | Erik Johnston | 2018-02-15 | 3 | -8/+51 | |
|/ / / / | ||||||
* | | | | Merge pull request #2872 from matrix-org/erikj/event_worker_dont_log | Erik Johnston | 2018-02-15 | 1 | -1/+10 | |
|\ \ \ \ | ||||||
| * | | | | Don't log errors propogated from send_event | Erik Johnston | 2018-02-15 | 1 | -1/+10 | |
* | | | | | Merge pull request #2871 from matrix-org/erikj/event_creator_state | Erik Johnston | 2018-02-15 | 1 | -41/+41 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix state group storage bug in workers | Erik Johnston | 2018-02-15 | 1 | -41/+41 | |
|/ / / / | ||||||
* | | | | Merge pull request #2867 from matrix-org/rav/rework_purge | Richard van der Hoff | 2018-02-15 | 1 | -35/+83 | |
|\ \ \ \ | ||||||
| * | | | | purge_history: fix sqlite syntax error | Richard van der Hoff | 2018-02-14 | 1 | -1/+4 | |
| * | | | | purge_history: handle sqlite asshattery | Richard van der Hoff | 2018-02-14 | 1 | -19/+27 | |
| * | | | | purge_history: fix index use | Richard van der Hoff | 2018-02-14 | 1 | -0/+14 | |
| * | | | | Rework event purge to use a temporary table | Richard van der Hoff | 2018-02-14 | 1 | -35/+58 | |
* | | | | | Merge pull request #2769 from matrix-org/matthew/hit_the_gin | Richard van der Hoff | 2018-02-14 | 5 | -20/+110 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | remove overzealous exception handling | Richard van der Hoff | 2018-02-14 | 1 | -18/+10 | |
| * | | | | Merge branch 'matthew/gin_work_mem' into matthew/hit_the_gin | Richard van der Hoff | 2018-02-13 | 116 | -1790/+4182 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'develop' into matthew/gin_work_mem | Richard van der Hoff | 2018-02-13 | 40 | -629/+1256 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Factor out common code for search insert | Richard van der Hoff | 2018-02-04 | 1 | -33/+56 | |
| | * | | | | | Clean up work_mem handling | Richard van der Hoff | 2018-02-03 | 1 | -11/+41 | |
| | * | | | | | Move store_event_search_txn to SearchStore | Richard van der Hoff | 2018-02-03 | 2 | -37/+43 | |
| | * | | | | | Merge branch 'develop' into matthew/gin_work_mem | Richard van der Hoff | 2018-02-03 | 87 | -1120/+2820 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | oops | hera | 2018-01-09 | 2 | -2/+2 | |
| | * | | | | | | oops, tweak work_mem when actually storing | Matthew Hodgson | 2018-01-09 | 1 | -0/+2 | |
| | * | | | | | | avoid 80s GIN inserts by tweaking work_mem | Matthew Hodgson | 2018-01-09 | 1 | -0/+4 | |
| * | | | | | | | move search reindex to schema 47 | Richard van der Hoff | 2018-02-13 | 2 | -1/+1 | |
| * | | | | | | | GIN reindex: Fix syntax errors, improve exception handling | Richard van der Hoff | 2018-02-13 | 1 | -13/+27 | |
| * | | | | | | | Reinstate event_search_postgres_gist handler | Richard van der Hoff | 2018-02-02 | 3 | -6/+31 | |
| * | | | | | | | fix GIST->GIN switch | Matthew Hodgson | 2018-01-09 | 3 | -14/+37 | |
| * | | | | | | | switch back from GIST to GIN indexes | Matthew Hodgson | 2018-01-09 | 1 | -8/+13 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 12 | -25/+534 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Update docs | Erik Johnston | 2018-02-13 | 1 | -1/+4 | |
| * | | | | | | Update workers docs to include http port | Erik Johnston | 2018-02-12 | 1 | -5/+20 | |
| * | | | | | | Add note in docs/workers.rst | Erik Johnston | 2018-02-07 | 1 | -0/+11 | |
| * | | | | | | Move presence handling into handle_new_client_event | Erik Johnston | 2018-02-07 | 1 | -6/+6 | |
| * | | | | | | Add event_creator worker | Erik Johnston | 2018-02-07 | 3 | -1/+190 | |
| * | | | | | | Add replication http endpoint for event sending | Erik Johnston | 2018-02-07 | 8 | -13/+304 | |
* | | | | | | | Fix log message in purge_history | Richard van der Hoff | 2018-02-13 | 1 | -2/+1 | |
* | | | | | | | Merge pull request #2864 from matrix-org/rav/persist_event_caching | Richard van der Hoff | 2018-02-13 | 2 | -60/+70 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | style nit | Richard van der Hoff | 2018-02-13 | 1 | -1/+1 | |
| * | | | | | | | Use StateResolutionHandler to resolve state in persist events | Richard van der Hoff | 2018-02-05 | 1 | -48/+24 | |
| * | | | | | | | Flatten _get_new_state_after_events | Richard van der Hoff | 2018-02-05 | 1 | -44/+46 | |
| * | | | | | | | Check that events being persisted have state_group | Richard van der Hoff | 2018-02-05 | 1 | -4/+9 | |
| * | | | | | | | Add event_map param to resolve_state_groups | Richard van der Hoff | 2018-02-05 | 2 | -4/+31 | |
* | | | | | | | | Fix typos in purge api & doc | Richard van der Hoff | 2018-02-13 | 2 | -4/+2 | |
* | | | | | | | | Merge pull request #2695 from okurz/feature/allow_recent_pysaml | Richard van der Hoff | 2018-02-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Allow use of higher versions of saml2 | Oliver Kurz | 2017-11-20 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #2857 from matrix-org/erikj/upload_store | Erik Johnston | 2018-02-12 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Tell storage providers about new file so they can upload | Erik Johnston | 2018-02-07 | 1 | -0/+6 | |
* | | | | | | | | | Merge pull request #2858 from matrix-org/rav/purge_updates | Richard van der Hoff | 2018-02-09 | 5 | -41/+100 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | purge: move room_depth update to end | Richard van der Hoff | 2018-02-09 | 1 | -6/+12 | |
| * | | | | | | | | | delete_local_events for purge_history | Richard van der Hoff | 2018-02-09 | 5 | -15/+67 | |
| * | | | | | | | | | purge: Move cache invalidation to more appropriate place | Richard van der Hoff | 2018-02-09 | 1 | -4/+4 | |
| * | | | | | | | | | bump purge logging to info | Richard van der Hoff | 2018-02-09 | 1 | -13/+14 | |
| * | | | | | | | | | rename delete_old_state -> purge_history | Richard van der Hoff | 2018-02-09 | 2 | -8/+8 | |
* | | | | | | | | | | Merge pull request #2856 from matrix-org/erikj/remove_ratelimit | Erik Johnston | 2018-02-07 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Remove pointless ratelimit check | Erik Johnston | 2018-02-07 | 1 | -5/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #2847 from matrix-org/erikj/separate_event_creation | Erik Johnston | 2018-02-06 | 10 | -196/+217 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update copyright | Erik Johnston | 2018-02-06 | 6 | -1/+6 | |
| * | | | | | | | | s/_create_new_client_event/create_new_client_event/ | Erik Johnston | 2018-02-06 | 4 | -12/+12 | |
| * | | | | | | | | Updates tests | Erik Johnston | 2018-02-05 | 2 | -8/+6 | |
| * | | | | | | | | Update places where we create events | Erik Johnston | 2018-02-05 | 7 | -38/+42 | |
| * | | | | | | | | Split event creation into a separate handler | Erik Johnston | 2018-02-05 | 1 | -146/+160 | |
* | | | | | | | | | Store state groups separately from events (#2784) | Erik Johnston | 2018-02-06 | 12 | -189/+326 | |
* | | | | | | | | | Merge pull request #2849 from matrix-org/rav/clean_up_state_delta | Richard van der Hoff | 2018-02-05 | 1 | -10/+23 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Remove redundant return value from _calculate_state_delta | Richard van der Hoff | 2018-02-05 | 1 | -10/+23 | |
* | | | | | | | | | Merge pull request #2848 from matrix-org/rav/refactor_search_insert | Richard van der Hoff | 2018-02-05 | 2 | -59/+94 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Factor out common code for search insert | Richard van der Hoff | 2018-02-05 | 1 | -33/+62 | |
| * | | | | | | | | Move store_event_search_txn to SearchStore | Richard van der Hoff | 2018-02-05 | 2 | -35/+41 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #2844 from matrix-org/rav/evicted_metrics | Richard van der Hoff | 2018-02-05 | 5 | -5/+56 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | report metrics on number of cache evictions | Richard van der Hoff | 2018-02-05 | 5 | -5/+56 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Fix broken unit test for media storage | Erik Johnston | 2018-02-05 | 1 | -1/+6 | |
* | | | | | | | Add .vscode to gitignore | Erik Johnston | 2018-02-05 | 1 | -0/+2 | |
* | | | | | | | Merge pull request #2791 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-02-05 | 6 | -12/+156 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add unit tests | Erik Johnston | 2018-01-18 | 3 | -0/+109 | |
| * | | | | | | | Use better file consumer | Erik Johnston | 2018-01-18 | 1 | -5/+10 | |
| * | | | | | | | Ensure media is in local cache before thumbnailing | Erik Johnston | 2018-01-18 | 3 | -10/+40 | |
* | | | | | | | | Merge pull request #2845 from matrix-org/rav/urlcache_error_handling | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Handle url_previews with no content-type | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2842 from matrix-org/rav/state_resolution_handler | Richard van der Hoff | 2018-02-02 | 5 | -66/+119 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Factor out resolve_state_groups to a separate handler | Richard van der Hoff | 2018-02-01 | 4 | -54/+108 | |
| * | | | | | | | | Rename resolve_state_groups -> resolve_state_groups_for_events | Richard van der Hoff | 2018-02-01 | 2 | -12/+11 | |
* | | | | | | | | | Merge pull request #2841 from matrix-org/rav/refactor_calc_state_delta | Richard van der Hoff | 2018-02-02 | 1 | -18/+39 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | factor _get_new_state_after_events out of _calculate_state_delta | Richard van der Hoff | 2018-01-31 | 1 | -18/+39 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2836 from matrix-org/rav/resolve_state_events_docstring | Richard van der Hoff | 2018-02-02 | 1 | -8/+28 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | doc arg types for _seperate | Richard van der Hoff | 2018-02-01 | 1 | -0/+15 | |
| * | | | | | | | | | More docstring fixes | Richard van der Hoff | 2018-02-01 | 1 | -4/+4 | |
| * | | | | | | | | | Fix docstring for StateHandler.resolve_state_groups | Richard van der Hoff | 2018-02-01 | 1 | -4/+9 | |
* | | | | | | | | | | Merge pull request #2818 from turt2live/travis/admin-list-media | Richard van der Hoff | 2018-02-02 | 3 | -56/+142 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'develop' into travis/admin-list-media | Travis Ralston | 2018-02-01 | 47 | -386/+716 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2837 from matrix-org/rav/fix_quarantine_media | Richard van der Hoff | 2018-02-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix sql error in quarantine_media | Richard van der Hoff | 2018-01-30 | 1 | -1/+1 | |
| | |/ / / / / / / | |/| | | | | | | |