Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Convert EventContext to attrs (#6218) | Richard van der Hoff | 2019-10-28 | 1 | -1/+6 | |
| | * | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keys | Hubert Chathi | 2019-10-25 | 2 | -0/+33 | |
| | |\ \ \ | ||||||
| | | * | | | delete keys when deleting backups | Hubert Chathi | 2019-10-24 | 2 | -0/+33 | |
| | | | |/ | | | |/| | ||||||
| | * | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-25 | 1 | -67/+67 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | * | | Fix /keys/query API on workers. | Erik Johnston | 2019-10-25 | 1 | -67/+67 | |
| | | |/ | ||||||
| | * | | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_logging | Erik Johnston | 2019-10-25 | 1 | -3/+1 | |
| | |\ \ | ||||||
| | | * | | Address codestyle concerns | Michael Kaye | 2019-10-24 | 1 | -3/+1 | |
| | | * | | use %r to __repr__ objects | Michael Kaye | 2019-10-24 | 1 | -1/+1 | |
| | | |/ | ||||||
| | * / | Make user/room stats log line less verbose. | Michael Kaye | 2019-10-24 | 1 | -1/+1 | |
| | |/ | ||||||
| * | | Review comments | Erik Johnston | 2019-10-30 | 3 | -10/+26 | |
| * | | Add DataStores and Storage classes. | Erik Johnston | 2019-10-23 | 3 | -4/+34 | |
| * | | Move persist_events out from main data store. | Erik Johnston | 2019-10-23 | 2 | -634/+711 | |
* | | | apply changes as a result of PR review | Hubert Chathi | 2019-10-30 | 1 | -43/+36 | |
* | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-24 | 241 | -4341/+4597 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Move schema delta files to the correct data store. | Erik Johnston | 2019-10-24 | 2 | -0/+0 | |
| |/ | ||||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2019-10-22 | 1 | -11/+37 | |
| |\ | ||||||
| * | | Clean up prepare_database.py a bit and add comments | Erik Johnston | 2019-10-22 | 1 | -7/+30 | |
| * | | Delete background_update table creation in main data_store | Erik Johnston | 2019-10-22 | 1 | -21/+0 | |
| * | | Move README into synapse/storage/__init__.py | Erik Johnston | 2019-10-22 | 2 | -13/+12 | |
| * | | Add a basic README to synapse.storage | Erik Johnston | 2019-10-22 | 1 | -0/+13 | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2019-10-22 | 6 | -12/+337 | |
| |\ \ | ||||||
| * | | | Fix schema management to work with multiple data stores. | Erik Johnston | 2019-10-21 | 1 | -41/+108 | |
| * | | | Move storage classes into a main "data store". | Erik Johnston | 2019-10-21 | 239 | -4292/+4466 | |
* | | | | move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with wor... | Hubert Chathi | 2019-10-23 | 1 | -67/+67 | |
* | | | | vendor-prefix the EDU name until MSC1756 is merged into the spec | Hubert Chathi | 2019-10-22 | 1 | -1/+2 | |
* | | | | update to work with newer code, and fix formatting | Hubert Chathi | 2019-10-22 | 1 | -1/+1 | |
* | | | | make black happy | Hubert Chathi | 2019-10-22 | 1 | -22/+32 | |
* | | | | don't crash if the user doesn't have cross-signing keys | Hubert Chathi | 2019-10-22 | 1 | -14/+25 | |
* | | | | implement federation parts of cross-signing | Hubert Chathi | 2019-10-22 | 1 | -5/+51 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 38 | -908/+1949 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 38 | -903/+1945 | |
| |\| | ||||||
| | * | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Hubert Chathi | 2019-10-11 | 1 | -4/+14 | |
| | |\ | ||||||
| | | * | expand on comment | Hubert Chathi | 2019-10-11 | 1 | -1/+2 | |
| | | * | make sure we actually return something | Hubert Chathi | 2019-10-10 | 1 | -2/+4 | |
| | | * | make storage layer in charge of interpreting the device key data | Hubert Chathi | 2019-10-10 | 1 | -2/+9 | |
| | * | | Fix MAU reaping where reserved users are specified. (#6168) | Neil Johnson | 2019-10-11 | 1 | -39/+62 | |
| | * | | Merge pull request #6156 from matrix-org/erikj/postgres_any | Erik Johnston | 2019-10-10 | 14 | -109/+189 | |
| | |\ \ | ||||||
| | | * | | Fix SQLite take 2 | Erik Johnston | 2019-10-10 | 1 | -1/+1 | |
| | | * | | Fix SQLite | Erik Johnston | 2019-10-10 | 1 | -1/+1 | |
| | | * | | Remove add_in_list_sql_clause | Erik Johnston | 2019-10-10 | 4 | -34/+25 | |
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any | Erik Johnston | 2019-10-10 | 1 | -3/+4 | |
| | | |\ \ | ||||||
| | | * | | | Replace IN usage with helper funcs | Erik Johnston | 2019-10-10 | 11 | -97/+138 | |
| | | * | | | Add helper funcs to use postgres ANY | Erik Johnston | 2019-10-10 | 1 | -8/+56 | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... | Erik Johnston | 2019-10-10 | 1 | -3/+4 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-10 | 2 | -35/+61 | |
| | | |\| | | ||||||
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-09 | 23 | -706/+1180 | |
| | | |\ \ \ | | | | | |/ | | | | |/| | ||||||
| | | * | | | Patch inlinecallbacks for log contexts | Erik Johnston | 2019-09-27 | 2 | -4/+5 | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... | Erik Johnston | 2019-10-10 | 16 | -725/+1030 | |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | | * | | | Fix races in room stats (and other) updates. (#6187) | Richard van der Hoff | 2019-10-10 | 1 | -9/+29 | |
| | | * | | | Rewrite the user_filter migration again (#6184) | Richard van der Hoff | 2019-10-10 | 1 | -26/+32 | |
| | | | |/ | | | |/| | ||||||
| | | * | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets | Erik Johnston | 2019-10-09 | 2 | -4/+28 | |
| | | |\ \ | ||||||
| | | * | | | Fix RegistrationStore | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 | |
| | | * | | | Cleanup client_ips | Brendan Abolivier | 2019-10-08 | 1 | -7/+0 | |
| | | * | | | Don't end up with 4 classes in registration | Brendan Abolivier | 2019-10-08 | 1 | -52/+50 | |
| | | * | | | Lint | Brendan Abolivier | 2019-10-07 | 3 | -3/+3 | |
| | | * | | | Move roommember's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -108/+114 | |
| | | * | | | Move user_directory's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -84/+94 | |
| | | * | | | Move state's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -190/+204 | |
| | | * | | | Move search's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -25/+31 | |
| | | * | | | Move registration's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -95/+103 | |
| | | * | | | Move media_repository's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -3/+9 | |
| | | * | | | Move devices's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -22/+27 | |
| | | * | | | Move deviceinbox's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -15/+22 | |
| | | * | | | Move client_ips's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -94/+106 | |
| | | * | | | add some logging to the rooms stats updates, to try to track down a flaky tes... | Richard van der Hoff | 2019-10-07 | 1 | -0/+3 | |
| | | * | | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index | Brendan Abolivier | 2019-10-07 | 1 | -2/+2 | |
| | | |\ \ \ | ||||||
| | | | * | | | Fix unique_user_filter_index schema update | Brendan Abolivier | 2019-10-07 | 1 | -2/+2 | |
| | | * | | | | Merge pull request #6159 from matrix-org/erikj/cache_memberships | Erik Johnston | 2019-10-07 | 1 | -19/+45 | |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | ||||||
| | | | * | | | Fix bug where we didn't pull out event ID | Erik Johnston | 2019-10-07 | 1 | -1/+1 | |
| | | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memb... | Erik Johnston | 2019-10-03 | 1 | -6/+15 | |
| | | | |\ \ \ | ||||||
| | | | * | | | | Use the right error.... | Erik Johnston | 2019-10-03 | 1 | -1/+1 | |
| | | | * | | | | pep8 | Erik Johnston | 2019-10-03 | 1 | -1/+0 | |
| | | | * | | | | Fixup names and comments | Erik Johnston | 2019-10-03 | 1 | -6/+7 | |
| | | | * | | | | cachedList descriptor doesn't like typing | Erik Johnston | 2019-10-03 | 1 | -2/+2 | |
| | | | * | | | | Cache room membership lookups in _get_joined_users_from_context | Erik Johnston | 2019-10-03 | 1 | -19/+45 | |
| | | * | | | | | Update `user_filters` table to have a unique index, and non-null columns (#1172) | Alexander Maznev | 2019-10-04 | 1 | -0/+46 | |
| | | | |/ / / | | | |/| | | | ||||||
| | | * | | | | add some metrics on the federation sender (#6160) | Richard van der Hoff | 2019-10-03 | 1 | -6/+15 | |
| | | |/ / / | ||||||
| | | * | | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination | Erik Johnston | 2019-10-02 | 1 | -18/+18 | |
| | | |\ \ \ | ||||||
| | | | * | | | Fix appservice room list pagination | Erik Johnston | 2019-10-02 | 1 | -18/+18 | |
| | | * | | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable | Erik Johnston | 2019-10-02 | 1 | -0/+3 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Fix not showing non-federatable rooms to remote room list queries | Erik Johnston | 2019-10-02 | 1 | -0/+3 | |
| | | | |/ / / | ||||||
| | | * | | | | Merge pull request #6148 from matrix-org/erikj/find_next_generated | Erik Johnston | 2019-10-02 | 1 | -1/+3 | |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | ||||||
| | | | * | | | Bound find_next_generated_user_id DB query. | Erik Johnston | 2019-10-02 | 1 | -1/+3 | |
| | | * | | | | Fix public room list pagination. | Erik Johnston | 2019-10-02 | 1 | -17/+36 | |
| | | * | | | | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 2 | -77/+167 | |
| | | * | | | | Fix yields and copy instead of move push rules on room upgrade (#6144) | Andrew Morgan | 2019-10-02 | 1 | -10/+6 | |
| | | |/ / / | ||||||
| | | * | | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-02 | 5 | -18/+142 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s... | Erik Johnston | 2019-10-01 | 3 | -7/+54 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Drop unused tables (#6115) | Richard van der Hoff | 2019-09-30 | 1 | -0/+20 | |
| | | | |_|_|/ | | | |/| | | | ||||||
| | * | | | | | Do the update as a background index | Erik Johnston | 2019-10-09 | 2 | -9/+51 | |
| | * | | | | | Disable bytes usage with postgres | Erik Johnston | 2019-10-08 | 3 | -3/+10 | |
| | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Fix existing hex encoded json values in DB | Erik Johnston | 2019-10-08 | 1 | -0/+26 | |
| | * | | | | Fix inserting bytes as text | Erik Johnston | 2019-10-08 | 1 | -4/+2 | |
| | | |_|/ | | |/| | | ||||||
| | * | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings | Erik Johnston | 2019-10-02 | 1 | -0/+18 | |
| | |\ \ \ | ||||||
| | | * | | | Fix errors storing large retry intervals. | Erik Johnston | 2019-10-02 | 1 | -0/+18 | |
| | * | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions | Erik Johnston | 2019-10-02 | 1 | -0/+14 | |
| | |\ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | | * | | | Fix fetching censored redactions from DB | Erik Johnston | 2019-10-02 | 1 | -0/+14 | |
| | | | |/ | | | |/| | ||||||
| | * | | | Use `received_ts` to find uncensored redacted events | Erik Johnston | 2019-10-01 | 1 | -14/+7 | |
| | * | | | Add received_ts column to redactions. | Erik Johnston | 2019-10-01 | 3 | -9/+92 | |
| | * | | | Don't repeatedly attempt to censor events we don't have. | Erik Johnston | 2019-10-01 | 1 | -1/+17 | |
| | |/ / | ||||||
| | * / | Fix `devices_last_seen` background update. | Erik Johnston | 2019-09-30 | 3 | -7/+54 | |
| | |/ | ||||||
| | * | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 1 | -3/+15 | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us... | Erik Johnston | 2019-09-25 | 4 | -9/+94 | |
| | |\ | ||||||
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us... | Erik Johnston | 2019-09-25 | 3 | -8/+93 | |
| | | |\ | ||||||
| | | | * | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv... | Brendan Abolivier | 2019-09-24 | 2 | -6/+6 | |
| | | | |\ | ||||||
| | | | | * | Incorporate review | Brendan Abolivier | 2019-09-24 | 1 | -3/+3 | |
| | | | | * | Fix logging | Brendan Abolivier | 2019-09-24 | 1 | -1/+1 | |
| | | | | * | Typo | Brendan Abolivier | 2019-09-23 | 1 | -1/+1 | |
| | | | | * | Fix the return value in the users_set_deactivated_flag background job | Brendan Abolivier | 2019-09-23 | 1 | -4/+4 | |
| | | | * | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 1 | -1/+1 | |
| | | | |\ \ | ||||||
| | | | | * | | remove unused parameter to get_user_id_by_threepid (#6099) | Richard van der Hoff | 2019-09-24 | 1 | -1/+1 | |
| | | | | |/ | ||||||
| | | | * | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 2 | -28/+45 | |
| | | | |\| | ||||||
| | | | | * | Implement MSC2290 (#6043) | Andrew Morgan | 2019-09-23 | 1 | -1/+21 | |
| | | | * | | Merge branch 'develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-19 | 28 | -552/+1649 | |
| | | | |\ \ | ||||||
| | | | * | | | Record mappings from saml users in an external table | Richard van der Hoff | 2019-09-13 | 2 | -0/+65 | |
| | | * | | | | Use if `is not None` | Erik Johnston | 2019-09-25 | 1 | -1/+1 | |
| | * | | | | | Review comments | Erik Johnston | 2019-09-25 | 2 | -5/+2 | |
| | * | | | | | Prune rows in user_ips older than configured period | Erik Johnston | 2019-09-24 | 1 | -8/+54 | |
| | * | | | | | Add has_completed_background_update | Erik Johnston | 2019-09-24 | 1 | -1/+24 | |
| | |/ / / / | ||||||
| | * | | | | Query devices table for last seen info. | Erik Johnston | 2019-09-23 | 1 | -49/+8 | |
| | * | | | | Add BG update to populate devices last seen info | Erik Johnston | 2019-09-23 | 2 | -0/+55 | |
| | * | | | | Add last seen info to devices table. | Erik Johnston | 2019-09-23 | 2 | -0/+36 | |
| | | |_|/ | | |/| | | ||||||
| | * | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2019-09-20 | 1 | -7/+24 | |
| | * | | | Undo the deletion of some tables (#6047) | Richard van der Hoff | 2019-09-19 | 1 | -20/+0 | |
| | | |/ | | |/| | ||||||
| | * | | Add 'failure_ts' column to 'destinations' table (#6016) | Richard van der Hoff | 2019-09-17 | 2 | -7/+41 | |
| | * | | Clean up some code in the retry logic (#6017) | Richard van der Hoff | 2019-09-11 | 1 | -20/+0 | |
| | * | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Jason Robinson | 2019-09-09 | 1 | -0/+37 | |
| | |\ \ | ||||||
| | | * | | Fix code style, again | Jason Robinson | 2019-09-09 | 1 | -3/+1 | |
| | | * | | Simplify count_real_users SQL to only count user_type is null rows | Jason Robinson | 2019-09-09 | 1 | -1/+1 | |
| | | * | | Simplify is_real_user_txn check to trust user_type is null if real user | Jason Robinson | 2019-09-09 | 1 | -1/+1 | |
| | | * | | Auto-fix a few code style issues | Jason Robinson | 2019-09-09 | 1 | -4/+4 | |
| | | * | | Only count real users when checking for auto-creation of auto-join room | Jason Robinson | 2019-09-09 | 1 | -0/+39 | |
| | * | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Erik Johnston | 2019-09-09 | 2 | -1/+119 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | Fix comments | Erik Johnston | 2019-09-09 | 1 | -2/+3 | |
| | | * | | Use better names in SQL | Erik Johnston | 2019-09-09 | 1 | -5/+8 | |
| | | * | | Fixup comment | Erik Johnston | 2019-09-09 | 1 | -4/+12 | |
| | | * | | Don't start looping call unless enabled | Erik Johnston | 2019-09-09 | 1 | -1/+2 | |
| | | * | | Handle setting retention period to 0 | Erik Johnston | 2019-09-09 | 1 | -1/+1 | |
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red... | Erik Johnston | 2019-09-05 | 16 | -378/+959 | |
| | | |\ \ | ||||||
| | | * | | | Make redaction retention period configurable | Erik Johnston | 2019-09-05 | 1 | -2/+4 | |
| | | * | | | Censor redactions in DB after a month | Erik Johnston | 2019-08-30 | 2 | -1/+104 | |
| * | | | | | use the right function for when we're already in runInteraction | Hubert Chathi | 2019-10-18 | 1 | -4/+4 | |
| * | | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 4 | -81/+142 | |
| |\| | | | | ||||||
* | | | | | | make changes based on PR feedback | Hubert Chathi | 2019-09-24 | 1 | -11/+6 | |
* | | | | | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 4 | -81/+142 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 1 | -0/+59 | |
| * | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag | Erik Johnston | 2019-09-06 | 1 | -1/+3 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Correctly handle non-bool m.federate flag | Erik Johnston | 2019-09-06 | 1 | -1/+3 | |
| | | |_|/ / | | |/| | | | ||||||
| * | | | | | Move delete_threepid_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -25/+25 | |
| * | | | | | Move get_threepid_validation_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -54/+54 | |
| |/ / / / | ||||||
| * | | | | Opentracing context cannot be none | Jorik Schellekens | 2019-09-05 | 1 | -1/+1 | |
* | | | | | make black happy | Hubert Chathi | 2019-09-04 | 1 | -15/+9 | |
* | | | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 1 | -1/+1 | |
* | | | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 1 | -0/+38 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 16 | -377/+958 | |
|\| | | | ||||||
| * | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 5 | -345/+904 | |
| * | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 3 | -4/+0 | |
| * | | | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 2 | -0/+26 | |
| * | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 10 | -28/+28 | |
| |/ / | ||||||
* | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 14 | -328/+653 | |
|\ \ \ | ||||||
| * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-08-28 | 14 | -307/+632 | |
| |\| | | ||||||
| | * | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 1 | -0/+1 | |
| | |\ \ | ||||||
| | | * | | Ignore consent for support users | Half-Shot | 2019-08-23 | 1 | -0/+1 | |
| | * | | | Fix a cache-invalidation bug for worker-based deployments (#5920) | Richard van der Hoff | 2019-08-28 | 1 | -8/+16 | |
| | * | | | Allow schema deltas to be engine-specific (#5911) | reivilibre | 2019-08-27 | 1 | -5/+19 | |
| | |\ \ \ | ||||||
| | | * | | | Code style (Black) | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -3/+1 | |
| | | * | | | Allow schema deltas to be engine-specific | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -5/+21 | |
| | | |/ / | ||||||
| | * / / | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 1 | -0/+23 | |
| | |/ / | ||||||
| | * | | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 2 | -6/+53 | |
| | * | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 2 | -3/+49 | |
| | * | | Add missing index on users_in_public_rooms. (#5894) | Richard van der Hoff | 2019-08-22 | 1 | -0/+17 | |
| | * | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 1 | -0/+137 | |
| | * | | Drop some unused tables. (#5893) | Richard van der Hoff | 2019-08-21 | 3 | -47/+22 | |
| | * | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_index | Hubert Chathi | 2019-08-16 | 2 | -1/+19 | |
| | |\ \ | | | |/ | | |/| | ||||||
| | | * | update set_e2e_room_key to agree with fixed index | Hubert Chathi | 2019-08-14 | 1 | -1/+1 | |
| | | * | add the version field to the index for e2e_room_keys | Hubert Chathi | 2019-08-14 | 1 | -0/+18 | |
| | * | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop | Erik Johnston | 2019-08-13 | 1 | -8/+22 | |
| | |\ \ | ||||||
| | | * | | Clarify docstring | Erik Johnston | 2019-08-13 | 1 | -1/+1 | |
| | | * | | Handle pusher being deleted during processing. | Erik Johnston | 2019-08-01 | 1 | -8/+22 | |
| | * | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pauses | Erik Johnston | 2019-08-13 | 1 | -128/+142 | |
| | |\ \ \ | ||||||
| | | * | | | Don't unnecessarily block notifying of new events. | Erik Johnston | 2019-08-06 | 1 | -128/+142 | |
| | | | |/ | | | |/| | ||||||
| | * | | | Merge pull request #5788 from matrix-org/rav/metaredactions | Richard van der Hoff | 2019-08-12 | 1 | -101/+112 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | Handle loops in redaction events | Richard van der Hoff | 2019-07-30 | 1 | -60/+36 | |
| | | * | | recursively fetch redactions | Richard van der Hoff | 2019-07-30 | 1 | -32/+36 | |
| | | * | | split _get_events_from_db out of _enqueue_events | Richard van der Hoff | 2019-07-29 | 1 | -32/+51 | |
| | | * | | Return dicts from _fetch_event_list | Richard van der Hoff | 2019-07-29 | 1 | -15/+27 | |
| * | | | | Cross-signing [1/4] -- hidden devices (#5759) | Hubert Chathi | 2019-08-12 | 3 | -10/+48 | |
| |/ / / | ||||||
| * | / | Have ClientReaderSlavedStore inherit RegistrationStore (#5806) | Andrew Morgan | 2019-08-01 | 1 | -21/+21 | |
| | |/ | |/| | ||||||
* | | | use stream ID generator instead of timestamp | Hubert Chathi | 2019-08-28 | 3 | -19/+20 | |
* | | | apply PR review suggestions | Hubert Chathi | 2019-08-21 | 2 | -10/+11 | |
* | | | make changes from PR review | Hubert Chathi | 2019-08-01 | 2 | -41/+55 | |
* | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 40 | -452/+566 | |
|\ \ \ | ||||||
| * | | | don't need to return the hidden column any more | Hubert Chathi | 2019-08-01 | 1 | -1/+1 | |
| * | | | really fix queries to work with Postgres | Hubert Chathi | 2019-07-31 | 1 | -19/+11 | |
| * | | | PostgreSQL, Y U no like? | Hubert Chathi | 2019-07-31 | 1 | -3/+4 | |
| * | | | remove extra SQL query param | Hubert Chathi | 2019-07-31 | 1 | -1/+0 | |
| * | | | Merge branch 'develop' into cross-signing_hidden | Hubert Chathi | 2019-07-30 | 40 | -432/+554 | |
| |\| | | ||||||
| | * | | Don't recreate column | Erik Johnston | 2019-07-30 | 2 | -1/+22 | |
| | * | | Fix current_state_events membership background update. | Erik Johnston | 2019-07-30 | 2 | -1/+1 | |
| | |/ | ||||||
| | * | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membership | Erik Johnston | 2019-07-29 | 1 | -0/+6 | |
| | |\ | ||||||
| | | * | Fix room summary when rejected events are in state | Erik Johnston | 2019-07-26 | 1 | -0/+6 | |
| | * | | Merge pull request #5752 from matrix-org/erikj/forgotten_user | Erik Johnston | 2019-07-29 | 2 | -35/+123 | |
| | |\ \ | ||||||
| | | * | | Expand comment | Erik Johnston | 2019-07-29 | 1 | -0/+5 | |
| | | * | | Remove lost comment | Erik Johnston | 2019-07-29 | 1 | -7/+0 | |
| | | |/ | ||||||
| | | * | Remove join when calculating room summaries. | Erik Johnston | 2019-07-24 | 1 | -13/+21 | |
| | | * | Remove join on room_memberships when fetching rooms for user. | Erik Johnston | 2019-07-24 | 1 | -22/+36 | |
| | | * | Add function to get all forgotten rooms for user | Erik Johnston | 2019-07-24 | 2 | -0/+68 | |
| | * | | Fix current_state bg update to work on old SQLite | Erik Johnston | 2019-07-29 | 1 | -2/+2 | |
| | * | | Merge branch 'master' into develop | Richard van der Hoff | 2019-07-26 | 1 | -0/+4 | |
| | |\ \ | ||||||
| | | * | | Fix DoS when there is a cycle in redaction events | Richard van der Hoff | 2019-07-26 | 1 | -0/+4 | |
| | * | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_id | Richard van der Hoff | 2019-07-25 | 1 | -0/+27 | |
| | |\| | | ||||||
| | | * | | log when a redaction attempts to redact an event in a different room | Richard van der Hoff | 2019-07-25 | 1 | -0/+27 | |
| | * | | | Stop trying to fetch events with event_id=None. (#5753) | Richard van der Hoff | 2019-07-24 | 2 | -10/+15 | |
| | * | | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 37 | -362/+321 | |
| | | |/ | | |/| | ||||||
| | * | | Speed up current state background update. | Erik Johnston | 2019-07-23 | 1 | -18/+30 | |
| | * | | Add `user_type` to returned fields in admin API user list endpoints | Jason Robinson | 2019-07-22 | 1 | -3/+3 | |
* | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-07-30 | 3 | -21/+17 | |
|\| | | | ||||||
| * | | | apply changes from PR review | Hubert Chathi | 2019-07-30 | 3 | -20/+17 | |
* | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 4 | -3/+274 | |
|/ / / | ||||||
* / / | allow devices to be marked as "hidden" | Hubert Chathi | 2019-07-24 | 2 | -16/+65 | |
|/ / | ||||||
* | | Merge pull request #5720 from matrix-org/erikj/transactions_upsert | Erik Johnston | 2019-07-19 | 1 | -0/+20 | |
|\ \ | ||||||
| * | | Use upsert when updating destination retry interval | Erik Johnston | 2019-07-19 | 1 | -0/+20 | |
| |/ | ||||||
* | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_state | Erik Johnston | 2019-07-19 | 1 | -2/+6 | |
|\ \ | ||||||
| * | | Delegate to cached version when using get_filtered_current_state_ids | Erik Johnston | 2019-07-18 | 1 | -2/+6 | |
| |/ | ||||||
* | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_state | Erik Johnston | 2019-07-19 | 7 | -41/+194 | |
|\ \ | |/ |/| | ||||||
| * | LoggingTransaction accepts None for callback lists. | Erik Johnston | 2019-07-19 | 3 | -6/+16 | |
| * | Update comment for new column | Erik Johnston | 2019-07-19 | 1 | -0/+3 | |
| * | Use the current_state_events.membership column | Erik Johnston | 2019-07-18 | 1 | -17/+37 | |
| * | Track if current_state_events.membership is up to date | Erik Johnston | 2019-07-18 | 1 | -0/+45 | |
| * | Add background update for current_state_events.membership column | Erik Johnston | 2019-07-18 | 2 | -0/+54 | |
| * | Add membership column to current_state_events table. | Erik Johnston | 2019-07-18 | 5 | -20/+41 | |
* | | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -0/+12 | |
* | | More refactoring in `get_events_as_list` (#5707) | Richard van der Hoff | 2019-07-17 | 1 | -27/+37 | |
* | | Fix redaction authentication (#5700) | Richard van der Hoff | 2019-07-17 | 1 | -85/+129 | |
* | | Refactor `get_events_as_list` (#5699) | Richard van der Hoff | 2019-07-17 | 1 | -48/+74 | |
|/ | ||||||
* | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Erik Johnston | 2019-07-15 | 2 | -6/+28 | |
|\ | ||||||
| * | Fixup docstrings | Erik Johnston | 2019-07-12 | 1 | -7/+5 | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi... | Erik Johnston | 2019-07-05 | 6 | -39/+25 | |
| |\ | ||||||
| * | | Assume key existence. Update docstrings | Erik Johnston | 2019-07-05 | 1 | -6/+10 | |
| * | | Add basic function to get all data for a user out of synapse | Erik Johnston | 2019-07-02 | 1 | -0/+20 | |
* | | | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 2 | -5/+32 | |
* | | | fix typo: backgroud -> background | Andrew Morgan | 2019-07-12 | 1 | -4/+4 | |
* | | | small typo fix (#5655) | Andrew Morgan | 2019-07-11 | 1 | -1/+1 | |
* | | | Remove access-token support from RegistrationStore.register (#5642) | Richard van der Hoff | 2019-07-10 | 1 | -20/+4 | |
* | | | Include the original event in /relations (#5626) | Andrew Morgan | 2019-07-09 | 1 | -1/+1 | |
* | | | Remove support for invite_3pid_guest. (#5625) | Richard van der Hoff | 2019-07-05 | 1 | -47/+0 | |
| |/ |/| | ||||||
* | | remove dead transaction persist code (#5622) | Richard van der Hoff | 2019-07-05 | 1 | -28/+0 | |
* | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 4 | -7/+7 | |
* | | Fix a number of "Starting txn from sentinel context" warnings (#5605) | Richard van der Hoff | 2019-07-03 | 2 | -4/+18 | |
|/ | ||||||
* | Review comments | Erik Johnston | 2019-06-27 | 1 | -3/+1 |