Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | fix comment | Matthew Hodgson | 2017-01-05 | 1 | -1/+17 |
| | | | |||||
| * | | limit total timeout for get_missing_events to 10s | Matthew Hodgson | 2016-12-31 | 3 | -3/+11 |
|/ / | |||||
* | | Merge branch 'release-v0.18.6' into develop | Matthew Hodgson | 2016-12-31 | 5 | -70/+25 |
|\| | |||||
| * | Bump version and changelog v0.18.6-rc2 | Mark Haines | 2016-12-30 | 2 | -1/+11 |
| | | |||||
| * | Merge pull request #1736 from matrix-org/markjh/linearizer_logging | Mark Haines | 2016-12-30 | 2 | -0/+14 |
| |\ | | | | | | | Add more useful logging when we block fetching events | ||||
| | * | s/aquire/acquire/g | Mark Haines | 2016-12-30 | 2 | -3/+3 |
| | | | |||||
| | * | Add more useful logging when we block fetching events | Mark Haines | 2016-12-30 | 2 | -0/+14 |
| |/ | |||||
| * | Merge pull request #1734 from matrix-org/markjh/fix_get_missing | Mark Haines | 2016-12-30 | 1 | -69/+0 |
| |\ | | | | | | | Remove fallback from get_missing_events. | ||||
| | * | Remove fallback from get_missing_events. | Mark Haines | 2016-12-30 | 1 | -69/+0 |
| |/ | | | | | | | | | | | | | get_missing_events used to fallback to fetching the missing events individually requesting from every server in the room, one by one.e This could be unacceptably slow, possibly causing #1732 | ||||
* | | Merge remote-tracking branch 'origin/release-v0.18.6' into develop | Mark Haines | 2016-12-30 | 1 | -3/+13 |
|\| | |||||
| * | Merge pull request #1731 from matrix-org/markjh/logging-memleak | Mark Haines | 2016-12-30 | 1 | -3/+13 |
| |\ | | | | | | | Use the new twisted logging framework. | ||||
| | * | Use the new twisted logging framework. | Mark Haines | 2016-12-30 | 1 | -3/+13 |
| |/ | | | | | | | | | Hopefully adding an observer to the new framework will avoid a memory leak https://twistedmatrix.com/trac/ticket/8164 | ||||
* | | Merge branch 'release-v0.18.6' into develop | Mark Haines | 2016-12-29 | 4 | -8/+78 |
|\| | |||||
| * | Bump changelog and version v0.18.6-rc1 | Mark Haines | 2016-12-29 | 2 | -1/+8 |
| | | |||||
| * | Merge pull request #1725 from matrix-org/erikj/timeout_conn | Mark Haines | 2016-12-29 | 2 | -7/+70 |
| |\ | | | | | | | Wrap connections in an N minute timeout to ensure they get reaped correctly | ||||
| | * | Manually abort the underlying TLS connection. | Mark Haines | 2016-12-29 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The abort() method calls loseConnection() which tries to shutdown the TLS connection cleanly. We now call abortConnection() directly which should promptly close both the TLS connection and the underlying TCP connection. I also added some TODO markers to consider cancelling the old previous timeout rather than checking time.time(). But given how urgently we want to get this code released I'd rather leave the existing code with the duplicate timeouts and the time.time() check. | ||||
| | * | Respect long_retries param and default to off | Erik Johnston | 2016-12-29 | 1 | -2/+2 |
| | | | |||||
| | * | Spelling and comments | Erik Johnston | 2016-12-29 | 1 | -4/+6 |
| | | | |||||
| | * | Clean up | Erik Johnston | 2016-12-29 | 2 | -7/+4 |
| | | | |||||
| | * | Wrap connections in an N minute timeout to ensure they get reaped correctly | Erik Johnston | 2016-12-29 | 2 | -5/+61 |
| | | | |||||
* | | | Fix another comment typo | David Baker | 2016-12-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1714 from matrix-org/dbkr/delete_threepid | David Baker | 2016-12-21 | 3 | -1/+57 |
|\ \ \ | | | | | | | | | Add /account/3pid/delete endpoint | ||||
| * | | | Add /account/3pid/delete endpoint | David Baker | 2016-12-20 | 3 | -1/+57 |
|/ / / | | | | | | | | | | Also fix a typo in a comment | ||||
* | | | Merge pull request #1712 from kyrias/fix-bind-address-none | Matthew Hodgson | 2016-12-20 | 8 | -16/+16 |
|\ \ \ | | | | | | | | | Fix check for bind_address | ||||
| * | | | Fix check for bind_address | Johannes Löthberg | 2016-12-20 | 8 | -16/+16 |
|/ / / | | | | | | | | | | | | | | | | | | | The empty string is a valid setting for the bind_address option, so explicitly check for None here instead. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
* | | | Merge pull request #1711 from matrix-org/matthew/utf8-password-change | Matthew Hodgson | 2016-12-20 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | fix ability to change password to a non-ascii one | ||||
| * | | | fix ability to change password to a non-ascii one | Matthew Hodgson | 2016-12-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | https://github.com/vector-im/riot-web/issues/2658 | ||||
* | | | | Merge pull request #1709 from kyrias/bind_addresses | Matthew Hodgson | 2016-12-19 | 10 | -176/+304 |
|\ \ \ \ | | | | | | | | | | | Add support for specifying multiple bind addresses | ||||
| * | | | | Add IPv6 comment to default config | Johannes Löthberg | 2016-12-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | | Update README to use `bind_addresses` | Johannes Löthberg | 2016-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | | Make default homeserver config use bind_addresses | Johannes Löthberg | 2016-12-18 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | | Add support for specifying multiple bind addresses | Johannes Löthberg | 2016-12-18 | 8 | -171/+294 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
* | | | | Merge pull request #1696 from kyrias/ipv6 | Matthew Hodgson | 2016-12-19 | 3 | -24/+23 |
|\ \ \ \ | |/ / / |/| | | | IPv6 support | ||||
| * | | | Bump twisted dependency | Johannes Löthberg | 2016-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | At least 16.0.0 is needed for wrapClientTLS support. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | Remove spurious newline | Johannes Löthberg | 2016-12-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Apparently I just removed the spaces instead... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | Fixup for #1689 and #1690 | Johannes Löthberg | 2016-12-12 | 2 | -8/+13 |
| | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | IPv6 support for endpoint.py | Glyph | 2016-12-11 | 1 | -4/+4 |
| | | | | | | | | | | | | Similar to https://github.com/matrix-org/synapse/pull/1689, but for endpoint.py | ||||
| * | | | IPv6 support for client.py | Glyph | 2016-12-11 | 1 | -16/+11 |
| | | | | | | | | | | | | This is an (untested) general sketch of how to use wrapClientTLS to implement TLS over IPv6, as well as faster connections over IPv4. | ||||
* | | | | Cache network room list queries. | Erik Johnston | 2016-12-16 | 1 | -3/+4 |
| |_|/ |/| | | |||||
* | | | Merge branch 'release-v0.18.5' of github.com:matrix-org/synapse v0.18.5 | Erik Johnston | 2016-12-16 | 105 | -1213/+2917 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bump version and changelog | Erik Johnston | 2016-12-16 | 2 | -1/+10 |
| | | | |||||
| * | | Merge pull request #1704 from matrix-org/rav/log_todevice_syncs | Richard van der Hoff | 2016-12-15 | 2 | -5/+10 |
| |\ \ | | | | | | | | | Add some logging for syncing to_device events | ||||
| | * | | Add some logging for syncing to_device events | Richard van der Hoff | 2016-12-15 | 2 | -5/+10 |
| |/ / | | | | | | | | | | | | | Attempt to track down the loss of to_device events (https://github.com/vector-im/riot-web/issues/2711 etc). | ||||
| * | | Merge pull request #1698 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-15 | 1 | -2/+4 |
| |\ \ | | | | | | | | | Fix caching on public room list | ||||
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_list | Erik Johnston | 2016-12-13 | 2 | -1/+35 |
| | |\ \ | |||||
| | * | | | Fix caching on public room list | Erik Johnston | 2016-12-13 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | Merge pull request #1702 from manuroe/mac_install_update | Erik Johnston | 2016-12-15 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Update prerequisites instructions on Mac OS | ||||
| | * | | | | Update prerequisites instructions on Mac OS | manuroe | 2016-12-15 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #1700 from matrix-org/erikj/backfill_filter | Erik Johnston | 2016-12-15 | 1 | -2/+5 |
| |\ \ \ \ | | | | | | | | | | | | | Fix /backfill returning events it shouldn't | ||||
| | * | | | | Comment | Erik Johnston | 2016-12-14 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Fix /backfill returning events it shouldn't | Erik Johnston | 2016-12-14 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #1701 from mbachry/fix-preview-crash | Erik Johnston | 2016-12-15 | 2 | -1/+54 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix crash in url preview | ||||
| | * | | | | Fix crash in url preview when html tag has no text | Marcin Bachry | 2016-12-14 | 2 | -1/+54 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Marcin Bachry <hegel666@gmail.com> | ||||
| * | / / | Fixup membership query | Erik Johnston | 2016-12-14 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
| * | | | Update changelog v0.18.5-rc3 github/release-v0.18.5 release-v0.18.5 | Erik Johnston | 2016-12-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bump changelog and version | Erik Johnston | 2016-12-13 | 2 | -1/+35 |
| |/ / | |||||
| * | | 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 | ||||
| | * | | 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 |
| |\ \ \ | | |/ / | |/| | | Add new API appservice specific public room list | ||||
| | * | | 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 |
| | | | | |||||
| * | | | Merge pull request #1694 from matrix-org/rav/no_get_e2e_keys | Richard van der Hoff | 2016-12-12 | 1 | -39/+4 |
| |\ \ \ | | | | | | | | | | | Remove unspecced GET endpoints for e2e keys | ||||
| | * | | | Remove unspecced GET endpoints for e2e keys | Richard van der Hoff | 2016-12-12 | 1 | -39/+4 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GET /keys/claim is a terrible idea, since it isn't idempotent; also it throws 500 errors if you call it without all the right params. GET /keys/query is arguable, but it's unspecced, so let's get rid of it too to stop people relying on unspecced APIs. | ||||
| * | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2016-12-12 | 1 | -4/+13 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1685 from matrix-org/rav/update_readme_for_tests | Richard van der Hoff | 2016-12-12 | 1 | -5/+14 |
|\ \ \ \ | | | | | | | | | | | Update the readme to use trial | ||||
| * | | | | fix pythonpath | Richard van der Hoff | 2016-12-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update the readme to use trial | Richard van der Hoff | 2016-12-09 | 1 | -5/+14 |
|/ / / / | |||||
| * | | | Merge pull request #1620 from matrix-org/erikj/concurrent_room_access | Erik Johnston | 2016-12-12 | 3 | -27/+161 |
| |\ \ \ | | | | | | | | | | | Limit the number of events that can be created on a given room concurrently | ||||
| | * | | | 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 | 2 | -0/+115 |
| | | | | | |||||
| * | | | | Merge pull request #1686 from matrix-org/rav/fix_federation_key_fails | Richard van der Hoff | 2016-12-12 | 1 | -0/+10 |
| |\ \ \ \ | | |_|_|/ | |/| | | | E2E key query: handle federation fails | ||||
| | * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Don't fail the whole request if we can't connect to a particular server. | ||||
| * | | | | Merge pull request #1684 from matrix-org/rav/no_run_tox_from_setup | Richard van der Hoff | 2016-12-09 | 1 | -33/+40 |
| |\ \ \ \ | | | | | | | | | | | | | Don't try to run tox from setup.py | ||||
| | * | | | | Implement a null 'test' command | Richard van der Hoff | 2016-12-09 | 1 | -2/+15 |
| | | | | | | |||||
| | * | | | | Don't try to run tox from setup.py | Richard van der Hoff | 2016-12-09 | 1 | -34/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Using tox to run the tests is a bad idea, as per the comments. | ||||
| * | | | | | Merge pull request #1683 from matrix-org/erikj/notifier_sadness | Erik Johnston | 2016-12-09 | 4 | -18/+34 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix rare notifier bug where listeners dont timeout | ||||
| | * | | | | Fix unit tests | Erik Johnston | 2016-12-09 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition that caused the notifier to 'miss' the timeout notification, since there were no other checks for the timeout this caused listeners to get stuck in a loop until something happened. | ||||
| * | | | | | Fix broken README merge | Richard van der Hoff | 2016-12-09 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | When 546ec1a was merged into develop, I accidentally overwrote the change introduced in debbea5 (pr #1657). Reintroduce it. | ||||
| * | | | | Merge pull request #1680 from matrix-org/erikj/joined_rooms | Erik Johnston | 2016-12-09 | 6 | -9/+165 |
| |\ \ \ \ | | | | | | | | | | | | | Add new room membership APIs | ||||
| | * | | | | Add /room/<room_id>/joined_members API | Erik Johnston | 2016-12-08 | 3 | -9/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns the currently joined members in the room with their display names and avatar urls. This is more efficient than /members for large rooms where you don't need the full events. | ||||
| | * | | | | 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 |
| | |/ / / | |||||
| * | | | | Merge pull request #1678 from matrix-org/rav/fix_receipt_notifications | Richard van der Hoff | 2016-12-08 | 2 | -2/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | Read-receipt fixes | ||||
| | * | | | Fix ignored read-receipts | Richard van der Hoff | 2016-12-08 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Don't ignore read-receipts which arrive in the same EDU as a read-receipt for an old event. | ||||
| | * | | | Fix result of insert_receipt | Richard van der Hoff | 2016-12-08 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | This should fix the absence of notifications when new receipts arrive. | ||||
| * | | | Merge pull request #1672 from williamleuschner/develop | Erik Johnston | 2016-12-06 | 1 | -0/+30 |
| |\ \ \ | | | | | | | | | | | Add README instructions for OpenBSD installation | ||||
| | * | | | Fix incorrect numbering on OpenBSD instructions caused by my own incompetence | William Leuschner | 2016-12-06 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: William Leuschner <wel2138@rit.edu> | ||||
| | * | | | Update incorrect information in README about ksh and source | William Leuschner | 2016-12-06 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: William Leuschner <wel2138@rit.edu> | ||||
| | * | | | Add README instructions for OpenBSD installation | William Leuschner | 2016-12-05 | 1 | -0/+34 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: William Leuschner <wel2138@rit.edu> | ||||
| * | | | | Prevent user tokens being used as guest tokens (#1675) | Richard van der Hoff | 2016-12-06 | 3 | -31/+115 |
| | |_|/ | |/| | | | | | | | | | | | | | | Make sure that a user cannot pretend to be a guest by adding 'guest = True' caveats. | ||||
| * | | | Travis config (#1674) | Richard van der Hoff | 2016-12-06 | 1 | -0/+17 |
| | | | | |||||
| * | | | Merge pull request #1673 from matrix-org/rav/fix_tox_tests | Richard van der Hoff | 2016-12-06 | 1 | -0/+7 |
| |\ \ \ | | |/ / | |/| | | Fix unittests under tox | ||||
| | * | | Fix unittests under tox | Richard van der Hoff | 2016-12-06 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | We now need to set PYTHONPATH when running the unit tests; update tox config to do so. | ||||
| * | | | 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 | ||||
| | * | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | Log the args that we have on UI auth completion | ||||
| | * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be super helpful for debugging if we have more registration woes. | ||||
| * | | | | | Merge pull request #1668 from pik/bug-console-filter | Erik Johnston | 2016-12-05 | 1 | -0/+1 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Logging: Fix console filter breaking when level is DEBUG | ||||
| | * | | | | Bugfix: Console logging handler missing default filter | pik | 2016-12-03 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #1671 from kyrias/fix-preview-test | Richard van der Hoff | 2016-12-05 | 1 | -68/+68 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix preview test | ||||
| | * | | | | | test_preview: Fix incorrect wrapping | Johannes Löthberg | 2016-12-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old test expected an incorrect wrapping due to the preview function not using unicode properly, so it got the wrong length. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| | * | | | | | Make test_preview use unicode strings | Johannes Löthberg | 2016-12-05 | 1 | -68/+68 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2016-12-05 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
* | | | | | README: fix link | Richard van der Hoff | 2016-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2016-12-03 | 2 | -187/+355 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1667 from matrix-org/rav/update_readme | Richard van der Hoff | 2016-12-03 | 2 | -192/+359 |
|\ \ \ \ \ | | | | | | | | | | | | | Updates to the README | ||||
| * | | | | | README: review comments | Richard van der Hoff | 2016-12-02 | 1 | -32/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | Minor updates post-review | ||||
| * | | | | | README: rewrite federation section | Richard van der Hoff | 2016-12-02 | 1 | -50/+55 |
| | | | | | | |||||
| * | | | | | README: add reverse-proxying section | Richard van der Hoff | 2016-12-02 | 1 | -0/+99 |
| | | | | | | |||||
| * | | | | | README: Rewrite "Identity servers" section | Richard van der Hoff | 2016-12-02 | 1 | -15/+22 |
| | | | | | | |||||
| * | | | | | README: rewrite installation instructions | Richard van der Hoff | 2016-12-02 | 1 | -10/+57 |
| | | | | | | |||||
| * | | | | | README: remove refs to demo client | Richard van der Hoff | 2016-12-02 | 1 | -36/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The demo client isn't really fit for purpose, so stop encouraging people to use it. | ||||
| * | | | | | README: code quotes | Richard van der Hoff | 2016-12-02 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add some syntax highlighting | ||||
| * | | | | | README: "About matrix" updates | Richard van der Hoff | 2016-12-02 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove redundant "where's the spec" section: this would belong in "About matrix", but it's already there. - E2E is in beta rather than dev | ||||
| * | | | | | README: Fix links | Richard van der Hoff | 2016-12-02 | 1 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix a couple of broken links | ||||
| * | | | | | Rearrange the README | Richard van der Hoff | 2016-12-02 | 1 | -85/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some bits of the README around. No words were changed in the making of this commit. | ||||
| * | | | | | rename CAPTCHA_SETUP | Richard van der Hoff | 2016-12-01 | 2 | -8/+7 |
|/ / / / / | | | | | | | | | | | | | | | | this is rst so name it accordingly | ||||
| * | | | | Merge pull request #1664 from kyrias/preview-url-resource-encoding | Matthew Hodgson | 2016-12-03 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | preview_url_resource: Ellipsis must be in unicode string | ||||
| | * | | | | preview_url_resource: Ellipsis must be in unicode string | Johannes Löthberg | 2016-12-01 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
| * | | | | Merge pull request #1654 from matrix-org/rav/no_more_refresh_tokens | Richard van der Hoff | 2016-12-01 | 9 | -210/+26 |
| |\ \ \ \ | | | | | | | | | | | | | Stop generating refresh_tokens | ||||
| | * | | | | Fix doc-string | Richard van der Hoff | 2016-12-01 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Remove refresh_token reference | ||||
| | * | | | | fix imports | Richard van der Hoff | 2016-11-30 | 1 | -3/+0 |
| | | | | | | |||||
| | * | | | | Rip out more refresh_token code | Richard van der Hoff | 2016-11-30 | 7 | -160/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We might as well treat all refresh_tokens as invalid. Just return a 403 from /tokenrefresh, so that we don't have a load of dead, untestable code hanging around. Still TODO: removing the table from the schema. | ||||
| | * | | | | Merge branch 'develop' into rav/no_more_refresh_tokens | Richard van der Hoff | 2016-11-30 | 14 | -78/+94 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 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 | ||||
| | * | | | | | More intelligent Content-Type parsing | Richard van der Hoff | 2016-11-30 | 1 | -18/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Content-Type is allowed to contain options (`; charset=utf-8`, for instance). We should allow that. | ||||
| * | | | | | | Merge pull request #1656 from matrix-org/rav/remove_time_caveat | Richard van der Hoff | 2016-11-30 | 7 | -36/+26 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Stop putting a time caveat on access tokens | ||||
| | * | | | | | | Comments | Richard van der Hoff | 2016-11-30 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update comments in verify_macaroon | ||||
| | * | | | | | | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 7 | -33/+17 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'time' caveat on the access tokens was something of a lie, since we weren't enforcing it; more pertinently its presence stops us ever adding useful time caveats. Let's move in the right direction by not lying in our caveats. | ||||
| * | | | | | | Merge pull request #1653 from matrix-org/rav/guest_e2e | Richard van der Hoff | 2016-11-29 | 5 | -14/+29 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implement E2E for guests | ||||
| | * | | | | | | Allow guest access to endpoints for E2E | Richard van der Hoff | 2016-11-25 | 3 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose /devices, /keys, and /sendToDevice to guest users, so that they can use E2E. | ||||
| | * | | | | | | Give guest users a device_id | Richard van der Hoff | 2016-11-25 | 2 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to create devices for guests so that they can use e2e, but we don't have anywhere to store it, so just use a fixed one. | ||||
| * | | | | | | | Merge pull request #1657 from matrix-org/rav/hurry_up_pip | Richard van der Hoff | 2016-11-29 | 2 | -10/+9 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Let pip install multiple packages at once | ||||
| | * | | | | | | Let pip install multiple packages at once | Richard van der Hoff | 2016-11-29 | 2 | -10/+9 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pip can install multiple dependencies at the same time, so there is no need to use xargs -n1. It's significantly slower with -n1, so let's not do it with no reason. | ||||
| | | * / / / | Stop generating refresh tokens | Richard van der Hoff | 2016-11-28 | 4 | -45/+20 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're not doing refresh tokens any more, we should start killing off the dead code paths. /tokenrefresh itself is a bit of a thornier subject, since there might be apps out there using it, but we can at least not generate refresh tokens on new logins. | ||||
| * | | | | | 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 | ||||
| | * | | | | | Remove redundant list of known caveat prefixes | Richard van der Hoff | 2016-11-24 | 1 | -26/+8 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | Also add some comments. | ||||
| * | | | | | Merge pull request #1650 from matrix-org/erikj/respect_ratelimited | Erik Johnston | 2016-11-24 | 2 | -1/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Correctly handle 500's and 429 on federation | ||||
| | * | | | | | 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 | 2 | -1/+8 |
| | | | | | | |||||
| * | | | | | 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 | 2 | -1/+16 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #1644 from matrix-org/erikj/efficient_notif_counts | Erik Johnston | 2016-11-23 | 2 | -8/+50 |
| |\ \ \ \ | | | | | | | | | | | | | More efficient notif count queries | ||||
| | * | | | | 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 | 38 | -219/+1131 |
| |\ \ \ \ | | | | | | | | | | | | | Split out federation transaction sending to a worker | ||||
| | * | | | | Shuffle receipt handler around so that worker apps don't need to load it | Erik Johnston | 2016-11-23 | 7 | -9/+11 |
| | | | | | | |||||
| | * | | | | Fix tests | Erik Johnston | 2016-11-23 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | 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 ↵ | Erik Johnston | 2016-11-23 | 10 | -25/+396 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/split_out_fed_txn | ||||
| | * | | | | | 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 | 2 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Invalidate retry cache in both directions | Erik Johnston | 2016-11-22 | 6 | -27/+132 |
| | | | | | | | |||||
| | * | | | | | Comments | Erik Johnston | 2016-11-21 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Add federation-sender to sytest | Erik Johnston | 2016-11-21 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | 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 | 4 | -7/+24 |
| | | | | | | | |||||
| | * | | | | | 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 | ||||
| | * | | | | | Ignore AS users when fetching push rules | Erik Johnston | 2016-11-23 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By ignoring AS users early on when fetching push rules for a room we can avoid needlessly hitting the DB and filling up the caches. | ||||
| * | | | | | | Merge pull request #1640 from matrix-org/kegan/sync-perf | Kegsay | 2016-11-22 | 2 | -9/+51 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Return early on /sync code paths if a '*' filter is used | ||||
| | * | | | | | Return early on /sync code paths if a '*' filter is used | Kegan Dougal | 2016-11-22 | 2 | -9/+51 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently very conservative in that it only does this if there is no `since` token. This limits the risk to clients likely to be doing one-off syncs (like bridges), but does mean that normal human clients won't benefit from the time savings here. If the savings are large enough, I would consider generalising this to just check the filter. | ||||
| * | | | | | Merge pull request #1638 from matrix-org/kegan/sync-event-fields | Kegsay | 2016-11-22 | 4 | -15/+296 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Implement "event_fields" in filters | ||||
| | * | | | | Review comments | Kegan Dougal | 2016-11-22 | 2 | -21/+11 |
| | | | | | | |||||
| | * | | | | 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 | 2 | -4/+60 |
| | | | | | | |||||
| | * | | | | Add remaining tests | Kegan Dougal | 2016-11-21 | 1 | -4/+70 |
| | | | | | | |||||
| | * | | | | Start adding some tests | Kegan Dougal | 2016-11-21 | 2 | -4/+40 |
| | | | | | | |||||
| | * | | | | Move event_fields filtering to serialize_event | Kegan Dougal | 2016-11-21 | 3 | -59/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also make it an inclusive not exclusive filter, as the spec demands. | ||||
| | * | | | | 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 | 3 | -1/+40 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4 | Erik Johnston | 2016-11-22 | 32 | -430/+383 |
|\ \ \ \ \ | |||||
| * | | | | | Bump changelog | Erik Johnston | 2016-11-22 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | Merge branch 'dbkr/work_around_devicename_bug' of ↵ | Erik Johnston | 2016-11-22 | 1 | -0/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into release-v0.18.4 | ||||
| | * | | | | | Fix flake8 | Mark Haines | 2016-11-18 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Work around client replacing reg params | David Baker | 2016-11-18 | 1 | -0/+12 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Works around https://github.com/vector-im/vector-android/issues/715 and equivalent for iOS | ||||
| * | | | | | Bump changelog and version v0.18.4-rc1 | Erik Johnston | 2016-11-14 | 2 | -1/+21 |
| | | | | | | |||||
| | * | | | | Merge pull request #1636 from matrix-org/kegan/filter-error-msg | Kegsay | 2016-11-21 | 2 | -0/+9 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | Fail with a coherent error message if `/sync?filter=` is invalid | ||||
| | | * | | | 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 | ||||
| | | * | | | Use external ldap auth pacakge | Erik Johnston | 2016-11-15 | 4 | -378/+17 |
| | | | | | |