Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix bug where current_state_events renamed to current_state_ids | Erik Johnston | 2017-01-23 | 1 | -3/+3 |
* | Merge pull request #1836 from matrix-org/erikj/current_state_fix | Erik Johnston | 2017-01-20 | 5 | -201/+217 |
|\ | |||||
| * | 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 | Richard van der Hoff | 2017-01-20 | 1 | -5/+3 |
|/ / | |||||
* | | Merge pull request #1835 from matrix-org/erikj/fix_workers | Erik Johnston | 2017-01-20 | 1 | -0/+10 |
|\| | |||||
| * | 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 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 |
|/ | |||||
* | 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 | 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 | Adrian Perez de Castro | 2017-01-13 | 2 | -6/+21 |
* | | | 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 | David Baker | 2017-01-18 | 2 | -1/+12 |
|/ / | |||||
* | | Merge pull request #1823 from matrix-org/erikj/load_events_logs | Erik Johnston | 2017-01-18 | 1 | -2/+2 |
|\ \ | |||||
| * | | 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 | 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 | 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 | 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 |
|\ \ \ | |||||
| * | | | 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 | 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 |
|\| | | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | 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 |
| * | | | 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 |
|\| | | |||||
| * | | 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 |
|\ \ \ | |_|/ |/| | | |||||
| * | | 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 |
* | | | Merge pull request #1795 from matrix-org/erikj/port_defaults | Erik Johnston | 2017-01-13 | 9 | -84/+29 |
|\ \ \ | |||||
| * | | | 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 |
* | | | Merge pull request #1803 from matrix-org/erikj/swallow_errors | Erik Johnston | 2017-01-13 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | 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 | Erik Johnston | 2017-01-12 | 2 | -79/+0 |
|/ / / | |||||
* | | | 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 | Erik Johnston | 2017-01-10 | 2 | -3/+6 |
| |/ | |||||
* | | Merge pull request #1790 from matrix-org/erikj/linearizer | Erik Johnston | 2017-01-10 | 1 | -2/+5 |
|\ \ | |||||
| * | | 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 | 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 |
|\ \ | |||||
| * | | 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/ | 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 | 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 |
| |/ | |||||
| * | 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 | Patrik Oldsberg | 2017-01-06 | 1 | -4/+6 |
| |/ | |||||
* | | 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 |
| |\ | |||||
| | * | Fix case | Matthew Hodgson | 2017-01-05 | 1 | -1/+1 |
| | * | add logging for all the places we call resolve_state_groups. my kingdom for a... | Matthew Hodgson | 2017-01-05 | 3 | -0/+6 |
| | * | 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 | 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 |
| |\ | |||||
| | * | 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. | Mark Haines | 2017-01-05 | 3 | -0/+25 |
| |/ | |||||
| * | Merge pull request #1758 from matrix-org/markjh/fix_ban_propagation | Mark Haines | 2017-01-04 | 1 | -6/+9 |
| |\ | |||||
| | * | Get the destinations from the state from before the event | Mark Haines | 2017-01-04 | 1 | -8/+9 |
| | * | Send ALL membership events to the server that was affected. | Mark Haines | 2017-01-04 | 1 | -3/+5 |
| |/ | |||||
* | | Merge pull request #1744 from matrix-org/matthew/timeout_get_missing_events | Mark Haines | 2017-01-05 | 3 | -3/+27 |
|\ \ | |||||
| * | | 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 |
| |\ | |||||
| | * | 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. | Mark Haines | 2016-12-30 | 1 | -69/+0 |
| |/ | |||||
* | | 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. | Mark Haines | 2016-12-30 | 1 | -3/+13 |
| |/ | |||||
* | | 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 |
| |\ | |||||
| | * | Manually abort the underlying TLS connection. | Mark Haines | 2016-12-29 | 1 | -2/+10 |
| | * | 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 | David Baker | 2016-12-20 | 3 | -1/+57 |
|/ / / | |||||
* | | | Merge pull request #1712 from kyrias/fix-bind-address-none | Matthew Hodgson | 2016-12-20 | 8 | -16/+16 |
|\ \ \ | |||||
| * | | | Fix check for bind_address | Johannes Löthberg | 2016-12-20 | 8 | -16/+16 |
|/ / / | |||||
* | | | 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 | Matthew Hodgson | 2016-12-18 | 1 | -2/+2 |
* | | | | Merge pull request #1709 from kyrias/bind_addresses | Matthew Hodgson | 2016-12-19 | 10 | -176/+304 |
|\ \ \ \ | |||||
| * | | | | Add IPv6 comment to default config | Johannes Löthberg | 2016-12-18 | 1 | -0/+4 |
| * | | | | Update README to use `bind_addresses` | Johannes Löthberg | 2016-12-18 | 1 | -1/+1 |
| * | | | | Make default homeserver config use bind_addresses | Johannes Löthberg | 2016-12-18 | 1 | -4/+5 |
| * | | | | Add support for specifying multiple bind addresses | Johannes Löthberg | 2016-12-18 | 8 | -171/+294 |
| |/ / / | |||||
* | | | | Merge pull request #1696 from kyrias/ipv6 | Matthew Hodgson | 2016-12-19 | 3 | -24/+23 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Bump twisted dependency | Johannes Löthberg | 2016-12-18 | 1 | -1/+1 |
| * | | | Remove spurious newline | Johannes Löthberg | 2016-12-12 | 1 | -1/+0 |
| * | | | Fixup for #1689 and #1690 | Johannes Löthberg | 2016-12-12 | 2 | -8/+13 |
| * | | | IPv6 support for endpoint.py | Glyph | 2016-12-11 | 1 | -4/+4 |
| * | | | IPv6 support for client.py | Glyph | 2016-12-11 | 1 | -16/+11 |
* | | | | 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 | 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 | 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 | 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 |
| |\ \ \ \ | |||||
| | * | | | | 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 when html tag has no text | Marcin Bachry | 2016-12-14 | 2 | -1/+54 |
| |/ / / / | |||||
| * | / / | Fixup membership query | Erik Johnston | 2016-12-14 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
| * | | | Update changelog v0.18.5-rc3 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 | 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 |
| * | | | 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 | Richard van der Hoff | 2016-12-12 | 1 | -39/+4 |
| |/ / / | |||||
| * | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |
| |\ \ \ | |||||
| | * | | | 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 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | 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 |
| * | | | | Merge pull request #1684 from matrix-org/rav/no_run_tox_from_setup | Richard van der Hoff | 2016-12-09 | 1 | -33/+40 |
| |\ \ \ \ | |||||
| | * | | | | 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 |
| * | | | | | Merge pull request #1683 from matrix-org/erikj/notifier_sadness | Erik Johnston | 2016-12-09 | 4 | -18/+34 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | 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 |
| * | | | | | Fix broken README merge | Richard van der Hoff | 2016-12-09 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | 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 |
| | |/ / / | |||||
| * | | | | Merge pull request #1678 from matrix-org/rav/fix_receipt_notifications | Richard van der Hoff | 2016-12-08 | 2 | -2/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | 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 |
| |/ / / | |||||
| * | | | Merge pull request #1672 from williamleuschner/develop | Erik Johnston | 2016-12-06 | 1 | -0/+30 |
| |\ \ \ | |||||
| | * | | | Fix incorrect numbering on OpenBSD instructions caused by my own incompetence | William Leuschner | 2016-12-06 | 1 | -7/+7 |
| | * | | | Update incorrect information in README about ksh and source | William Leuschner | 2016-12-06 | 1 | -6/+2 |
| | * | | | Add README instructions for OpenBSD installation | William Leuschner | 2016-12-05 | 1 | -0/+34 |
| * | | | | Prevent user tokens being used as guest tokens (#1675) | Richard van der Hoff | 2016-12-06 | 3 | -31/+115 |
| | |_|/ | |/| | | |||||
| * | | | 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 | Richard van der Hoff | 2016-12-06 | 1 | -0/+7 |
| * | | | 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 |
| * | | | | | Merge pull request #1668 from pik/bug-console-filter | Erik Johnston | 2016-12-05 | 1 | -0/+1 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | 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 |
| |\ \ \ \ \ | |||||
| | * | | | | | test_preview: Fix incorrect wrapping | Johannes Löthberg | 2016-12-05 | 1 | -2/+2 |
| | * | | | | | Make test_preview use unicode strings | Johannes Löthberg | 2016-12-05 | 1 | -68/+68 |
| |/ / / / / | |||||
| * | | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | README: review comments | Richard van der Hoff | 2016-12-02 | 1 | -32/+54 |
| * | | | | | 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 |
| * | | | | | README: code quotes | Richard van der Hoff | 2016-12-02 | 1 | -10/+10 |