Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow forgetting rooms you're banned from | David Baker | 2017-02-15 | 1 | -1/+3 |
| | |||||
* | Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_work | David Baker | 2017-02-14 | 1 | -0/+5 |
|\ | | | | | Make kick & ban reasons work | ||||
| * | Make kick & ban reasons work | David Baker | 2017-02-14 | 1 | -0/+5 |
| | | | | | | | | | | | | We somehow specced APIs with reason strings, preserve the content in the events and even have the clients display them, but failed to actually pass the parameter through to the event content. | ||||
* | | Merge pull request #1873 from matrix-org/erikj/delete_push_actions | Erik Johnston | 2017-02-14 | 1 | -3/+8 |
|\ \ | | | | | | | Be more agressive about purging old room event_push_actions | ||||
| * | | Be more agressive about purging old room event_push_actions | Erik Johnston | 2017-02-01 | 1 | -3/+8 |
| | | | |||||
* | | | Merge pull request #1914 from matrix-org/erikj/cache_presence | Erik Johnston | 2017-02-13 | 3 | -5/+15 |
|\ \ \ | | | | | | | | | Cache get_presence storage | ||||
| * | | | Cache get_presence storage | Erik Johnston | 2017-02-13 | 3 | -5/+15 |
| | | | | |||||
* | | | | Merge pull request #1913 from matrix-org/kegan/dont-cache-errors | Erik Johnston | 2017-02-13 | 1 | -3/+11 |
|\ \ \ \ | |/ / / |/| | | | http txns: Do not cache error responses | ||||
| * | | | Ordering is important on errbacks so add the cleanup func before creating an ↵ | Kegan Dougal | 2017-02-13 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | ObservableDeferred | ||||
| * | | | Pop the txn from the map in case it has already been deleted somehow | Kegan Dougal | 2017-02-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Don't cache errors at all | Kegan Dougal | 2017-02-13 | 1 | -10/+9 |
| | | | | |||||
| * | | | http txns: Do not cache error responses | Kegan Dougal | 2017-02-13 | 1 | -1/+10 |
|/ / / | | | | | | | | | | | | | Previously we did. This meant that, amongst other errors, rate-limiting errors would be cached and prevent messages with that txn ID being sent. | ||||
* | | | Merge pull request #1912 from matrix-org/markjh/roominitialsync | Erik Johnston | 2017-02-13 | 2 | -0/+10 |
|\ \ \ | | | | | | | | | Add db functions needed for room initial sync to slave | ||||
| * | | | Add db functions needed for room initial sync to slave | Mark Haines | 2017-02-13 | 2 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #1907 from andrewshadura/develop | Erik Johnston | 2017-02-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use signedjson.sign instead of syutil.crypto.jsonsign | ||||
| * | | | | Use signedjson.sign instead of syutil.crypto.jsonsign | Andrew Shadura | 2017-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions from syutil.crypto.jsonsign are now available in signedjson, so use that instead of depending on syutil. Signed-off-by: Andrew Shadura <andrew@shadura.me> | ||||
* | | | | | Merge pull request #1906 from tyler-smith/TS_fix_config_documentation | Erik Johnston | 2017-02-13 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix typo in config comments. | ||||
| * | | | | Fix typo in config comments. | Tyler Smith | 2017-02-11 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Tyler Smith <tylersmith.me@gmail.com> | ||||
* | | | | Merge pull request #1896 from DanielDent/patch-1 | Erik Johnston | 2017-02-09 | 1 | -3/+2 |
|\ \ \ \ | | | | | | | | | | | Update CAPTCHA_SETUP.rst X-Forwarded-For docs | ||||
| * | | | | Update CAPTCHA_SETUP.rst X-Forwarded-For docs | Daniel Dent | 2017-02-08 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | It looks like CAPTCHA_SETUP.rst contains information relevant to an old version of Synapse, but Synapse now has a different approach to configuring use of the X-Forwarded-For header. | ||||
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-02-09 | 2 | -1/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'release-v0.19.1' of github.com:matrix-org/synapse v0.19.1 | Erik Johnston | 2017-02-09 | 3 | -10/+14 |
| |\ \ \ \ | |||||
| | * | | | | Update version and changelog github/release-v0.19.1 release-v0.19.1 | Erik Johnston | 2017-02-09 | 2 | -1/+8 |
| | | | | | | |||||
* | | | | | | Make None check explicit | Erik Johnston | 2017-02-08 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #1892 from matrix-org/erikj/rejection_fwd_extrem | Erik Johnston | 2017-02-08 | 1 | -9/+6 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | | Ignore new rejected events when working out forward extremities. | ||||
| * | | | | Ignore new rejected events when working out forward extremeties. | Erik Johnston | 2017-02-08 | 1 | -9/+6 |
| |/ / / | |||||
* | | | | Merge pull request #1891 from matrix-org/dbkr/remove_unused_constants | David Baker | 2017-02-08 | 1 | -3/+0 |
|\ \ \ \ | | | | | | | | | | | Remove a few aspirational but unused constants | ||||
| * | | | | Remove a few aspirational but unused constants | David Baker | 2017-02-08 | 1 | -3/+0 |
|/ / / / | | | | | | | | | | | | | from the Kegan era | ||||
* | | | | Merge pull request #1784 from morteza-araby/user-admin | Erik Johnston | 2017-02-06 | 5 | -3/+502 |
|\ \ \ \ | | | | | | | | | | | Administration functionalities | ||||
| * | | | | admin,storage: added more administrator functionalities | Morteza Araby | 2017-02-02 | 5 | -3/+502 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | administrators can now: - Set displayname of users - Update user avatars - Search for users by user_id - Browse all users in a paginated API - Reset user passwords - Deactivate users Helpers for doing paginated queries has also been added to storage Signed-off-by: Morteza Araby <morteza.araby@ericsson.com> | ||||
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-02-04 | 2 | -1/+76 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'release-v0.19.0' of github.com:matrix-org/synapse v0.19.0 | Erik Johnston | 2017-02-04 | 102 | -1798/+3629 |
| |\ \ \ \ | |||||
| | * | | | | Bump changelog and version github/release-v0.19.0 release-v0.19.0 | Erik Johnston | 2017-02-04 | 2 | -1/+7 |
| | | | | | | |||||
| | * | | | | Bump changelog and version v0.19.0-rc4 | Erik Johnston | 2017-02-02 | 2 | -2/+8 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0 | Erik Johnston | 2017-02-02 | 3 | -4/+9 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1879 from matrix-org/erikj/bump_cache_factors | Erik Johnston | 2017-02-02 | 1 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Bump cache sizes for common membership queries | ||||
| * | | | | | | Bump cache sizes for common membership queries | Erik Johnston | 2017-02-02 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1878 from matrix-org/erikj/device_measure | Erik Johnston | 2017-02-02 | 2 | -1/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Measure new device list stuff | ||||
| * | | | | | | Measure new device list stuff | Erik Johnston | 2017-02-02 | 2 | -1/+6 |
|/ / / / / / | |||||
| | * | | | | Bump version and changelog v0.19.0-rc3 | Erik Johnston | 2017-02-02 | 2 | -5/+14 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0 | Erik Johnston | 2017-02-02 | 16 | -107/+135 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1877 from matrix-org/erikj/device_list_fixes | Erik Johnston | 2017-02-02 | 2 | -21/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make /keys/changes a bit more performant | ||||
| * | | | | | | Use new get_users_who_share_room_with_user | Erik Johnston | 2017-02-02 | 1 | -11/+13 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-02-02 | 6 | -29/+42 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | erikj/device_list_fixes | ||||
* | | | | | | | Merge pull request #1876 from matrix-org/erikj/shared_member_store | Erik Johnston | 2017-02-02 | 6 | -29/+42 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Make presence.get_new_events a bit faster | ||||
| * | | | | | | Fix replication | Erik Johnston | 2017-02-02 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Comment | Erik Johnston | 2017-02-02 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Comment | Erik Johnston | 2017-02-02 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Comment | Erik Johnston | 2017-02-02 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Make presence.get_new_events a bit faster | Erik Johnston | 2017-02-02 | 4 | -29/+33 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | We do this by caching the set of users a user shares rooms with. | ||||
| | * | | | | sets aren't JSON serializable | Erik Johnston | 2017-02-02 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Use stream_ordering_to_exterm for /keys/changes | Erik Johnston | 2017-02-02 | 1 | -9/+9 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1875 from matrix-org/erikj/fix_email_push | Erik Johnston | 2017-02-02 | 8 | -57/+70 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix email push in pusher worker | ||||
| * | | | | Fix email push in pusher worker | Erik Johnston | 2017-02-02 | 8 | -57/+70 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | This was broken when device list updates were implemented, as Mailer could no longer instantiate an AuthHandler due to a dependency on federation sending. | ||||
| | * | | Update changelog v0.19.0-rc2 | Erik Johnston | 2017-02-02 | 2 | -1/+7 |
| | | | | |||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0 | Erik Johnston | 2017-02-02 | 3 | -5/+57 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #1872 from matrix-org/erikj/key_changes | Erik Johnston | 2017-02-01 | 3 | -5/+57 |
|\ \ \ \ | | | | | | | | | | | Include newly joined users in /keys/changes API | ||||
| * | | | | Doc args | Erik Johnston | 2017-02-01 | 2 | -0/+11 |
| | | | | | |||||
| * | | | | Comment | Erik Johnston | 2017-02-01 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Include newly joined users in /keys/changes API | Erik Johnston | 2017-02-01 | 3 | -5/+43 |
|/ / / / | |||||
| | * | | Update changelog v0.19.0-rc1 | Erik Johnston | 2017-02-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Bump version and changelog | Erik Johnston | 2017-02-02 | 2 | -1/+49 |
| |/ / |/| | | |||||
* | | | Merge pull request #1871 from matrix-org/erikj/ratelimit_401 | Erik Johnston | 2017-02-01 | 2 | -4/+6 |
|\ \ \ | | | | | | | | | Correctly raise exceptions for ratelimitng. Ratelimit on 401 | ||||
| * | | | Correctly raise exceptions for ratelimitng. Ratelimit on 401 | Erik Johnston | 2017-02-01 | 2 | -4/+6 |
|/ / / | |||||
* | | | Wake sync up for device changes | Erik Johnston | 2017-02-01 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #1869 from matrix-org/erikj/device_list_stream | Erik Johnston | 2017-02-01 | 2 | -0/+65 |
|\ \ \ | | | | | | | | | Implement /keys/changes | ||||
| * | | | Comment | Erik Johnston | 2017-02-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Comment | Erik Johnston | 2017-02-01 | 1 | -1/+12 |
| | | | | |||||
| * | | | Implement /keys/changes | Erik Johnston | 2017-02-01 | 2 | -0/+54 |
| | | | | |||||
* | | | | Merge pull request #1870 from matrix-org/erikj/cache_get_all_new_events | Erik Johnston | 2017-02-01 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Add a small cache get_all_new_events | ||||
| * | | | | Add a small cache get_all_new_events | Erik Johnston | 2017-02-01 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1868 from matrix-org/erikj/replication_cache | Erik Johnston | 2017-02-01 | 5 | -84/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Only invalidate membership caches based on the cache stream | ||||
| * | | | | | Remote membership tests for replication | Erik Johnston | 2017-01-31 | 1 | -43/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because it now relies of the caches stream, which only works on postgres. We are trying to test with sqlite. | ||||
| * | | | | | Only invalidate membership caches based on the cache stream | Erik Johnston | 2017-01-31 | 4 | -41/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we completely invalidated get_users_in_room whenever we updated any current_state_events table. This was way too aggressive. | ||||
* | | | | | | Add m.room.member type to query | Erik Johnston | 2017-02-01 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1867 from matrix-org/erikj/member_index | Erik Johnston | 2017-02-01 | 3 | -1/+26 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add an index to make membership queries faster | ||||
| * | | | | Add an index to make membership queries faster | Erik Johnston | 2017-01-31 | 3 | -1/+26 |
| |/ / / | |||||
* | / / | Up get_latest_event_ids_in_room cache | Erik Johnston | 2017-02-01 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1866 from matrix-org/erikj/device_list_fixes | Erik Johnston | 2017-02-01 | 2 | -2/+18 |
|\ \ \ | |/ / |/| | | Better handle 404 response for federation /send/ | ||||
| * | | Remove explicit < 400 check as apparently this is confusing | Erik Johnston | 2017-01-31 | 1 | -3/+1 |
| | | | |||||
| * | | Comment | Erik Johnston | 2017-01-31 | 1 | -0/+2 |
| | | | |||||
| * | | Comment | Erik Johnston | 2017-01-31 | 1 | -0/+4 |
| | | | |||||
| * | | Better handle 404 response for federation /send/ | Erik Johnston | 2017-01-31 | 2 | -2/+14 |
| | | | |||||
* | | | Merge pull request #1864 from matrix-org/erikj/device_list_fixes | Erik Johnston | 2017-01-31 | 1 | -8/+26 |
|\| | | | | | | | | Fix clearing out old device list outbound pokes | ||||
| * | | Fix deletion of old sent devices correctly | Erik Johnston | 2017-01-31 | 1 | -5/+17 |
| | | | |||||
| * | | Only fetch with row ts and count > 1 | Erik Johnston | 2017-01-31 | 1 | -1/+2 |
| | | | |||||
| * | | Fix clearing out old device list outbound pokes | Erik Johnston | 2017-01-31 | 1 | -2/+7 |
| | | | |||||
* | | | Merge pull request #1862 from matrix-org/erikj/presence_update | Erik Johnston | 2017-01-31 | 2 | -5/+9 |
|\ \ \ | | | | | | | | | Use DB cache of joined users for presence | ||||
| * | | | Stream cache invalidations for room membership storage functions | Erik Johnston | 2017-01-30 | 1 | -2/+6 |
| | | | | |||||
| * | | | Use DB cache of joined users for presence | Erik Johnston | 2017-01-30 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #1861 from matrix-org/erikj/device_list_fixes | Erik Johnston | 2017-01-30 | 6 | -25/+63 |
|\ \ \ \ | | |/ / | |/| | | Device List fixes | ||||
| * | | | Don't have such a large cache | Erik Johnston | 2017-01-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix unit tests | Erik Johnston | 2017-01-30 | 3 | -7/+15 |
| | | | | |||||
| * | | | Noop device key changes if they're the same | Erik Johnston | 2017-01-30 | 3 | -15/+45 |
| | | | | |||||
| * | | | Fix query | Erik Johnston | 2017-01-30 | 1 | -1/+1 |
| |/ / | |||||
| * / | Use get_users_in_room and declare it iterable | Erik Johnston | 2017-01-30 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #1857 from matrix-org/erikj/device_list_stream | Erik Johnston | 2017-01-30 | 27 | -120/+1032 |
|\ \ | | | | | | | Implement device lists updates over federation | ||||
| * | | Rename func | Erik Johnston | 2017-01-30 | 2 | -2/+2 |
| | | | |||||
| * | | Remove debug logging | Erik Johnston | 2017-01-30 | 1 | -1/+0 |
| | | | |||||
| * | | Clear out old destination pokes. | Erik Johnston | 2017-01-30 | 1 | -0/+42 |
| | | | |||||
| * | | Always use the latest stream_id, sent or unsent | Erik Johnston | 2017-01-30 | 1 | -4/+4 |
| | | | |||||
| * | | Add ts column to device_lists_outbound_pokes | Erik Johnston | 2017-01-27 | 2 | -1/+5 |
| | | | |||||
| * | | Hook device list updates to replication | Erik Johnston | 2017-01-27 | 7 | -29/+159 |
| | | | |||||
| * | | Comment | Erik Johnston | 2017-01-27 | 1 | -0/+2 |
| | | | |||||
| * | | Comment | Erik Johnston | 2017-01-27 | 1 | -0/+2 |
| | | | |||||
| * | | SQL param ordering | Erik Johnston | 2017-01-27 | 1 | -1/+1 |
| | | | |||||
| * | | User if rather than for | Erik Johnston | 2017-01-27 | 1 | -1/+4 |
| | | | |||||
| * | | Better name | Erik Johnston | 2017-01-27 | 2 | -2/+4 |
| | | | |||||
| * | | Remove unused param | Erik Johnston | 2017-01-27 | 1 | -2/+1 |
| | | | |||||
| * | | Fix unit tests | Erik Johnston | 2017-01-26 | 1 | -0/+17 |
| | | | |||||
| * | | Fix on sqlite: use left rather than outer join | Erik Johnston | 2017-01-26 | 1 | -3/+3 |
| | | | |||||
| * | | Handle users leaving rooms | Erik Johnston | 2017-01-26 | 2 | -1/+24 |
| | | | |||||
| * | | Add comments | Erik Johnston | 2017-01-26 | 4 | -7/+61 |
| | | | |||||
| * | | Implement device key caching over federation | Erik Johnston | 2017-01-26 | 13 | -57/+381 |
| | | | |||||
| * | | Fix up sending of m.device_list_update edus | Erik Johnston | 2017-01-25 | 3 | -80/+82 |
| | | | |||||
| * | | Add basic implementation of local device list changes | Erik Johnston | 2017-01-25 | 14 | -39/+348 |
| | | | |||||
* | | | Merge pull request #1852 from matrix-org/paul/issue-1382 | Paul Evans | 2017-01-25 | 1 | -2/+4 |
|\ \ \ | |/ / |/| | | Don't clobber a displayname or avatar_url if provided by an m.room.member event | ||||
| * | | Don't clobber a displayname or avatar_url if provided by an m.room.member event | Paul "LeoNerd" Evans | 2017-01-24 | 1 | -2/+4 |
|/ / | |||||
* | | Merge branch 'erikj/current_state_fix' into develop | Erik Johnston | 2017-01-23 | 1 | -1/+1 |
|\ \ | |||||
| * | | Typo | Erik Johnston | 2017-01-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1840 from matrix-org/erikj/current_state_fix | Erik Johnston | 2017-01-23 | 5 | -182/+163 |
|\| | | | | | | | | Insert delta of current_state_events to be more efficient | ||||
| * | | Refactor to calculate state delta outside transaction | Erik Johnston | 2017-01-23 | 1 | -87/+118 |
| | | | |||||
| * | | Comments | Erik Johnston | 2017-01-20 | 1 | -8/+19 |
| | | | |||||
| * | | Insert delta of current_state_events to be more efficient | Erik Johnston | 2017-01-20 | 5 | -119/+58 |
| | | | |||||
* | | | Merge pull request #1836 from matrix-org/erikj/current_state_fix | Erik Johnston | 2017-01-20 | 5 | -201/+217 |
|\| | | | | | | | | Derive current_state_events from state groups | ||||
| * | | Spelling | Erik Johnston | 2017-01-20 | 1 | -1/+1 |
| | | | |||||
| * | | Update all call sites after rename | Erik Johnston | 2017-01-20 | 1 | -1/+1 |
| | | | |||||
| * | | Comments | Erik Johnston | 2017-01-20 | 1 | -0/+11 |
| | | | |||||
| * | | Calculate the forward extremeties once | Erik Johnston | 2017-01-20 | 2 | -126/+92 |
| | | | |||||
| * | | Derive current_state_events from state groups | Erik Johnston | 2017-01-20 | 4 | -99/+138 |
| | | | |||||
* | | | Merge pull request #1837 from matrix-org/rav/fix_purge_media_doc | Richard van der Hoff | 2017-01-20 | 1 | -5/+3 |
|\ \ \ | | | | | | | | | fix doc for purge_media_cache | ||||
| * | | | fix doc for purge_media_cache | Richard van der Hoff | 2017-01-20 | 1 | -5/+3 |
|/ / / | | | | | | | | | | | | | purge_media_cache takes its arg from a query-param, not the POST body, for some reason. | ||||
* | | | Merge pull request #1835 from matrix-org/erikj/fix_workers | Erik Johnston | 2017-01-20 | 1 | -0/+10 |
|\| | | | | | | | | Make worker listener config backwards compat | ||||
| * | | Make worker listener config backwards compat | Erik Johnston | 2017-01-20 | 1 | -0/+10 |
| | | | |||||
* | | | Merge pull request #1832 from xsteadfastx/xsteadfastx/turn-username-password | David Baker | 2017-01-19 | 2 | -10/+25 |
|\ \ \ | |/ / |/| | | Added username and password for turn server | ||||
| * | | Added default config for turn username and password | Marvin Steadfast | 2017-01-19 | 1 | -0/+5 |
| | | | |||||
| * | | Added username and password for turn server | Marvin Steadfast | 2017-01-19 | 2 | -10/+20 |
|/ / | | | | | | | | | It makes it possible to use a turn server that needs a username and password instead of a token. | ||||
* | | Merge pull request #1828 from matrix-org/erikj/iterable_cache_size | Erik Johnston | 2017-01-18 | 1 | -0/+2 |
|\ \ | | | | | | | Update LruCache size estimate on clear | ||||
| * | | Update LruCache size estimate on clear | Erik Johnston | 2017-01-18 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #1811 from aperezdc/unhardcode-riot-urls | David Baker | 2017-01-18 | 2 | -6/+21 |
|\ \ \ | | | | | | | | | Allow configuring the Riot URL used in notification emails | ||||
| * | | | Allow configuring the Riot URL used in notification emails | Adrian Perez de Castro | 2017-01-13 | 2 | -6/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The URLs used for notification emails were hardcoded to use either matrix.to or vector.im; but for self-hosted setups where Riot is also self-hosted it may be desirable to allow configuring an alternative Riot URL. Fixes #1809. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> | ||||
* | | | | Merge pull request #1827 from matrix-org/dbkr/email_case_insensitive | David Baker | 2017-01-18 | 2 | -1/+12 |
|\ \ \ \ | |_|/ / |/| | | | Lowercase all email addresses before querying db | ||||
| * | | | Lowercase all email addresses before querying db | David Baker | 2017-01-18 | 2 | -1/+12 |
|/ / / | | | | | | | | | | | | | Since we store all emails in the DB in lowercase (https://github.com/matrix-org/synapse/pull/1170) | ||||
* | | | Merge pull request #1823 from matrix-org/erikj/load_events_logs | Erik Johnston | 2017-01-18 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Remove loading events logs | ||||
| * | | | Lower loading events log to DEBUG | Erik Johnston | 2017-01-17 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #1824 from matrix-org/erikj/retry_host_log | Erik Johnston | 2017-01-18 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Lower the not retrying host log line to debug | ||||
| * | | | | Lower the not retrying host log line to debug | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1822 from matrix-org/erikj/statE_logging | Erik Johnston | 2017-01-18 | 3 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | Change resolve_state_groups call site logging to DEBUG | ||||
| * | | | | Change resolve_state_groups call site logging to DEBUG | Erik Johnston | 2017-01-17 | 3 | -6/+6 |
| |/ / / | |||||
* | | | | Merge pull request #1821 from matrix-org/erikj/cache_metrics_string_intern | Erik Johnston | 2017-01-18 | 1 | -3/+8 |
|\ \ \ \ | | | | | | | | | | | Measure metrics of string_cache | ||||
| * | | | | Measure metrics of string_cache | Erik Johnston | 2017-01-17 | 1 | -3/+8 |
| |/ / / | |||||
* | | | | Merge pull request #1818 from matrix-org/erikj/state_auth_splitout_split | Erik Johnston | 2017-01-18 | 8 | -76/+249 |
|\ \ \ \ | | | | | | | | | | | Optimise state resolution | ||||
| * | | | | PEP8 | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Only construct sets when necessary | Mark Haines | 2017-01-17 | 1 | -14/+19 |
| | | | | | |||||
| * | | | | Use better names | Erik Johnston | 2017-01-17 | 1 | -9/+7 |
| | | | | | |||||
| * | | | | Use better variable name | Erik Johnston | 2017-01-17 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Correctly handle case of rejected events in state res | Erik Johnston | 2017-01-17 | 1 | -10/+16 |
| | | | | | |||||
| * | | | | Check event is in state_map | Erik Johnston | 2017-01-17 | 1 | -2/+7 |
| | | | | | |||||
| * | | | | Fix couple of federation state bugs | Erik Johnston | 2017-01-17 | 2 | -3/+5 |
| | | | | | |||||
| * | | | | Optimise state resolution | Erik Johnston | 2017-01-17 | 7 | -72/+229 |
| | | | | | |||||
* | | | | | Merge pull request #1820 from matrix-org/erikj/push_tools | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Get state at event rather than for room in push | ||||
| * | | | | Get state at event rather than for room in push | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix typo in return type | Erik Johnston | 2017-01-17 | 1 | -3/+2 |
|/ / / / | |||||
* | | | | Merge pull request #1812 from matrix-org/erikj/state_auth_splitout_split | Erik Johnston | 2017-01-17 | 1 | -138/+140 |
|\| | | | | | | | | | | | Split out static state methods from StateHandler | ||||
| * | | | Put staticmethods at module level | Erik Johnston | 2017-01-16 | 1 | -123/+121 |
| | | | | |||||
| * | | | Split out static state methods from StateHandler | Erik Johnston | 2017-01-13 | 1 | -70/+74 |
| | | | | |||||
* | | | | Merge pull request #1815 from matrix-org/erikj/iter_cache_size | Erik Johnston | 2017-01-17 | 12 | -85/+308 |
|\ \ \ \ | | | | | | | | | | | Optionally measure size of cache by sum of length of values | ||||
| * | | | | Tidy up test | Erik Johnston | 2017-01-17 | 1 | -12/+12 |
| | | | | | |||||
| * | | | | Rename and comment tree_to_leaves_iterator | Erik Johnston | 2017-01-17 | 2 | -5/+8 |
| | | | | | |||||
| * | | | | Remove needless call to evict() | Erik Johnston | 2017-01-17 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Increase state_group_cache_size | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Speed up cache size calculation | Erik Johnston | 2017-01-17 | 7 | -62/+148 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of calculating the size of the cache repeatedly, which can take a long time now that it can use a callback, instead cache the size and update that on insertion and deletion. This requires changing the cache descriptors to have two caches, one for pending deferreds and the other for the actual values. There's no reason to evict from the pending deferreds as they won't take up any more memory. | ||||
| * | | | | Add ExpiringCache tests | Erik Johnston | 2017-01-16 | 1 | -0/+84 |
| | | | | | |||||
| * | | | | Use OrderedDict in ExpiringCache | Erik Johnston | 2017-01-16 | 1 | -10/+4 |
| | | | | | |||||
| * | | | | Up cache max entries for state | Erik Johnston | 2017-01-16 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Add support for 'iterable' to ExpiringCache | Erik Johnston | 2017-01-16 | 2 | -10/+22 |
| | | | | | |||||
| * | | | | Increase cache size limit | Erik Johnston | 2017-01-16 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Optionally measure size of cache by sum of length of values | Erik Johnston | 2017-01-13 | 5 | -21/+66 |
|/ / / / | |||||
* | | | | Merge pull request #1810 from matrix-org/erikj/state_auth_splitout_split | Erik Johnston | 2017-01-13 | 2 | -571/+649 |
|\| | | | | | | | | | | | Split out static auth methods from Auth object | ||||
| * | | | Remove unused function | Erik Johnston | 2017-01-13 | 1 | -3/+0 |
| | | | | |||||
| * | | | Split event auth code into seperate module | Erik Johnston | 2017-01-13 | 2 | -645/+650 |
| | | | | |||||
| * | | | Split out static auth methods from Auth object | Erik Johnston | 2017-01-10 | 1 | -419/+495 |
| | | | | |||||
* | | | | Merge pull request #1793 from matrix-org/erikj/change_device_inbox_index | Erik Johnston | 2017-01-13 | 3 | -3/+55 |
|\ \ \ \ | |_|/ / |/| | | | Change device_inbox stream index to include user | ||||
| * | | | Add comment | Erik Johnston | 2017-01-13 | 1 | -0/+1 |
| | | | | |||||
| * | | | Explicitly close the cursor | Erik Johnston | 2017-01-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | Don't disable autocommit | Erik Johnston | 2017-01-10 | 1 | -8/+4 |
| | | | | |||||
| * | | | Change device_inbox stream index to include user | Erik Johnston | 2017-01-10 | 3 | -3/+57 |
| | | | | | | | | | | | | | | | | | | | | This makes fetching the nost recently changed users much tricker, and brings it in line with e.g. presence_stream indices. | ||||
* | | | | Merge pull request #1795 from matrix-org/erikj/port_defaults | Erik Johnston | 2017-01-13 | 9 | -84/+29 |
|\ \ \ \ | | | | | | | | | | | Restore default bind address | ||||
| * | | | | Pop bind_address | Erik Johnston | 2017-01-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Restore default bind address | Erik Johnston | 2017-01-10 | 9 | -84/+29 |
| | |/ / | |/| | | |||||
* | | | | README.rst: fix formatting | Richard van der Hoff | 2017-01-13 | 1 | -0/+1 |
| | | | | | | | | | | | | Fix formatting blooper introduced in https://github.com/matrix-org/synapse/pull/1672 :/ | ||||
* | | | | Merge pull request #1803 from matrix-org/erikj/swallow_errors | Erik Johnston | 2017-01-13 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Fix spurious Unhandled Error log lines | ||||
| * | | | | Fix spurious Unhandled Error log lines | Erik Johnston | 2017-01-12 | 1 | -1/+5 |
|/ / / / | |||||
* | | | | Merge pull request #1802 from matrix-org/erikj/remove_debug_deferreds | Erik Johnston | 2017-01-12 | 2 | -79/+0 |
|\ \ \ \ | | | | | | | | | | | Remove full_twisted_stacktraces option | ||||
| * | | | | Remove full_twisted_stacktraces option | Erik Johnston | 2017-01-12 | 2 | -79/+0 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The debug 'full_twisted_stacktraces' flag caused synapse to rewrite twisted deferreds to always fire the callback on the next reactor tick. This was to force the deferred to always store the stacktraces on exceptions, and thus be more likely to have a full stacktrace when it reaches the final error handlers and gets printed to the logs. Dynamically rewriting things is generally bad, and in particular this change violates assumptions of various bits of Twisted. This wouldn't necessarily be so bad, but it turns out this option has been turned on on some production servers. Turning the option can cause e.g. #1778. For now, lets just entirely nuke this option. | ||||
* | | | | Add missing None check | Erik Johnston | 2017-01-11 | 1 | -5/+6 |
| | | | | |||||
* | | | | credit patrik properly | Matthew Hodgson | 2017-01-10 | 1 | -0/+1 |
|/ / / | |||||
* | | | Remove spurious for..else.. | Erik Johnston | 2017-01-10 | 1 | -11/+0 |
| | | | |||||
* | | | Merge pull request #1792 from matrix-org/erikj/limit_cache_prefill_device | Erik Johnston | 2017-01-10 | 2 | -3/+6 |
|\ \ \ | | | | | | | | | Limit number of entries to prefill from cache | ||||
| * | | | Limit number of entries to prefill from cache | Erik Johnston | 2017-01-10 | 2 | -3/+6 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Some tables, like device_inbox, take a long time to query at startup for the stream change cache prefills. This is likely because they are slower growing streams and so are more fragmented on disk. For now, lets pull fewer entries out to make startup quicker. In future, we should add a better index to make it even faster. | ||||
* | | | Merge pull request #1790 from matrix-org/erikj/linearizer | Erik Johnston | 2017-01-10 | 1 | -2/+5 |
|\ \ \ | | | | | | | | | Add paranoia exception catch in Linearizer | ||||
| * | | | Add paranoia exception catch in Linearizer | Erik Johnston | 2017-01-10 | 1 | -2/+5 |
| |/ / | |||||
* | | | Merge pull request #1791 from matrix-org/markjh/file_logging | Mark Haines | 2017-01-10 | 3 | -0/+11 |
|\ \ \ | | | | | | | | | Log which files we saved attachments to in the media_repository | ||||
| * | | | Log which files we saved attachments to in the media_repository | Mark Haines | 2017-01-10 | 3 | -0/+11 |
|/ / / | |||||
* | | | Merge pull request #1789 from matrix-org/erikj/decouple_presence | Erik Johnston | 2017-01-10 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Don't block messages sending on bumping presence | ||||
| * | | | Comment | Erik Johnston | 2017-01-10 | 1 | -0/+2 |
| | | | | |||||
| * | | | Don't block messages sending on bumping presence | Erik Johnston | 2017-01-10 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1787 from matrix-org/erikj/linearize_member | Erik Johnston | 2017-01-10 | 4 | -18/+38 |
|\ \ \ | | | | | | | | | Linearize updates to membership via PUT /state/ | ||||
| * | | | Linearize updates to membership via PUT /state/ | Erik Johnston | 2017-01-09 | 4 | -18/+38 |
| |/ / | |||||
* | | | Merge pull request #1786 from matrix-org/erikj/linearizer_name | Erik Johnston | 2017-01-10 | 4 | -5/+5 |
|\ \ \ | |/ / |/| | | Name linearizer's for better logs | ||||
| * | | Name linearizer's for better logs | Erik Johnston | 2017-01-09 | 4 | -5/+5 |
|/ / | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-01-09 | 2 | -1/+12 |
|\| | |||||
| * | Bump version and changelog v0.18.7 | Erik Johnston | 2017-01-09 | 2 | -1/+12 |
| | | |||||
* | | gah, fix mangled merge of 0.18.7 into develop | Matthew Hodgson | 2017-01-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'release-v0.18.7' into develop | Matthew | 2017-01-07 | 3 | -21/+31 |
|\| | |||||
| * | bump changelog & version v0.18.7-rc2 | Matthew | 2017-01-07 | 2 | -1/+9 |
| | | |||||
| * | do the discard check in the right place to avoid grabbing dependent events | Matthew | 2017-01-07 | 1 | -20/+20 |
| | | |||||
| * | changelog | Matthew Hodgson | 2017-01-07 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'release-v0.18.7' into develop | Matthew Hodgson | 2017-01-07 | 4 | -3/+33 |
|\| | |||||
| * | Discard PDUs from invalid origins due to #1753 in 0.18.[56] v0.18.7-rc1 | Matthew | 2017-01-07 | 1 | -1/+23 |
| | | |||||
| * | oops, this should have been rc1 | Matthew Hodgson | 2017-01-07 | 2 | -3/+4 |
| | | |||||
| * | move logging to right place | Matthew Hodgson | 2017-01-07 | 1 | -1/+1 |
| | | |||||
| * | bump version | Matthew | 2017-01-06 | 1 | -1/+1 |
| | | |||||
| * | update changelog | Matthew | 2017-01-06 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2017-01-07 | 0 | -0/+0 |
|\ \ | |||||
| * | | Revert "fix typo breaking the fix to #1753" | Matthew | 2017-01-06 | 1 | -1/+1 |
| |/ | | | | | | | This reverts commit b2850e62db376ea920fed9dff65a47c15cb0dc68. | ||||
| * | fix typo breaking the fix to #1753 | Matthew | 2017-01-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'release-v0.18.6' into develop | Mark Haines | 2017-01-06 | 3 | -5/+14 |
|\| | |||||
| * | Bump version and changelog v0.18.6 | Mark Haines | 2017-01-06 | 2 | -1/+8 |
| | | |||||
| * | Merge pull request #1772 from matrix-org/markjh/fix_guest_access_check | Mark Haines | 2017-01-06 | 1 | -4/+6 |
| |\ | | | | | | | handlers/room_member: fix guest access check when joining rooms | ||||
| | * | handlers/room_member: fix guest access check when joining rooms | Patrik Oldsberg | 2017-01-06 | 1 | -4/+6 |
| |/ | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2017-01-05 | 7 | -4/+25 |
|\| | |||||
| * | Fix flake8 and update changelog v0.18.6-rc3 | Mark Haines | 2017-01-05 | 3 | -6/+6 |
| | | |||||
| * | Merge pull request #1767 from matrix-org/matthew/resolve_state_group_logging | Matthew Hodgson | 2017-01-05 | 5 | -3/+9 |
| |\ | | | | | | | log call paths for resolve_state_group | ||||
| | * | Fix case | Matthew Hodgson | 2017-01-05 | 1 | -1/+1 |
| | | | |||||
| | * | add logging for all the places we call resolve_state_groups. my kingdom for ↵ | Matthew Hodgson | 2017-01-05 | 3 | -0/+6 |
| | | | | | | | | | | | | a backtrace that actually works. | ||||
| | * | fix annoying typos | Matthew Hodgson | 2017-01-05 | 2 | -3/+3 |
| | | | |||||
| * | | Bump version and changelog to v0.18.6-rc3 | Mark Haines | 2017-01-05 | 2 | -1/+16 |
| |/ | |||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2017-01-05 | 5 | -8/+47 |
|\| | |||||
| * | Merge pull request #1766 from matrix-org/markjh/linear_logging | Matthew Hodgson | 2017-01-05 | 2 | -2/+13 |
| |\ | | | | | | | More logging for the linearizer and for get_events | ||||
| | * | More logging for the linearizer and for get_events | Mark Haines | 2017-01-05 | 2 | -2/+13 |
| |/ | |||||
| * | Merge pull request #1765 from matrix-org/markjh/timeout_get_missing_events | Mark Haines | 2017-01-05 | 3 | -3/+27 |
| |\ | | | | | | | cherrypick #1744: limit total timeout for get_missing_events to 10s | ||||
| | * | fix comment | Matthew Hodgson | 2017-01-05 | 1 | -1/+17 |
| | | | |||||
| | * | limit total timeout for get_missing_events to 10s | Matthew Hodgson | 2017-01-05 | 3 | -3/+11 |
| |/ | |||||
| * | Merge pull request #1764 from matrix-org/markjh/fix_send_pdu | Mark Haines | 2017-01-05 | 3 | -0/+25 |
| |\ | | | | | | | Only send events that originate on this server. | ||||
| | * | Only send events that originate on this server. | Mark Haines | 2017-01-05 | 3 | -0/+25 |
| |/ | | | | | | | | | | | Or events that are sent via the federation "send_join" API. This should match the behaviour from before v0.18.5 and #1635 landed. | ||||
| * | Merge pull request #1758 from matrix-org/markjh/fix_ban_propagation | Mark Haines | 2017-01-04 | 1 | -6/+9 |
| |\ | | | | | | | Fix propagation of bans to remote servers. | ||||
| | * | Get the destinations from the state from before the event | Mark Haines | 2017-01-04 | 1 | -8/+9 |
| | | | | | | | | | | | | Rather than the state after then event. | ||||
| | * | Send ALL membership events to the server that was affected. | Mark Haines | 2017-01-04 | 1 | -3/+5 |
| |/ | | | | | | | | | | | Send all membership changes to the server that was affected. This ensures that if the last member of a room on a server was kicked or banned they get told about it. | ||||
* | | Merge pull request #1744 from matrix-org/matthew/timeout_get_missing_events | Mark Haines | 2017-01-05 | 3 | -3/+27 |
|\ \ | | | | | | | limit total timeout for get_missing_events to 10s |