Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge uncommitted changes from matrix.org into hotfixes-v0.18.5 github/hotfixes-v0.18.5 hotfixes-v0.18.5 | Matthew Hodgson | 2016-12-20 | 3 | -10/+8 |
|\ | |||||
| * | uncommitted changes on matrix.org | Richard van der Hoff | 2016-12-20 | 4 | -10/+10 |
* | | Bump version and changelog | Erik Johnston | 2016-12-16 | 1 | -1/+1 |
* | | Add some logging for syncing to_device events | Richard van der Hoff | 2016-12-15 | 2 | -5/+10 |
* | | Merge pull request #1698 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-15 | 1 | -2/+4 |
|\ \ | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_list | Erik Johnston | 2016-12-13 | 1 | -1/+1 |
| |\| | |||||
| * | | Fix caching on public room list | Erik Johnston | 2016-12-13 | 1 | -2/+4 |
* | | | Merge pull request #1700 from matrix-org/erikj/backfill_filter | Erik Johnston | 2016-12-15 | 1 | -2/+5 |
|\ \ \ | |||||
| * | | | Comment | Erik Johnston | 2016-12-14 | 1 | -0/+2 |
| * | | | Fix /backfill returning events it shouldn't | Erik Johnston | 2016-12-14 | 1 | -2/+3 |
* | | | | Fix crash in url preview when html tag has no text | Marcin Bachry | 2016-12-14 | 1 | -1/+4 |
|/ / / | |||||
* | / | Fixup membership query | Erik Johnston | 2016-12-14 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Bump changelog and version | Erik Johnston | 2016-12-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1697 from matrix-org/erikj/fix_bg_member | Erik Johnston | 2016-12-12 | 1 | -1/+1 |
|\ | |||||
| * | Fix background update that prematurely stopped | Erik Johnston | 2016-12-12 | 1 | -1/+1 |
* | | Merge pull request #1676 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-12 | 15 | -42/+399 |
|\ \ | |/ |/| | |||||
| * | Rename network_id to instance_id on client side | Erik Johnston | 2016-12-12 | 1 | -1/+1 |
| * | Add cache to get_public_room_ids_at_stream_id | Erik Johnston | 2016-12-12 | 2 | -1/+4 |
| * | Notify replication. Use correct network_id | Erik Johnston | 2016-12-12 | 1 | -1/+3 |
| * | Docstring | Erik Johnston | 2016-12-12 | 1 | -0/+12 |
| * | Comments | Erik Johnston | 2016-12-07 | 3 | -2/+12 |
| * | Don't include appservice id | Erik Johnston | 2016-12-06 | 1 | -1/+0 |
| * | Add new API appservice specific public room list | Erik Johnston | 2016-12-06 | 14 | -40/+371 |
* | | Remove unspecced GET endpoints for e2e keys | Richard van der Hoff | 2016-12-12 | 1 | -39/+4 |
* | | Merge pull request #1620 from matrix-org/erikj/concurrent_room_access | Erik Johnston | 2016-12-12 | 2 | -27/+91 |
|\ \ | |||||
| * | | Comments | Erik Johnston | 2016-11-11 | 2 | -0/+15 |
| * | | Limit the number of events that can be created on a given room concurretnly | Erik Johnston | 2016-11-10 | 1 | -27/+31 |
| * | | Add Limiter: limit concurrent access to resource | Erik Johnston | 2016-11-10 | 1 | -0/+45 |
* | | | Merge pull request #1686 from matrix-org/rav/fix_federation_key_fails | Richard van der Hoff | 2016-12-12 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | Remove unused import | Richard van der Hoff | 2016-12-12 | 1 | -1/+0 |
| * | | | E2E key query: handle federation fails | Richard van der Hoff | 2016-12-09 | 1 | -0/+11 |
* | | | | Correctly handle timeout errors | Erik Johnston | 2016-12-09 | 2 | -7/+20 |
* | | | | Fix rare notifier bug where listeners dont timeout | Erik Johnston | 2016-12-09 | 2 | -11/+10 |
* | | | | Merge pull request #1680 from matrix-org/erikj/joined_rooms | Erik Johnston | 2016-12-09 | 6 | -9/+165 |
|\ \ \ \ | |||||
| * | | | | Add /room/<room_id>/joined_members API | Erik Johnston | 2016-12-08 | 3 | -9/+38 |
| * | | | | Add profile data to the room_membership table for joins | Erik Johnston | 2016-12-08 | 4 | -0/+110 |
| * | | | | Add joined_rooms servlet | Erik Johnston | 2016-12-08 | 1 | -0/+17 |
| |/ / / | |||||
* | | | | Fix ignored read-receipts | Richard van der Hoff | 2016-12-08 | 1 | -1/+5 |
* | | | | Fix result of insert_receipt | Richard van der Hoff | 2016-12-08 | 1 | -1/+1 |
|/ / / | |||||
* | / | Prevent user tokens being used as guest tokens (#1675) | Richard van der Hoff | 2016-12-06 | 2 | -16/+37 |
| |/ |/| | |||||
* | | Merge pull request #653 from matrix-org/erikj/preset_guest_join | Erik Johnston | 2016-12-05 | 1 | -0/+10 |
|\ \ | |||||
| * | | Enable guest access for private rooms by default | Erik Johnston | 2016-03-17 | 1 | -0/+10 |
* | | | Merge pull request #1649 from matrix-org/dbkr/log_ui_auth_args | Erik Johnston | 2016-12-05 | 1 | -1/+9 |
|\ \ \ | |||||
| * | | | Clarify that creds doesn not contain passwords. | David Baker | 2016-11-24 | 1 | -1/+3 |
| * | | | Log the args that we have on UI auth completion | David Baker | 2016-11-24 | 1 | -1/+7 |
* | | | | Bugfix: Console logging handler missing default filter | pik | 2016-12-03 | 1 | -0/+1 |
* | | | | preview_url_resource: Ellipsis must be in unicode string | Johannes Löthberg | 2016-12-01 | 1 | -1/+1 |
* | | | | Fix doc-string | Richard van der Hoff | 2016-12-01 | 1 | -2/+1 |
* | | | | Rip out more refresh_token code | Richard van der Hoff | 2016-11-30 | 6 | -105/+5 |
* | | | | Merge branch 'develop' into rav/no_more_refresh_tokens | Richard van der Hoff | 2016-11-30 | 10 | -61/+80 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #1660 from matrix-org/rav/better_content_type_validation | Richard van der Hoff | 2016-11-30 | 1 | -18/+30 |
| |\ \ \ \ | |||||
| | * | | | | More intelligent Content-Type parsing | Richard van der Hoff | 2016-11-30 | 1 | -18/+30 |
| * | | | | | Merge pull request #1656 from matrix-org/rav/remove_time_caveat | Richard van der Hoff | 2016-11-30 | 5 | -29/+21 |
| |\ \ \ \ \ | |||||
| | * | | | | | Comments | Richard van der Hoff | 2016-11-30 | 1 | -3/+9 |
| | * | | | | | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 5 | -26/+12 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1653 from matrix-org/rav/guest_e2e | Richard van der Hoff | 2016-11-29 | 5 | -14/+29 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Allow guest access to endpoints for E2E | Richard van der Hoff | 2016-11-25 | 3 | -9/+9 |
| | * | | | | Give guest users a device_id | Richard van der Hoff | 2016-11-25 | 2 | -5/+20 |
* | | | | | | Stop generating refresh tokens | Richard van der Hoff | 2016-11-28 | 3 | -37/+16 |
|/ / / / / | |||||
* | | | | | Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checks | Richard van der Hoff | 2016-11-25 | 1 | -26/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Remove redundant list of known caveat prefixes | Richard van der Hoff | 2016-11-24 | 1 | -26/+8 |
| |/ / / / | |||||
* | | | | | Use correct var | Erik Johnston | 2016-11-24 | 1 | -1/+1 |
* | | | | | Correctly handle 500's and 429 on federation | Erik Johnston | 2016-11-24 | 2 | -1/+8 |
* | | | | | Bump version and changelog v0.18.5-rc2 | Erik Johnston | 2016-11-24 | 1 | -1/+1 |
* | | | | | Don't send old events as federation | Erik Johnston | 2016-11-24 | 1 | -1/+1 |
* | | | | | Bump changelog and version v0.18.5-rc1 | Erik Johnston | 2016-11-24 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Comment | Erik Johnston | 2016-11-23 | 1 | -1/+3 |
* | | | | More efficient notif count queries | Erik Johnston | 2016-11-23 | 2 | -8/+48 |
* | | | | Merge pull request #1635 from matrix-org/erikj/split_out_fed_txn | Erik Johnston | 2016-11-23 | 34 | -213/+1108 |
|\ \ \ \ | |||||
| * | | | | Shuffle receipt handler around so that worker apps don't need to load it | Erik Johnston | 2016-11-23 | 6 | -8/+10 |
| * | | | | Ensure only main or federation_sender process can send federation traffic | Erik Johnston | 2016-11-23 | 3 | -5/+21 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_... | Erik Johnston | 2016-11-23 | 8 | -24/+199 |
| |\ \ \ \ | |||||
| * | | | | | Comment | Erik Johnston | 2016-11-23 | 1 | -0/+3 |
| * | | | | | Explicit federation ack | Erik Johnston | 2016-11-23 | 3 | -8/+25 |
| * | | | | | Fix tests and flake8 | Erik Johnston | 2016-11-22 | 1 | -1/+0 |
| * | | | | | Invalidate retry cache in both directions | Erik Johnston | 2016-11-22 | 6 | -27/+132 |
| * | | | | | Comments | Erik Johnston | 2016-11-21 | 1 | -0/+2 |
| * | | | | | Add some metrics | Erik Johnston | 2016-11-21 | 1 | -48/+68 |
| * | | | | | Comments | Erik Johnston | 2016-11-21 | 3 | -0/+41 |
| * | | | | | Remove explicit calls to send_pdu | Erik Johnston | 2016-11-21 | 3 | -61/+9 |
| * | | | | | Fix tests | Erik Johnston | 2016-11-21 | 2 | -2/+5 |
| * | | | | | Store federation stream positions in the database | Erik Johnston | 2016-11-21 | 6 | -24/+94 |
| * | | | | | Handle sending events and device messages over federation | Erik Johnston | 2016-11-17 | 14 | -55/+185 |
| * | | | | | Hook up the send queue and create a federation sender worker | Erik Johnston | 2016-11-16 | 8 | -22/+419 |
| * | | | | | Add initial cut of federation send queue | Erik Johnston | 2016-11-16 | 1 | -0/+174 |
| * | | | | | Use new federation_sender DI | Erik Johnston | 2016-11-16 | 7 | -63/+26 |
| * | | | | | Add transaction queue and transport layer to DI | Erik Johnston | 2016-11-16 | 5 | -10/+16 |
| * | | | | | Move logic into transaction_queue | Erik Johnston | 2016-11-16 | 3 | -19/+18 |
| * | | | | | Rename transaction queue functions to send_* | Erik Johnston | 2016-11-16 | 2 | -12/+12 |
* | | | | | | Merge pull request #1641 from matrix-org/erikj/as_pushers | Erik Johnston | 2016-11-23 | 2 | -2/+18 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Ignore AS users when fetching push rules | Erik Johnston | 2016-11-23 | 2 | -2/+18 |
* | | | | | | Return early on /sync code paths if a '*' filter is used | Kegan Dougal | 2016-11-22 | 2 | -9/+51 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #1638 from matrix-org/kegan/sync-event-fields | Kegsay | 2016-11-22 | 3 | -14/+127 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Review comments | Kegan Dougal | 2016-11-22 | 1 | -11/+9 |
| * | | | | Also check for dict since sometimes they aren't frozen | Kegan Dougal | 2016-11-22 | 1 | -1/+1 |
| * | | | | Glue only_event_fields into the sync rest servlet | Kegan Dougal | 2016-11-22 | 3 | -11/+15 |
| * | | | | More tests | Kegan Dougal | 2016-11-22 | 1 | -3/+4 |
| * | | | | Start adding some tests | Kegan Dougal | 2016-11-21 | 1 | -1/+3 |
| * | | | | Move event_fields filtering to serialize_event | Kegan Dougal | 2016-11-21 | 2 | -59/+98 |
| * | | | | Add filter_event_fields and filter_field to FilterCollection | Kegan Dougal | 2016-11-21 | 1 | -0/+69 |
| |/ / / | |||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-11-22 | 2 | -1/+12 |
|\ \ \ \ | |||||
| * | | | | Fix flake8 | Mark Haines | 2016-11-18 | 1 | -1/+0 |
| * | | | | Work around client replacing reg params | David Baker | 2016-11-18 | 1 | -0/+12 |
| * | | | | Bump changelog and version v0.18.4-rc1 | Erik Johnston | 2016-11-14 | 1 | -1/+1 |
* | | | | | Fail with a coherent error message if `/sync?filter=` is invalid | Kegan Dougal | 2016-11-21 | 2 | -0/+9 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1628 from matrix-org/erikj/ldap_split_out | Erik Johnston | 2016-11-15 | 4 | -378/+17 |
|\ \ \ \ | |||||
| * | | | | Use external ldap auth pacakge | Erik Johnston | 2016-11-15 | 4 | -378/+17 |
* | | | | | Merge pull request #1617 from matrix-org/erikj/intern_state_dict | Erik Johnston | 2016-11-15 | 1 | -1/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Correctly intern keys in state cache | Erik Johnston | 2016-11-08 | 1 | -1/+4 |
* | | | | | New Flake8 fixes | Erik Johnston | 2016-11-15 | 2 | -0/+3 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1624 from matrix-org/kegan/idempotent-requests | Kegsay | 2016-11-14 | 6 | -184/+133 |
|\ \ \ \ | |||||
| * | | | | Clean transactions based on time. Add HttpTransactionCache tests. | Kegan Dougal | 2016-11-14 | 4 | -8/+30 |
| * | | | | Move .observe() up to the cache to make things neater | Kegan Dougal | 2016-11-14 | 3 | -33/+11 |
| * | | | | Review comments | Kegan Dougal | 2016-11-11 | 5 | -158/+119 |
| * | | | | More flake8 | Kegan Dougal | 2016-11-11 | 1 | -1/+3 |
| * | | | | Flake8 and fix whoopsie | Kegan Dougal | 2016-11-11 | 1 | -4/+8 |
| * | | | | Use ObservableDeferreds instead of Deferreds as they behave as intended | Kegan Dougal | 2016-11-11 | 2 | -30/+31 |
| * | | | | Use observable deferreds because they are sane | Kegan Dougal | 2016-11-11 | 1 | -3/+4 |
| * | | | | Flake8 | Kegan Dougal | 2016-11-10 | 2 | -4/+4 |
| * | | | | Store Promise<Response> instead of Response for HTTP API transactions | Kegan Dougal | 2016-11-10 | 4 | -88/+68 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1625 from DanielDent/patch-1 | Erik Johnston | 2016-11-12 | 1 | -2/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add support for durations in minutes | Daniel Dent | 2016-11-12 | 1 | -2/+3 |
* | | | | Don't assume providers raise ConfigError's | Erik Johnston | 2016-11-08 | 1 | -2/+7 |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-11-08 | 2 | -2/+3 |
|\| | | | |||||
| * | | | Bump version and changelog | Erik Johnston | 2016-11-08 | 1 | -1/+1 |
| * | | | Explicitly set authentication mode in ldap3 | Erik Johnston | 2016-11-08 | 1 | -1/+2 |
* | | | | Merge pull request #1615 from matrix-org/erikj/limit_prev_events | Erik Johnston | 2016-11-08 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | Sample correctly | Erik Johnston | 2016-11-08 | 1 | -1/+3 |
| * | | | | Limit the number of prev_events of new events | Erik Johnston | 2016-11-08 | 1 | -0/+13 |
| | |/ / | |/| | | |||||
* / | | | Respect use_frozen_dicts option in workers | Erik Johnston | 2016-11-08 | 6 | -0/+22 |
|/ / / | |||||
* | | | Merge pull request #1198 from euank/more-ip-blacklist | Erik Johnston | 2016-11-07 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | default config: blacklist more internal ips | Euan Kemp | 2016-11-06 | 1 | -0/+2 |
| |/ / | |||||
* | | | Comment | Erik Johnston | 2016-11-04 | 1 | -0/+1 |
* | | | Remove unused but buggy function | Erik Johnston | 2016-11-04 | 1 | -11/+1 |
* | | | Rename the python-specific metrics now the docs claim that we have done | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -7/+9 |
* | | | Since we don't export per-filetype fd counts any more, delete all the code re... | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -36/+4 |
* | | | Remove now-unused 'resource' import | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -8/+0 |
* | | | Now we have new-style metrics don't bother exporting legacy-named process ones | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -16/+1 |
* | | | Remove spurious comment | Erik Johnston | 2016-11-03 | 1 | -2/+2 |
* | | | Replace postgres GIN with GIST | Erik Johnston | 2016-11-03 | 3 | -1/+45 |
* | | | Don't error on non-ascii passwords | David Baker | 2016-11-03 | 1 | -1/+1 |
* | | | Set CORs headers on responses from the media repo | Mark Haines | 2016-11-02 | 3 | -7/+22 |
* | | | Merge pull request #1188 from matrix-org/erikj/sent_transactions | Erik Johnston | 2016-11-01 | 1 | -150/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Continue to clean up received_transactions | Erik Johnston | 2016-11-01 | 1 | -0/+14 |
| * | | Removed unused stuff | Erik Johnston | 2016-10-31 | 1 | -163/+3 |
| * | | Increase batching of sent transaction inserts | Erik Johnston | 2016-10-31 | 1 | -1/+1 |
* | | | Bump version and changelog | Erik Johnston | 2016-11-01 | 1 | -1/+1 |
* | | | Bump changelog and version | Mark Haines | 2016-10-28 | 1 | -1/+1 |
* | | | Merge branch 'develop' into release-v0.18.2 | Mark Haines | 2016-10-28 | 3 | -9/+9 |
|\| | | |||||
| * | | Set up the process collector during metrics __init__; that way all split-proc... | Paul "LeoNerd" Evans | 2016-10-27 | 2 | -2/+3 |
| * | | Pass the Metrics group into the process collector instead of having it find i... | Paul "LeoNerd" Evans | 2016-10-27 | 2 | -8/+4 |
| * | | Allow creation of a 'subspace' within a Metrics object, returning another one | Paul "LeoNerd" Evans | 2016-10-27 | 1 | -0/+3 |
* | | | Bump changelog and version v0.18.2-rc4 | Erik Johnston | 2016-10-27 | 1 | -1/+1 |
|/ / | |||||
* | | Use most recently added binding, not most recently seen user. | Erik Johnston | 2016-10-27 | 1 | -19/+11 |
* | | Fix user_threepids schema delta | Erik Johnston | 2016-10-27 | 1 | -1/+38 |
* | | Bump changelog and version | Erik Johnston | 2016-10-27 | 1 | -1/+1 |
* | | Merge pull request #1098 from matrix-org/markjh/bearer_token | Mark Haines | 2016-10-25 | 1 | -9/+37 |
|\ \ | |||||
| * \ | Merge branch 'develop' into markjh/bearer_token | Mark Haines | 2016-09-12 | 9 | -45/+108 |
| |\ \ | |||||
| * | | | Fix unit tests | Mark Haines | 2016-09-12 | 1 | -1/+1 |
| * | | | Merge branch 'develop' into markjh/bearer_token | Mark Haines | 2016-09-09 | 7 | -9/+89 |
| |\ \ \ | |||||
| * | | | | Allow clients to supply access_tokens as headers | Mark Haines | 2016-09-09 | 1 | -9/+37 |
* | | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-10-25 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bump version and changelog | Erik Johnston | 2016-10-25 | 1 | -1/+1 |
* | | | | | | Fix infinite typing bug | Erik Johnston | 2016-10-24 | 1 | -2/+10 |
* | | | | | | Actually use the new function | Erik Johnston | 2016-10-24 | 1 | -1/+1 |
* | | | | | | Fix incredubly slow back pagination query | Erik Johnston | 2016-10-24 | 4 | -12/+48 |
* | | | | | | Merge pull request #1177 from matrix-org/paul/standard-metric-names | Paul Evans | 2016-10-21 | 4 | -66/+191 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Split callback metric lambda functions down onto their own lines to keep line... | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -8/+16 |
| * | | | | | | Adjust code for <100 char line limit | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -1/+1 |
| * | | | | | | Cut the raw /proc/self/stat line up into named fields at collection time | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -8/+22 |
| * | | | | | | Move the process metrics collector code into its own file | Paul "LeoNerd" Evans | 2016-10-19 | 3 | -141/+161 |
| * | | | | | | A slightly neater way to manage metric collector functions | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -2/+8 |
| * | | | | | | appease pep8 | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -3/+5 |
| * | | | | | | Also guard /proc/self/fds-related code with a suitable psuedoconstant | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -3/+5 |
| * | | | | | | Guard registration of process-wide metrics by existence of the requisite /pro... | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -45/+50 |
| * | | | | | | Add standard process_start_time_seconds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+15 |
| * | | | | | | Add standard process_max_fds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+13 |
| * | | | | | | Add standard process_open_fds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -20/+29 |
| * | | | | | | Add standard process_*_memory_bytes metrics | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+8 |
| * | | | | | | Use /proc/self/stat to generate the new process_cpu_*_seconds_total metrics | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -4/+12 |
| * | | | | | | Export CPU usage metrics also under prometheus-standard metric name | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+15 |
| * | | | | | | Callback metric values might not just be integers - allow floats | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -2/+2 |
* | | | | | | | Merge pull request #1175 from matrix-org/luke/feature-configurable-as-rate-li... | Luke Barnard | 2016-10-20 | 5 | -12/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Style | Luke Barnard | 2016-10-20 | 1 | -2/+3 |
| * | | | | | | | Closing brace on following line | Luke Barnard | 2016-10-20 | 1 | -1/+2 |
| * | | | | | | | as_user->app_service, less redundant comments, better positioned comments | Luke Barnard | 2016-10-20 | 3 | -14/+11 |
| * | | | | | | | flake8 | Luke Barnard | 2016-10-20 | 1 | -1/+3 |
| * | | | | | | | Use real AS object by passing it through the requester | Luke Barnard | 2016-10-20 | 3 | -18/+15 |
| * | | | | | | | Allow Configurable Rate Limiting Per AS | Luke Barnard | 2016-10-18 | 3 | -1/+26 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1164 from pik/error-codes | Erik Johnston | 2016-10-19 | 2 | -7/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Refactor test_filter to use real DataStore | pik | 2016-10-18 | 2 | -3/+2 |
| * | | | | | | | Error codes for filters | Alexander Maznev | 2016-10-14 | 1 | -4/+4 |
* | | | | | | | | Merge pull request #1176 from matrix-org/erikj/eager_ratelimit_check | Erik Johnston | 2016-10-19 | 2 | -6/+25 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Comment | Erik Johnston | 2016-10-19 | 1 | -0/+3 |
| * | | | | | | | Check whether to ratelimit sooner to avoid work | Erik Johnston | 2016-10-19 | 2 | -6/+22 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Latest delta is now 37 | David Baker | 2016-10-19 | 1 | -0/+0 |
* | | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_i... | David Baker | 2016-10-19 | 7 | -5/+89 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix push notifications for a single unread message | Erik Johnston | 2016-10-18 | 1 | -1/+1 |
| * | | | | | | | Reduce redundant database work in email pusher | Erik Johnston | 2016-10-18 | 1 | -0/+4 |
| |/ / / / / / | |||||
| * | | | | | | Bump version and changelog | Erik Johnston | 2016-10-17 | 1 | -1/+1 |
| * | | | | | | Bump schema version | Erik Johnston | 2016-10-17 | 2 | -1/+1 |
| * | | | | | | Remove TODO | Erik Johnston | 2016-10-17 | 1 | -2/+0 |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_auth | Erik Johnston | 2016-10-17 | 65 | -1327/+2800 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge pull request #1162 from larroy/master | Erik Johnston | 2016-10-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Use sys.executable instead of hardcoded python. fixes #1161 | Pedro Larroy | 2016-10-08 | 1 | -1/+1 |
| * | | | | | | | | Drop some unused indices | Erik Johnston | 2016-10-17 | 3 | -17/+83 |
| * | | | | | | | | Remove redundant event_auth index | Erik Johnston | 2016-09-13 | 1 | -0/+16 |
* | | | | | | | | | Convert emails to lowercase when storing | David Baker | 2016-10-19 | 2 | -1/+20 |
* | | | | | | | | | Revert part of 6207399 | David Baker | 2016-10-14 | 1 | -20/+10 |
* | | | | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_i... | David Baker | 2016-10-14 | 12 | -467/+669 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_... | Erik Johnston | 2016-10-14 | 13 | -498/+712 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete | Richard van der Hoff | 2016-10-13 | 1 | -5/+20 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Handle delete device requests with no body | Richard van der Hoff | 2016-10-12 | 1 | -2/+11 |
| | | * | | | | | | | | User-interactive auth on delete device | Richard van der Hoff | 2016-10-12 | 1 | -5/+11 |
| | * | | | | | | | | | Merge pull request #1167 from matrix-org/markjh/fingerprints | Mark Haines | 2016-10-12 | 2 | -13/+46 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Explain how long the servers can cache the TLS fingerprints for | Mark Haines | 2016-10-12 | 1 | -3/+4 |
| | | * | | | | | | | | | Improve comment formatting | Mark Haines | 2016-10-12 | 2 | -4/+7 |
| | | * | | | | | | | | | Add config option for adding additional TLS fingerprints | Mark Haines | 2016-10-11 | 2 | -12/+41 |
| | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #1155 from matrix-org/erikj/pluggable_pwd_auth | Erik Johnston | 2016-10-12 | 5 | -398/+471 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Implement pluggable password auth | Erik Johnston | 2016-10-03 | 5 | -398/+471 |
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio... | Erik Johnston | 2016-10-11 | 18 | -289/+475 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Fix check of wrong variable | Erik Johnston | 2016-10-11 | 1 | -1/+1 |
| | * | | | | | | | | | | Reduce DB hits for replication | Erik Johnston | 2016-09-23 | 3 | -38/+108 |
| * | | | | | | | | | | | Fix email push notifs being dropped | Erik Johnston | 2016-10-13 | 1 | -14/+25 |
* | | | | | | | | | | | | Make password reset email field case insensitive | David Baker | 2016-10-14 | 2 | -10/+36 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup | Richard van der Hoff | 2016-10-11 | 1 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Work around email-spamming Riot bug | Richard van der Hoff | 2016-10-11 | 1 | -3/+14 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1157 from Rugvip/nolimit | Erik Johnston | 2016-10-11 | 10 | -46/+46 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | rest/client/v1/register: use the correct requester in createUser | Patrik Oldsberg | 2016-10-06 | 2 | -7/+8 |
| * | | | | | | | | | | handlers/profile: added admin override for set_displayname and set_avatar_url | Patrik Oldsberg | 2016-10-06 | 1 | -4/+4 |
| * | | | | | | | | | | handers: do not ratelimit app service senders | Patrik Oldsberg | 2016-10-06 | 1 | -1/+7 |
| * | | | | | | | | | | storage/appservice: make appservice methods only relying on the cache synchro... | Patrik Oldsberg | 2016-10-06 | 8 | -34/+27 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1150 from Rugvip/state_key | Erik Johnston | 2016-10-11 | 1 | -10/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | api/auth: fix for not being allowed to set your own state_key | Patrik Oldsberg | 2016-09-30 | 1 | -10/+0 |
* | | | | | | | | | | Merge pull request #1160 from matrix-org/rav/401_on_password_fail | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Interactive Auth: Return 401 from for incorrect password | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1159 from matrix-org/rav/uia_fallback_postmessage | Richard van der Hoff | 2016-10-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | window.postmessage for Interactive Auth fallback | Richard van der Hoff | 2016-10-06 | 1 | -1/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Bump changelog and version | Erik Johnston | 2016-10-05 | 1 | -1/+1 |
* | | | | | | | | | Bump version and changelog | Erik Johnston | 2016-09-30 | 1 | -1/+1 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Restructure ldap authentication | Martin Weinelt | 2016-09-29 | 1 | -87/+192 |
* | | | | | | | | Merge pull request #1145 from matrix-org/erikj/fix_reindex | Erik Johnston | 2016-09-29 | 1 | -15/+29 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix background reindex of origin_server_ts | Erik Johnston | 2016-09-27 | 1 | -15/+29 |
* | | | | | | | | Remove duplication | Erik Johnston | 2016-09-27 | 1 | -31/+19 |
* | | | | | | | | Remove unused variable | Erik Johnston | 2016-09-27 | 1 | -3/+0 |
* | | | | | | | | Fix perf of fetching state in SQLite | Erik Johnston | 2016-09-26 | 1 | -20/+41 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1140 from matrix-org/erikj/typing_fed_timeout | Erik Johnston | 2016-09-26 | 3 | -73/+111 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move FEDERATION_PING_INTERVAL timer. Update log line | Erik Johnston | 2016-09-23 | 1 | -8/+10 |
| * | | | | | | | Time out typing over federation | Erik Johnston | 2016-09-23 | 3 | -73/+109 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | |