Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Slightly saner logging for unittests | Richard van der Hoff | 2016-07-25 | 1 | -4/+7 |
* | Merge pull request #944 from matrix-org/rav/devices_returns_list | David Baker | 2016-07-21 | 2 | -9/+12 |
|\ | |||||
| * | make /devices return a list | Richard van der Hoff | 2016-07-21 | 2 | -9/+12 |
|/ | |||||
* | Merge pull request #943 from matrix-org/rav/get_device_api | David Baker | 2016-07-21 | 3 | -19/+90 |
|\ | |||||
| * | Fix PEP8 errors | Richard van der Hoff | 2016-07-21 | 2 | -1/+2 |
| * | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 3 | -19/+89 |
* | | Merge pull request #942 from matrix-org/rav/fix_register_deviceid | David Baker | 2016-07-21 | 1 | -11/+10 |
|\ \ | |/ |/| | |||||
| * | Preserve device_id from first call to /register | Richard van der Hoff | 2016-07-21 | 1 | -11/+10 |
* | | Merge branch 'rav/get_devices_api' into develop | Richard van der Hoff | 2016-07-21 | 1 | -3/+0 |
|\ \ | |||||
| * | | storage/client_ips: remove some dead code | Richard van der Hoff | 2016-07-21 | 1 | -3/+0 |
* | | | Merge pull request #939 from matrix-org/rav/get_devices_api | David Baker | 2016-07-21 | 10 | -17/+395 |
|\| | | |/ |/| | |||||
| * | Fix PEP8 errors | Richard van der Hoff | 2016-07-20 | 2 | -3/+1 |
| * | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 6 | -26/+86 |
| |\ | |/ |/| | |||||
* | | Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ips | Richard van der Hoff | 2016-07-20 | 3 | -8/+34 |
|\ \ | |||||
| * | | Record device_id in client_ips | Richard van der Hoff | 2016-07-20 | 3 | -8/+34 |
* | | | Don't explode if we have no snapshots yet | Erik Johnston | 2016-07-20 | 1 | -0/+3 |
* | | | Merge pull request #937 from matrix-org/rav/register_device_on_register | David Baker | 2016-07-20 | 2 | -18/+49 |
|\ \ \ | |/ / |/| | | |||||
| * | | Register a device_id in the /v2/register flow. | Richard van der Hoff | 2016-07-20 | 2 | -18/+49 |
| | * | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 10 | -17/+397 |
| |/ |/| | |||||
* | | More doc-comments | Richard van der Hoff | 2016-07-20 | 2 | -10/+14 |
|/ | |||||
* | Merge pull request #936 from matrix-org/erikj/log_rss | Erik Johnston | 2016-07-20 | 5 | -1/+54 |
|\ | |||||
| * | Make jenkins install deps on unit tests | Erik Johnston | 2016-07-20 | 1 | -0/+4 |
| * | Add metrics for psutil derived memory usage | Erik Johnston | 2016-07-20 | 4 | -1/+50 |
* | | Merge pull request #935 from matrix-org/erikj/backfill_notifs | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
|\ \ | |||||
| * | | Don't notify pusher pool for backfilled events | Erik Johnston | 2016-07-20 | 1 | -5/+6 |
| |/ | |||||
* | | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 7 | -0/+47 |
|\ \ | |||||
| * | | MANIFEST.in: Add *.pyi | Richard van der Hoff | 2016-07-19 | 1 | -0/+1 |
| * | | Type annotations | Richard van der Hoff | 2016-07-19 | 6 | -0/+46 |
* | | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 5 | -22/+57 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 5 | -22/+57 |
| |/ | |||||
* | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 8 | -15/+246 |
|\ \ | |/ |/| | |||||
| * | Comment | Erik Johnston | 2016-07-20 | 1 | -0/+4 |
| * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 4 | -11/+29 |
| * | Add support for filters in paginate_room_events | Erik Johnston | 2016-07-14 | 1 | -1/+51 |
| * | Add 'contains_url' to filter | Erik Johnston | 2016-07-14 | 1 | -3/+20 |
| * | Add sender and contains_url field to events table | Erik Johnston | 2016-07-14 | 2 | -0/+142 |
* | | Merge pull request #931 from matrix-org/rav/refactor_register | David Baker | 2016-07-19 | 2 | -79/+104 |
|\ \ | |||||
| * | | Don't bind email unless threepid contains expected fields | Richard van der Hoff | 2016-07-19 | 1 | -28/+25 |
| * | | rest/client/v2_alpha/register.py: Refactor flow somewhat. | Richard van der Hoff | 2016-07-19 | 2 | -76/+104 |
* | | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_login | Richard van der Hoff | 2016-07-19 | 12 | -31/+354 |
|\ \ \ | |/ / |/| | | |||||
| * | | schema fix | Richard van der Hoff | 2016-07-19 | 1 | -1/+1 |
| * | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 12 | -31/+354 |
* | | | Merge pull request #930 from matrix-org/markjh/handlers | Mark Haines | 2016-07-19 | 1 | -3/+14 |
|\ \ \ | |/ / |/| | | |||||
| * | | Summary line | Mark Haines | 2016-07-19 | 1 | -2/+1 |
| * | | Update docstring on Handlers. | Mark Haines | 2016-07-19 | 1 | -3/+15 |
|/ / | |||||
* | | Merge pull request #928 from matrix-org/rav/refactor_login | Richard van der Hoff | 2016-07-18 | 2 | -65/+82 |
|\ \ | |||||
| * | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 2 | -65/+82 |
* | | | Merge pull request #924 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-18 | 1 | -19/+15 |
|\ \ \ | |||||
| * | | | Fix /purge_history bug | Erik Johnston | 2016-07-15 | 1 | -19/+15 |
* | | | | Merge pull request #925 from matrix-org/markjh/auth_fix | Mark Haines | 2016-07-18 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Fix 500 ISE when sending alias event without a state_key | Mark Haines | 2016-07-15 | 1 | -0/+5 |
* | | | | | Merge pull request #927 from Half-Shot/develop | Erik Johnston | 2016-07-18 | 1 | -5/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Use body.get to check for 'user' | Will Hunt | 2016-07-16 | 1 | -2/+1 |
| * | | | | Fall back to 'username' if 'user' is not given for appservice reg. | Will Hunt | 2016-07-16 | 1 | -3/+5 |
| |/ / / | |||||
* / / / | Fix a doc-comment | Richard van der Hoff | 2016-07-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #923 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-15 | 2 | -2/+13 |
|\| | | |||||
| * | | Pull out min stream_ordering from ex_outlier_stream | Erik Johnston | 2016-07-15 | 1 | -1/+2 |
| * | | event_backwards_extremeties may not be empty | Erik Johnston | 2016-07-15 | 1 | -1/+11 |
* | | | Merge pull request #919 from matrix-org/erikj/auth_fix | Erik Johnston | 2016-07-15 | 3 | -5/+35 |
|\ \ \ | |/ / |/| | | |||||
| * | | Comment | Erik Johnston | 2016-07-15 | 2 | -0/+6 |
| * | | Check sender signed event | Erik Johnston | 2016-07-14 | 3 | -6/+12 |
| * | | Check if alias event's state_key matches sender's domain | Erik Johnston | 2016-07-13 | 1 | -0/+11 |
| * | | Check creation event's room_id domain matches sender's | Erik Johnston | 2016-07-13 | 1 | -0/+7 |
* | | | Merge pull request #921 from matrix-org/erikj/account_deactivate | Erik Johnston | 2016-07-14 | 1 | -0/+44 |
|\ \ \ | |||||
| * | | | Add hs object | Erik Johnston | 2016-07-14 | 1 | -0/+1 |
| * | | | Only accept password auth | Erik Johnston | 2016-07-14 | 1 | -12/+0 |
| * | | | Add an /account/deactivate endpoint | Erik Johnston | 2016-07-14 | 1 | -0/+55 |
| | |/ | |/| | |||||
* | | | Merge pull request #918 from negzi/bugfix_for_token_expiry | Erik Johnston | 2016-07-14 | 6 | -9/+42 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 6 | -9/+42 |
| |/ | |||||
* | | Merge pull request #915 from matrix-org/dbkr/more_requesttokens | David Baker | 2016-07-13 | 3 | -30/+103 |
|\ \ | |/ |/| | |||||
| * | be more pythonic | David Baker | 2016-07-12 | 1 | -1/+1 |
| * | on_OPTIONS isn't neccessary | David Baker | 2016-07-12 | 2 | -10/+1 |
| * | Remove other debug logging | David Baker | 2016-07-12 | 1 | -2/+0 |
| * | Separate out requestTokens to separate handlers | David Baker | 2016-07-11 | 2 | -65/+93 |
| * | Oops, remove debug logging | David Baker | 2016-07-11 | 1 | -4/+0 |
| * | Implement https://github.com/matrix-org/matrix-doc/pull/346/files | David Baker | 2016-07-08 | 2 | -0/+60 |
* | | Merge pull request #914 from matrix-org/markjh/upgrade | Mark Haines | 2016-07-08 | 1 | -0/+15 |
|\ \ | |/ |/| | |||||
| * | Add a comment explaining allow_none | Mark Haines | 2016-07-08 | 1 | -0/+2 |
| * | Ensure that the guest user is in the database when upgrading accounts | Mark Haines | 2016-07-08 | 1 | -0/+13 |
|/ | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-08 | 6 | -9/+33 |
|\ | |||||
| * | Merge branch 'hotfixes-v0.16.1' v0.16.1-r1 | Erik Johnston | 2016-07-08 | 3 | -6/+19 |
| |\ | |||||
| | * | Bump version and changelog | Erik Johnston | 2016-07-07 | 2 | -1/+9 |
| | * | Fix bug where we did not correctly explode when multiple user_ids were set in... | Erik Johnston | 2016-07-07 | 1 | -5/+10 |
| * | | Merge pull request #886 from matrix-org/markjh/async_commit | Mark Haines | 2016-06-29 | 3 | -3/+14 |
| |\ \ | |||||
| | * | | Optionally make committing to postgres asynchronous. | Mark Haines | 2016-06-20 | 3 | -3/+14 |
* | | | | Merge pull request #911 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-07 | 7 | -34/+386 |
|\ \ \ \ | |||||
| * | | | | Comment | Erik Johnston | 2016-07-07 | 1 | -0/+3 |
| * | | | | Return 400 rather than 500 | Erik Johnston | 2016-07-07 | 1 | -1/+4 |
| * | | | | Add rest servlet. Fix SQL. | Erik Johnston | 2016-07-06 | 2 | -5/+5 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2 | Erik Johnston | 2016-07-06 | 2 | -2/+18 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #909 from matrix-org/erikj/shared_secret | Erik Johnston | 2016-07-06 | 4 | -34/+74 |
|\ \ \ \ \ | |||||
* \ \ \ \ \ | Merge pull request #910 from KentShikama/hash_password_followup | Erik Johnston | 2016-07-06 | 2 | -2/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update password config comment | Kent Shikama | 2016-07-06 | 1 | -1/+1 |
| * | | | | | | Update hash_password script | Kent Shikama | 2016-07-06 | 1 | -1/+17 |
|/ / / / / / | |||||
| | * | | | | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 10 | -111/+213 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Check that there are no null bytes in user and passsword | Erik Johnston | 2016-07-06 | 1 | -0/+6 |
| * | | | | | Add null separator to hmac | Erik Johnston | 2016-07-06 | 2 | -0/+4 |
| * | | | | | Remove spurious txn | Erik Johnston | 2016-07-05 | 1 | -9/+0 |
| * | | | | | Fix for postgres | Erik Johnston | 2016-07-05 | 1 | -2/+2 |
| * | | | | | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 4 | -27/+58 |
| * | | | | | Protect password when registering using shared secret | Erik Johnston | 2016-07-05 | 2 | -7/+15 |
|/ / / / / | |||||
* | | | | | Merge pull request #904 from matrix-org/dbkr/register_email_no_untrusted_id_s... | David Baker | 2016-07-05 | 2 | -15/+29 |
|\ \ \ \ \ | |||||
| * | | | | | requestToken update | David Baker | 2016-06-30 | 2 | -15/+29 |
* | | | | | | Merge pull request #906 from matrix-org/markjh/faster_events_around | Mark Haines | 2016-07-05 | 2 | -60/+102 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix typo | Mark Haines | 2016-07-05 | 1 | -1/+1 |
| * | | | | | | Make get_events_around more efficient on sqlite3 | Mark Haines | 2016-07-05 | 1 | -13/+49 |
| * | | | | | | Use true/false for boolean parameter inclusive to avoid potential for sqli, a... | Mark Haines | 2016-07-05 | 2 | -5/+7 |
| * | | | | | | Use different SQL for postgres and sqlite3 for when using multicolumn indexes | Mark Haines | 2016-07-04 | 2 | -59/+59 |
| * | | | | | | Use a query that postgresql optimises better for get_events_around | Mark Haines | 2016-07-04 | 1 | -12/+16 |
* | | | | | | | Merge pull request #907 from KentShikama/pepper | Erik Johnston | 2016-07-05 | 2 | -2/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove default password pepper string | Kent Shikama | 2016-07-05 | 1 | -2/+1 |
| * | | | | | | | Fix password config | Kent Shikama | 2016-07-05 | 2 | -3/+3 |
| * | | | | | | | Fix pep8 | Kent Shikama | 2016-07-05 | 2 | -2/+3 |
| * | | | | | | | Add comment to prompt changing of pepper | Kent Shikama | 2016-07-05 | 1 | -0/+1 |
| * | | | | | | | Add pepper to password hashing | Kent Shikama | 2016-07-05 | 2 | -3/+8 |
|/ / / / / / / | |||||
| | | * | | | | Add ReadWriteLock for pagination and history prune | Erik Johnston | 2016-07-05 | 2 | -36/+38 |
| | | * | | | | Add ReadWriteLock | Erik Johnston | 2016-07-05 | 2 | -0/+167 |
| | | * | | | | Add purge_history API | Erik Johnston | 2016-07-05 | 4 | -1/+38 |
| | | * | | | | Add storage function to purge history for a room | Erik Johnston | 2016-07-04 | 1 | -0/+140 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #905 from KentShikama/add-password-hash | Erik Johnston | 2016-07-04 | 2 | -3/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix style violations | Kent Shikama | 2016-07-04 | 2 | -2/+4 |
| * | | | | | Use .get() instead of [] to access password_hash | Kent Shikama | 2016-07-04 | 1 | -1/+1 |
| * | | | | | Optionally include password hash in createUser endpoint | Kent Shikama | 2016-07-03 | 2 | -3/+5 |
|/ / / / / | |||||
* | | | | | code_style.rst: add link to sphinx examples | Richard van der Hoff | 2016-07-01 | 1 | -1/+3 |
* | | | | | code_style.rst: *fix* link to google style | Richard van der Hoff | 2016-07-01 | 1 | -1/+1 |
* | | | | | code_style.rst: add link to google style | Richard van der Hoff | 2016-07-01 | 1 | -2/+3 |
|/ / / / | |||||
* | | | | Merge pull request #903 from matrix-org/erikj/deactivate_user | Erik Johnston | 2016-06-30 | 3 | -0/+40 |
|\ \ \ \ | |||||
| * | | | | Feature: Add deactivate account admin API | Erik Johnston | 2016-06-30 | 3 | -0/+40 |
|/ / / / | |||||
* | | | | Merge pull request #902 from matrix-org/erikj/expire_media | Erik Johnston | 2016-06-29 | 7 | -21/+190 |
|\ \ \ \ | |||||
| * | | | | Remove race | Erik Johnston | 2016-06-29 | 1 | -11/+0 |
| * | | | | Implement purge_media_cache admin API | Erik Johnston | 2016-06-29 | 5 | -20/+130 |
| * | | | | Track approximate last access time for remote media | Erik Johnston | 2016-06-29 | 4 | -1/+71 |
|/ / / / | |||||
* | | | | Merge pull request #900 from RickCogley/RickCogley-coturn-readme-2 | David Baker | 2016-06-28 | 1 | -7/+12 |
|\ \ \ \ | |||||
| * | | | | Update turn-howto.rst to use git clone (2) | Rick Cogley | 2016-06-28 | 1 | -1/+5 |
| * | | | | Update turn-howto.rst to use git clone | Rick Cogley | 2016-06-28 | 1 | -1/+1 |
| * | | | | Remove double spaces | Rick Cogley | 2016-06-28 | 1 | -12/+11 |
| * | | | | Update to reflect new location at github. | Rick Cogley | 2016-06-26 | 1 | -16/+18 |
| |/ / / | |||||
* | | | | Merge pull request #894 from matrix-org/dbkr/push_room_naming | David Baker | 2016-06-28 | 7 | -121/+26 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/push_room_naming | David Baker | 2016-06-24 | 3 | -4/+7 |
| |\ \ \ \ | |||||
| * | | | | | Remove room name & alias test | David Baker | 2016-06-24 | 1 | -41/+0 |
| * | | | | | even more pep8 | David Baker | 2016-06-24 | 1 | -0/+1 |
| * | | | | | more pep8 | David Baker | 2016-06-24 | 1 | -1/+0 |
| * | | | | | pep8 | David Baker | 2016-06-24 | 1 | -1/+0 |
| * | | | | | Use similar naming we use in email notifs for push | David Baker | 2016-06-24 | 6 | -79/+26 |
* | | | | | | remove vector.im from default secondary DS list | Matthew Hodgson | 2016-06-27 | 1 | -1/+0 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #895 from matrix-org/markjh/jenkins_port_range | Mark Haines | 2016-06-24 | 3 | -4/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix the sytests to use a port-range rather than a port base | Mark Haines | 2016-06-24 | 3 | -4/+7 |
|/ / / / | |||||
* | | | | Merge branch 'master' into develop | Mark Haines | 2016-06-23 | 2 | -27/+152 |
|\| | | | |||||
| * | | | Merge pull request #889 from matrix-org/markjh/synctl_workers | Mark Haines | 2016-06-21 | 1 | -27/+151 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Optionally start or stop workers in synctl. | Mark Haines | 2016-06-21 | 1 | -27/+151 |
| | |/ | |||||
| * | | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1 | Erik Johnston | 2016-06-20 | 40 | -517/+617 |
| |\ \ | |||||
| * | | | point to the CAPTCHA docs | Matthew Hodgson | 2016-06-12 | 1 | -0/+1 |
* | | | | Merge pull request #892 from matrix-org/dbkr/email_notif_most_recent | David Baker | 2016-06-23 | 1 | -4/+15 |
|\ \ \ \ | |||||
| * | | | | Actually we need to order these properly | David Baker | 2016-06-22 | 1 | -2/+12 |
| * | | | | Style | David Baker | 2016-06-22 | 1 | -1/+1 |
| * | | | | Put most recent 20 messages in notif | David Baker | 2016-06-22 | 1 | -3/+4 |
|/ / / / | |||||
* | | | | Merge pull request #843 from mweinelt/ldap3-rewrite | Erik Johnston | 2016-06-22 | 4 | -60/+249 |
|\ \ \ \ | |||||
| * | | | | Rework ldap integration with ldap3 | Martin Weinelt | 2016-06-22 | 4 | -60/+249 |
|/ / / / | |||||
* | | | | Merge pull request #888 from matrix-org/markjh/content_repo | Mark Haines | 2016-06-21 | 3 | -132/+3 |
|\ \ \ \ | |||||
| * | | | | Remove the legacy v0 content upload API. | Mark Haines | 2016-06-21 | 3 | -132/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #887 from matrix-org/dbkr/notif_template_subs_fail | David Baker | 2016-06-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix substitution failure in mail template | David Baker | 2016-06-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #879 from matrix-org/erikj/linearize_fed_server | Erik Johnston | 2016-06-20 | 2 | -67/+78 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Linearize some federation endpoints based on (origin, room_id) | Erik Johnston | 2016-06-17 | 2 | -67/+78 |
| |/ / | |||||
* | | | Bump version and changelog | Erik Johnston | 2016-06-20 | 2 | -1/+16 |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1 | Erik Johnston | 2016-06-20 | 18 | -355/+251 |
|\ \ \ | |||||
| * \ \ | Merge pull request #880 from matrix-org/markjh/registered_user | Mark Haines | 2016-06-17 | 4 | -27/+25 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Add the create_profile method back since the tests use it | Mark Haines | 2016-06-17 | 1 | -0/+6 |
| | * | | Add a comment on why we don't create a profile for upgrading users | Mark Haines | 2016-06-17 | 1 | -0/+1 |
| | * | | Remove registered_users from the distributor. | Mark Haines | 2016-06-17 | 5 | -33/+24 |
| |/ / | |||||
| * | | Merge pull request #878 from matrix-org/erikj/ujson | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Disable responding with canonical json for federation | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
| * | | | Merge pull request #877 from matrix-org/erikj/frozen_default | Erik Johnston | 2016-06-17 | 2 | -1/+2 |
| |\ \ \ | |||||
| | * | | | Enable use_frozen_events in tests | Erik Johnston | 2016-06-17 | 1 | -0/+1 |
| | * | | | Turn use_frozen_events off by default | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge pull request #876 from matrix-org/erikj/sign_own | Erik Johnston | 2016-06-17 | 2 | -12/+18 |
| |\ \ \ | |||||
| | * | | | Only re-sign our own events | Erik Johnston | 2016-06-17 | 2 | -12/+18 |
| | |/ / | |||||
| * | | | Merge pull request #875 from matrix-org/markjh/email_formatting | Mark Haines | 2016-06-17 | 1 | -14/+15 |
| |\ \ \ | |||||
| | * | | | Fix ``KeyError: 'msgtype'``. Use ``.get`` | Mark Haines | 2016-06-17 | 1 | -14/+15 |
| |/ / / | |||||
| * / / | Fix setting gc thresholds in the workers | Mark Haines | 2016-06-17 | 2 | -2/+4 |
| |/ / | |||||
| * | | Merge pull request #874 from matrix-org/markjh/worker_config | Mark Haines | 2016-06-17 | 6 | -295/+181 |
| |\ \ | |||||
| | * | | Use worker_ prefixes for worker config, use existing support for multiple con... | Mark Haines | 2016-06-16 | 5 | -79/+33 |
| | * | | Access the event_cache_size directly from the server object. | Mark Haines | 2016-06-16 | 5 | -21/+10 |
| | * | | Access replication_url from the worker config directly | Mark Haines | 2016-06-16 | 3 | -8/+6 |
| | * | | Comment on what's going on in clobber_with_worker_config | Mark Haines | 2016-06-16 | 1 | -1/+12 |
| | * | | Merge remote-tracking branch 'origin/develop' into markjh/worker_config | Mark Haines | 2016-06-16 | 12 | -62/+140 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode | Erik Johnston | 2016-06-16 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix TypeError in call to bcrypt.hashpw | Salvatore LaMendola | 2016-06-16 | 1 | -1/+1 |
| * | | | | Merge pull request #872 from matrix-org/erikj/preview_url_fixes | Erik Johnston | 2016-06-16 | 1 | -5/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Line lengths | Erik Johnston | 2016-06-15 | 1 | -3/+3 |
| | * | | | Handle floats as img widths | Erik Johnston | 2016-06-15 | 1 | -1/+1 |
| | * | | | Handle og props with not content | Erik Johnston | 2016-06-15 | 1 | -1/+2 |
| |/ / / | |||||
| * | | | Merge pull request #867 from matrix-org/markjh/enable_jenkins_synchrotron | Mark Haines | 2016-06-15 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Enable testing the synchrotron on jenkins | Mark Haines | 2016-06-10 | 1 | -0/+1 |
| * | | | | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-06-15 | 2 | -2/+28 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Update change log v0.16.1-rc1 | Erik Johnston | 2016-06-15 | 1 | -1/+2 |
* | | | | | Bump version and changelog | Erik Johnston | 2016-06-15 | 2 | -2/+27 |
|/ / / / | |||||
* | | | | Merge pull request #871 from matrix-org/erikj/linearize_state_fetch_on_pdu | Erik Johnston | 2016-06-15 | 4 | -37/+58 |
|\ \ \ \ | |||||
| * | | | | Linearize fetching of gaps on incoming events | Erik Johnston | 2016-06-15 | 4 | -37/+58 |
|/ / / / | |||||
* | | | | Merge pull request #870 from matrix-org/rav/work_around_tls_bug | Richard van der Hoff | 2016-06-15 | 1 | -2/+26 |
|\ \ \ \ | |||||
| * | | | | Work around TLS bug in twisted | Richard van der Hoff | 2016-06-15 | 1 | -2/+26 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #869 from matrix-org/erikj/backfill_fix | Erik Johnston | 2016-06-15 | 1 | -14/+16 |
|\ \ \ \ | |||||
| * | | | | Correctly mark backfilled events as backfilled | Erik Johnston | 2016-06-15 | 1 | -14/+16 |
|/ / / / | |||||
* | | | | Merge pull request #868 from matrix-org/erikj/invalid_id | Erik Johnston | 2016-06-14 | 1 | -1/+4 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Make get_domain_from_id throw SynapseError on invalid ID | Erik Johnston | 2016-06-14 | 1 | -1/+4 |
| | | * | Add worker config module | Mark Haines | 2016-06-16 | 1 | -0/+71 |
| | | * | Inline the synchrotron and pusher configs into the main config | Mark Haines | 2016-06-16 | 5 | -291/+154 |
| |_|/ |/| | | |||||
* | | | Merge pull request #866 from bartekrutkowski/develop | Erik Johnston | 2016-06-10 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Change /bin/bash to /bin/sh in tox.ini | Bartek Rutkowski | 2016-06-10 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #863 from matrix-org/markjh/load_config | Mark Haines | 2016-06-10 | 4 | -48/+126 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add function to load config without generating it | Mark Haines | 2016-06-09 | 4 | -48/+126 |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-06-09 | 4 | -8/+20 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse v0.16.0 | Erik Johnston | 2016-06-09 | 218 | -5459/+13401 |
| |\ | |||||
| | * | Change CHANGELOG | Erik Johnston | 2016-06-09 | 1 | -1/+1 |
| | * | Bump version and changelog | Erik Johnston | 2016-06-09 | 2 | -1/+11 |
| * | | Merge pull request #801 from ruma/readme-history-storage | Matthew Hodgson | 2016-05-29 | 1 | -6/+7 |
| |\ \ | |||||
| | * | | Alter phrasing to clarify where info is stored. | Jimmy Cuadra | 2016-05-29 | 1 | -6/+7 |
| |/ / | |||||
| * | | Merge pull request #766 from sbts/patch-1 | Erik Johnston | 2016-05-09 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix Typo in README.rst s/Halp/Help/ | David | 2016-05-06 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #728 from OlegGirko/systemd_env_file | Erik Johnston | 2016-04-18 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Add environment file to systemd unit configuration. | Oleg Girko | 2016-04-14 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #862 from matrix-org/erikj/media_remote_error | Erik Johnston | 2016-06-09 | 1 | -4/+10 |
|\ \ \ | |||||
| * | | | 502 on /thumbnail when can't contact remote server | Erik Johnston | 2016-06-09 | 1 | -4/+10 |
* | | | | Merge pull request #860 from negzi/bug_fix_get_or_create_user | Erik Johnston | 2016-06-09 | 2 | -8/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix a bug caused by a change in auth_handler function | Negar Fazeli | 2016-06-08 | 2 | -8/+5 |
* | | | | Merge pull request #861 from matrix-org/erikj/events_log | Erik Johnston | 2016-06-09 | 1 | -24/+21 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove redundant exception log in /events | Erik Johnston | 2016-06-09 | 1 | -24/+21 |
|/ / / | |||||
* | | | Merge pull request #859 from matrix-org/erikj/public_room_performance | Erik Johnston | 2016-06-08 | 1 | -16/+16 |
|\ \ \ | |||||
| * | | | Pull full state for each room all at once | Erik Johnston | 2016-06-08 | 1 | -16/+16 |
* | | | | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-06-08 | 2 | -1/+28 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Update commit hash in changelog v0.16.0-rc2 | Erik Johnston | 2016-06-08 | 1 | -1/+1 |
| * | | Bump version and changelog to v0.16.0-rc2 | Erik Johnston | 2016-06-08 | 2 | -1/+28 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.0 | Erik Johnston | 2016-06-08 | 22 | -398/+997 |
| |\ \ | |||||
* | \ \ | Merge pull request #857 from matrix-org/erikj/default_visibility | Erik Johnston | 2016-06-08 | 1 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | Don't make rooms visibile by default | Erik Johnston | 2016-06-08 | 1 | -2/+0 |
* | | | | | Disable the synchrotron on jenkins until the sytest support lands (#855) | Mark Haines | 2016-06-08 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Fix up federation PublicRoomList | Erik Johnston | 2016-06-08 | 1 | -1/+1 |
* | | | | Merge pull request #856 from matrix-org/erikj/fed_pub_rooms | Erik Johnston | 2016-06-08 | 2 | -5/+7 |
|\ \ \ \ | |||||
| * | | | | Log user that is making /publicRooms calls | Erik Johnston | 2016-06-08 | 1 | -0/+7 |
| * | | | | Enable auth on federation PublicRoomList | Erik Johnston | 2016-06-08 | 1 | -5/+0 |
* | | | | | Merge pull request #854 from matrix-org/erikj/federation_logging | Erik Johnston | 2016-06-08 | 1 | -0/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add some logging for when servers ask for missing events | Erik Johnston | 2016-06-08 | 1 | -0/+19 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #853 from matrix-org/erikj/replication_noop | Erik Johnston | 2016-06-08 | 5 | -0/+15 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Don't hit DB for noop replications queries | Erik Johnston | 2016-06-08 | 5 | -0/+15 |
|/ / / | |||||
* | | | Merge pull request #850 from matrix-org/erikj/gc_threshold | Erik Johnston | 2016-06-08 | 2 | -0/+28 |
|\ \ \ | |||||
| * | | | Add gc_threshold to pusher and synchrotron | Erik Johnston | 2016-06-07 | 2 | -0/+28 |
* | | | | Merge pull request #852 from matrix-org/erikj/gc_metrics | Erik Johnston | 2016-06-08 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Don't track total objects as its too expensive to calculate | Erik Johnston | 2016-06-07 | 1 | -1/+0 |
| * | | | | Record some more GC metrics | Erik Johnston | 2016-06-07 | 1 | -0/+5 |
* | | | | | Merge pull request #851 from matrix-org/markjh/jenkins_synchrotron | Mark Haines | 2016-06-07 | 1 | -0/+84 |
|\ \ \ \ \ | |/ / / / |/| | | | |