Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #1619 from matrix-org/erikj/pwd_provider_error | Erik Johnston | 2016-11-09 | 1 | -2/+7 |
|\ | |||||
| * | Don't assume providers raise ConfigError's | Erik Johnston | 2016-11-08 | 1 | -2/+7 |
|/ | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-11-08 | 3 | -2/+16 |
|\ | |||||
| * | Merge branch 'erikj/ldap3_auth' v0.18.3 | Erik Johnston | 2016-11-08 | 3 | -2/+16 |
| |\ | |||||
| | * | Bump version and changelog | Erik Johnston | 2016-11-08 | 2 | -1/+14 |
| | * | Explicitly set authentication mode in ldap3 | Erik Johnston | 2016-11-08 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #1615 from matrix-org/erikj/limit_prev_events | Erik Johnston | 2016-11-08 | 1 | -0/+15 |
|\ \ | |||||
| * | | Sample correctly | Erik Johnston | 2016-11-08 | 1 | -1/+3 |
| * | | Limit the number of prev_events of new events | Erik Johnston | 2016-11-08 | 1 | -0/+13 |
* | | | Merge pull request #1616 from matrix-org/erikj/worker_frozen_dict | Erik Johnston | 2016-11-08 | 6 | -0/+22 |
|\ \ \ | |/ / |/| | | |||||
| * | | Respect use_frozen_dicts option in workers | Erik Johnston | 2016-11-08 | 6 | -0/+22 |
|/ / | |||||
* | | Merge pull request #1198 from euank/more-ip-blacklist | Erik Johnston | 2016-11-07 | 1 | -0/+2 |
|\ \ | |||||
| * | | default config: blacklist more internal ips | Euan Kemp | 2016-11-06 | 1 | -0/+2 |
| |/ | |||||
* | | Merge pull request #1195 from matrix-org/erikj/incorrect_func | Erik Johnston | 2016-11-04 | 1 | -11/+2 |
|\ \ | |||||
| * | | Comment | Erik Johnston | 2016-11-04 | 1 | -0/+1 |
| * | | Remove unused but buggy function | Erik Johnston | 2016-11-04 | 1 | -11/+1 |
|/ / | |||||
* | | Merge pull request #1193 from matrix-org/paul/metrics | Paul Evans | 2016-11-03 | 3 | -71/+18 |
|\ \ | |||||
| * | | Fix copypasto error in metric rename table in docs | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -4/+4 |
| * | | Rename the python-specific metrics now the docs claim that we have done | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -7/+9 |
| * | | Since we don't export per-filetype fd counts any more, delete all the code re... | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -36/+4 |
| * | | Remove now-unused 'resource' import | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -8/+0 |
| * | | Now we have new-style metrics don't bother exporting legacy-named process ones | Paul "LeoNerd" Evans | 2016-11-03 | 1 | -16/+1 |
|/ / | |||||
* | | Merge pull request #1192 from matrix-org/erikj/postgres_gist | Erik Johnston | 2016-11-03 | 3 | -1/+45 |
|\ \ | |||||
| * | | Remove spurious comment | Erik Johnston | 2016-11-03 | 1 | -2/+2 |
| * | | Replace postgres GIN with GIST | Erik Johnston | 2016-11-03 | 3 | -1/+45 |
|/ / | |||||
* | | Merge pull request #1191 from matrix-org/dbkr/non_ascii_passwords | David Baker | 2016-11-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | Don't error on non-ascii passwords | David Baker | 2016-11-03 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1190 from matrix-org/markjh/media_cors | Mark Haines | 2016-11-02 | 3 | -7/+22 |
|\ \ | |||||
| * | | Set CORs headers on responses from the media repo | Mark Haines | 2016-11-02 | 3 | -7/+22 |
|/ / | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-11-01 | 0 | -0/+0 |
|\| | |||||
| * | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2 | Erik Johnston | 2016-11-01 | 57 | -807/+1566 |
| |\ | |||||
* | \ | Merge pull request #1188 from matrix-org/erikj/sent_transactions | Erik Johnston | 2016-11-01 | 1 | -150/+4 |
|\ \ \ | |||||
| * | | | Continue to clean up received_transactions | Erik Johnston | 2016-11-01 | 1 | -0/+14 |
| * | | | Removed unused stuff | Erik Johnston | 2016-10-31 | 1 | -163/+3 |
| * | | | Increase batching of sent transaction inserts | Erik Johnston | 2016-10-31 | 1 | -1/+1 |
* | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-11-01 | 3 | -34/+66 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Bump version and changelog | Erik Johnston | 2016-11-01 | 2 | -1/+7 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2 | Erik Johnston | 2016-11-01 | 1 | -33/+42 |
| |\ \ | |||||
| | * | | Merge pull request #1187 from matrix-org/paul/metrics-howto | Paul Evans | 2016-10-31 | 1 | -33/+42 |
| |/| | |/| | | | |||||
| | * | | Add details of renamed metrics | Paul "LeoNerd" Evans | 2016-10-31 | 1 | -0/+34 |
| | * | | Remove long-deprecated instructions about promethesus console; also fix for m... | Paul "LeoNerd" Evans | 2016-10-28 | 1 | -33/+8 |
| |/ / |/| | | |||||
| * | | Changelog formattting v0.18.2-rc5 | Erik Johnston | 2016-10-28 | 1 | -0/+1 |
| * | | Bump changelog and version | Mark Haines | 2016-10-28 | 2 | -1/+8 |
| * | | Merge branch 'develop' into release-v0.18.2 | Mark Haines | 2016-10-28 | 3 | -9/+9 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1184 from matrix-org/paul/metrics | Paul Evans | 2016-10-27 | 3 | -9/+9 |
|\ \ \ | |||||
| * | | | Set up the process collector during metrics __init__; that way all split-proc... | Paul "LeoNerd" Evans | 2016-10-27 | 2 | -2/+3 |
| * | | | Pass the Metrics group into the process collector instead of having it find i... | Paul "LeoNerd" Evans | 2016-10-27 | 2 | -8/+4 |
| * | | | Allow creation of a 'subspace' within a Metrics object, returning another one | Paul "LeoNerd" Evans | 2016-10-27 | 1 | -0/+3 |
|/ / / | |||||
| * / | Bump changelog and version v0.18.2-rc4 | Erik Johnston | 2016-10-27 | 2 | -1/+10 |
|/ / | |||||
* | | Merge pull request #1183 from matrix-org/erikj/fix_email_update | Erik Johnston | 2016-10-27 | 1 | -1/+30 |
|\ \ | |||||
| * | | Use most recently added binding, not most recently seen user. | Erik Johnston | 2016-10-27 | 1 | -19/+11 |
| * | | Fix user_threepids schema delta | Erik Johnston | 2016-10-27 | 1 | -1/+38 |
|/ / | |||||
* | | Update changelog v0.18.2-rc3 | Erik Johnston | 2016-10-27 | 1 | -0/+1 |
* | | Bump changelog and version | Erik Johnston | 2016-10-27 | 2 | -2/+8 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2 | Erik Johnston | 2016-10-27 | 27 | -170/+509 |
|\ \ | |||||
| * \ | Merge pull request #1098 from matrix-org/markjh/bearer_token | Mark Haines | 2016-10-25 | 6 | -23/+66 |
| |\ \ | |||||
| | * \ | Merge branch 'develop' into markjh/bearer_token | Mark Haines | 2016-09-12 | 9 | -45/+108 |
| | |\ \ | |||||
| | * | | | Fix unit tests | Mark Haines | 2016-09-12 | 6 | -15/+30 |
| | * | | | Merge branch 'develop' into markjh/bearer_token | Mark Haines | 2016-09-09 | 7 | -9/+89 |
| | |\ \ \ | |||||
| | * | | | | Allow clients to supply access_tokens as headers | Mark Haines | 2016-09-09 | 1 | -9/+37 |
| * | | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-10-25 | 2 | -1/+20 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Fixup change log v0.18.2-rc2 | Erik Johnston | 2016-10-25 | 1 | -2/+2 |
* | | | | | | Bump version and changelog | Erik Johnston | 2016-10-25 | 2 | -1/+20 |
| * | | | | | Merge pull request #1179 from matrix-org/erikj/typing_timer_paranoia | Erik Johnston | 2016-10-25 | 1 | -2/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix infinite typing bug | Erik Johnston | 2016-10-24 | 1 | -2/+10 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1178 from matrix-org/erikj/current_room_token | Erik Johnston | 2016-10-24 | 4 | -12/+48 |
| |\ \ \ \ \ | |||||
| | * | | | | | Actually use the new function | Erik Johnston | 2016-10-24 | 1 | -1/+1 |
| | * | | | | | Fix incredubly slow back pagination query | Erik Johnston | 2016-10-24 | 4 | -12/+48 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1177 from matrix-org/paul/standard-metric-names | Paul Evans | 2016-10-21 | 4 | -66/+191 |
| |\ \ \ \ \ | |||||
| | * | | | | | Split callback metric lambda functions down onto their own lines to keep line... | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -8/+16 |
| | * | | | | | Adjust code for <100 char line limit | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -1/+1 |
| | * | | | | | Cut the raw /proc/self/stat line up into named fields at collection time | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -8/+22 |
| | * | | | | | Move the process metrics collector code into its own file | Paul "LeoNerd" Evans | 2016-10-19 | 3 | -141/+161 |
| | * | | | | | A slightly neater way to manage metric collector functions | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -2/+8 |
| | * | | | | | appease pep8 | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -3/+5 |
| | * | | | | | Also guard /proc/self/fds-related code with a suitable psuedoconstant | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -3/+5 |
| | * | | | | | Guard registration of process-wide metrics by existence of the requisite /pro... | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -45/+50 |
| | * | | | | | Add standard process_start_time_seconds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+15 |
| | * | | | | | Add standard process_max_fds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+13 |
| | * | | | | | Add standard process_open_fds metric | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -20/+29 |
| | * | | | | | Add standard process_*_memory_bytes metrics | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+8 |
| | * | | | | | Use /proc/self/stat to generate the new process_cpu_*_seconds_total metrics | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -4/+12 |
| | * | | | | | Export CPU usage metrics also under prometheus-standard metric name | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -0/+15 |
| | * | | | | | Callback metric values might not just be integers - allow floats | Paul "LeoNerd" Evans | 2016-10-19 | 1 | -2/+2 |
| * | | | | | | Merge pull request #1175 from matrix-org/luke/feature-configurable-as-rate-li... | Luke Barnard | 2016-10-20 | 5 | -12/+35 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Style | Luke Barnard | 2016-10-20 | 1 | -2/+3 |
| | * | | | | | | Closing brace on following line | Luke Barnard | 2016-10-20 | 1 | -1/+2 |
| | * | | | | | | as_user->app_service, less redundant comments, better positioned comments | Luke Barnard | 2016-10-20 | 3 | -14/+11 |
| | * | | | | | | flake8 | Luke Barnard | 2016-10-20 | 1 | -1/+3 |
| | * | | | | | | Use real AS object by passing it through the requester | Luke Barnard | 2016-10-20 | 3 | -18/+15 |
| | * | | | | | | Allow Configurable Rate Limiting Per AS | Luke Barnard | 2016-10-18 | 3 | -1/+26 |
| * | | | | | | | Merge pull request #1164 from pik/error-codes | Erik Johnston | 2016-10-19 | 4 | -48/+94 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Refactor test_filter to use real DataStore | pik | 2016-10-18 | 3 | -46/+83 |
| | * | | | | | | | Fix MockHttpRequest always returning M_UNKNOWN errcode in testing | pik | 2016-10-14 | 1 | -1/+1 |
| | * | | | | | | | Error codes for filters | Alexander Maznev | 2016-10-14 | 2 | -7/+16 |
| * | | | | | | | | Merge pull request #1176 from matrix-org/erikj/eager_ratelimit_check | Erik Johnston | 2016-10-19 | 2 | -6/+25 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Comment | Erik Johnston | 2016-10-19 | 1 | -0/+3 |
| | * | | | | | | | Check whether to ratelimit sooner to avoid work | Erik Johnston | 2016-10-19 | 2 | -6/+22 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #1170 from matrix-org/dbkr/password_reset_case_insensitive | David Baker | 2016-10-19 | 2 | -0/+35 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Latest delta is now 37 | David Baker | 2016-10-19 | 1 | -0/+0 |
| | * | | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_i... | David Baker | 2016-10-19 | 8 | -6/+117 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #1174 from matrix-org/erikj/email_push_noop | Erik Johnston | 2016-10-18 | 2 | -1/+5 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Fix push notifications for a single unread message | Erik Johnston | 2016-10-18 | 1 | -1/+1 |
| | * | | | | | | | Reduce redundant database work in email pusher | Erik Johnston | 2016-10-18 | 1 | -0/+4 |
| |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-10-18 | 2 | -2/+29 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Update changelog v0.18.2-rc1 | Erik Johnston | 2016-10-17 | 1 | -4/+7 |
* | | | | | | | | Bump version and changelog | Erik Johnston | 2016-10-17 | 2 | -2/+26 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1113 from matrix-org/erikj/remove_auth | Erik Johnston | 2016-10-17 | 3 | -2/+82 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bump schema version | Erik Johnston | 2016-10-17 | 2 | -1/+1 |
| * | | | | | | | Remove TODO | Erik Johnston | 2016-10-17 | 1 | -2/+0 |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_auth | Erik Johnston | 2016-10-17 | 80 | -1379/+2949 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1162 from larroy/master | Erik Johnston | 2016-10-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use sys.executable instead of hardcoded python. fixes #1161 | Pedro Larroy | 2016-10-08 | 1 | -1/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Drop some unused indices | Erik Johnston | 2016-10-17 | 3 | -17/+83 |
| | * | | | | | | Remove redundant event_auth index | Erik Johnston | 2016-09-13 | 1 | -0/+16 |
| | | * | | | | | Convert emails to lowercase when storing | David Baker | 2016-10-19 | 2 | -1/+20 |
| | | * | | | | | Revert part of 6207399 | David Baker | 2016-10-14 | 1 | -20/+10 |
| | | * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_i... | David Baker | 2016-10-14 | 17 | -477/+691 |
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1169 from matrix-org/erikj/fix_email_notifs | Erik Johnston | 2016-10-14 | 1 | -14/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_... | Erik Johnston | 2016-10-14 | 18 | -508/+734 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete | Richard van der Hoff | 2016-10-13 | 1 | -5/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Handle delete device requests with no body | Richard van der Hoff | 2016-10-12 | 1 | -2/+11 |
| * | | | | | | | | | User-interactive auth on delete device | Richard van der Hoff | 2016-10-12 | 1 | -5/+11 |
* | | | | | | | | | | Merge pull request #1167 from matrix-org/markjh/fingerprints | Mark Haines | 2016-10-12 | 2 | -13/+46 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Explain how long the servers can cache the TLS fingerprints for | Mark Haines | 2016-10-12 | 1 | -3/+4 |
| * | | | | | | | | | | Improve comment formatting | Mark Haines | 2016-10-12 | 2 | -4/+7 |
| * | | | | | | | | | | Add config option for adding additional TLS fingerprints | Mark Haines | 2016-10-11 | 2 | -12/+41 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1155 from matrix-org/erikj/pluggable_pwd_auth | Erik Johnston | 2016-10-12 | 7 | -401/+486 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Implement pluggable password auth | Erik Johnston | 2016-10-03 | 7 | -401/+486 |
* | | | | | | | | | | | Merge pull request #1141 from matrix-org/erikj/replication_noop | Erik Johnston | 2016-10-11 | 6 | -44/+114 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio... | Erik Johnston | 2016-10-11 | 28 | -331/+599 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix check of wrong variable | Erik Johnston | 2016-10-11 | 1 | -1/+1 |
| * | | | | | | | | | | Reduce DB hits for replication | Erik Johnston | 2016-09-23 | 6 | -45/+115 |
| | | | * | | | | | | | Fix email push notifs being dropped | Erik Johnston | 2016-10-13 | 1 | -14/+25 |
| | | | | | | * | | | | Make password reset email field case insensitive | David Baker | 2016-10-14 | 2 | -10/+36 |
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup | Richard van der Hoff | 2016-10-11 | 1 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Work around email-spamming Riot bug | Richard van der Hoff | 2016-10-11 | 1 | -3/+14 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1157 from Rugvip/nolimit | Erik Johnston | 2016-10-11 | 14 | -77/+64 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | rest/client/v1/register: use the correct requester in createUser | Patrik Oldsberg | 2016-10-06 | 4 | -31/+22 |
| * | | | | | | | | | handlers/profile: added admin override for set_displayname and set_avatar_url | Patrik Oldsberg | 2016-10-06 | 1 | -4/+4 |
| * | | | | | | | | | handers: do not ratelimit app service senders | Patrik Oldsberg | 2016-10-06 | 1 | -1/+7 |
| * | | | | | | | | | storage/appservice: make appservice methods only relying on the cache synchro... | Patrik Oldsberg | 2016-10-06 | 10 | -41/+31 |
* | | | | | | | | | | Merge pull request #1150 from Rugvip/state_key | Erik Johnston | 2016-10-11 | 1 | -10/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | api/auth: fix for not being allowed to set your own state_key | Patrik Oldsberg | 2016-09-30 | 1 | -10/+0 |
* | | | | | | | | | | Merge pull request #1160 from matrix-org/rav/401_on_password_fail | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Interactive Auth: Return 401 from for incorrect password | Richard van der Hoff | 2016-10-07 | 1 | -32/+52 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1159 from matrix-org/rav/uia_fallback_postmessage | Richard van der Hoff | 2016-10-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | window.postmessage for Interactive Auth fallback | Richard van der Hoff | 2016-10-06 | 1 | -1/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-10-05 | 2 | -1/+30 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse v0.18.1 | Erik Johnston | 2016-10-05 | 24 | -611/+942 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bump changelog and version | Erik Johnston | 2016-10-05 | 2 | -1/+7 |
| | * | | | | | | | | Update changelog v0.18.1-rc1 | Erik Johnston | 2016-09-30 | 1 | -0/+2 |
| | * | | | | | | | | Bump version and changelog | Erik Johnston | 2016-09-30 | 2 | -1/+22 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
* | | | | | | | | | Merge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brand | David Baker | 2016-10-04 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add Riot brand to email notifs | David Baker | 2016-10-04 | 1 | -1/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1153 from matrix-org/erikj/ldap_restructure | Erik Johnston | 2016-09-30 | 1 | -87/+192 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Restructure ldap authentication | Martin Weinelt | 2016-09-29 | 1 | -87/+192 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1145 from matrix-org/erikj/fix_reindex | Erik Johnston | 2016-09-29 | 1 | -15/+29 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix background reindex of origin_server_ts | Erik Johnston | 2016-09-27 | 1 | -15/+29 |
* | | | | | | | | Merge pull request #1146 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-09-27 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update port script with recently added tables | Erik Johnston | 2016-09-27 | 1 | -0/+9 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #1144 from matrix-org/erikj/sqlite_state_perf | Erik Johnston | 2016-09-27 | 1 | -23/+29 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove duplication | Erik Johnston | 2016-09-27 | 1 | -31/+19 |
| * | | | | | | | Remove unused variable | Erik Johnston | 2016-09-27 | 1 | -3/+0 |
| * | | | | | | | Fix perf of fetching state in SQLite | Erik Johnston | 2016-09-26 | 1 | -20/+41 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1140 from matrix-org/erikj/typing_fed_timeout | Erik Johnston | 2016-09-26 | 6 | -83/+122 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move FEDERATION_PING_INTERVAL timer. Update log line | Erik Johnston | 2016-09-23 | 1 | -8/+10 |
| * | | | | | | | Time out typing over federation | Erik Johnston | 2016-09-23 | 6 | -83/+120 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | typo | Matthew Hodgson | 2016-09-25 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-23 | 2 | -1/+55 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * | | | | | Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse v0.18.0 | Erik Johnston | 2016-09-19 | 80 | -777/+3089 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bump version and changelog | Erik Johnston | 2016-09-19 | 2 | -3/+16 |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0 | Erik Johnston | 2016-09-19 | 5 | -118/+194 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Update changelog v0.18.0-rc1 | Erik Johnston | 2016-09-16 | 1 | -2/+3 |
| | * | | | | | | Update changelog and bump version | Erik Johnston | 2016-09-16 | 2 | -1/+41 |
| * | | | | | | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse v0.17.3 | Erik Johnston | 2016-09-09 | 3 | -3/+10 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge pull request #1136 from matrix-org/erikj/fix_signed_3pid | Erik Johnston | 2016-09-22 | 3 | -12/+35 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update comments | Erik Johnston | 2016-09-22 | 1 | -2/+3 |
| * | | | | | | | | | Add comments | Erik Johnston | 2016-09-22 | 2 | -0/+6 |
| * | | | | | | | | | Shuffle things around to make unit tests work | Erik Johnston | 2016-09-22 | 2 | -15/+16 |
| * | | | | | | | | | Allow invites via 3pid to bypass sender sig check | Erik Johnston | 2016-09-22 | 2 | -7/+22 |
* | | | | | | | | | | Merge pull request #1132 from matrix-org/erikj/initial_sync_split | Erik Johnston | 2016-09-22 | 6 | -383/+461 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Support /initialSync in synchrotron worker | Erik Johnston | 2016-09-21 | 6 | -383/+461 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #1134 from matrix-org/erikj/fix_stream_public_deletion | Erik Johnston | 2016-09-21 | 3 | -6/+31 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Match against event_id, rather than room_id | Erik Johnston | 2016-09-21 | 1 | -1/+1 |
| * | | | | | | | | | Remove spurious AS clause | Erik Johnston | 2016-09-21 | 1 | -1/+1 |
| * | | | | | | | | | Update correct table | Erik Johnston | 2016-09-21 | 1 | -6/+10 |
| * | | | | | | | | | Readd entries to public_room_list_stream that were deleted | Erik Johnston | 2016-09-21 | 2 | -1/+23 |
| * | | | | | | | | | Fix _delete_old_forward_extrem_cache query | Erik Johnston | 2016-09-21 | 1 | -5/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #1133 from matrix-org/erikj/public_room_count | Erik Johnston | 2016-09-21 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add total_room_count_estimate to /publicRooms | Erik Johnston | 2016-09-21 | 1 | -0/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1131 from matrix-org/matthew/e2e-notifs | Erik Johnston | 2016-09-19 | 1 | -0/+49 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | _id field must uniquely identify different conditions | Erik Johnston | 2016-09-19 | 1 | -2/+2 |
| * | | | | | | | | proposal for notifying on e2e events | Matthew Hodgson | 2016-09-17 | 1 | -0/+49 |
* | | | | | | | | | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pag | Erik Johnston | 2016-09-19 | 1 | -12/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | PEP8 | Erik Johnston | 2016-09-17 | 1 | -1/+1 |
| * | | | | | | | | | Handle fact that _generate_room_entry may not return a room entry | Erik Johnston | 2016-09-17 | 1 | -12/+25 |
* | | | | | | | | | | Enable guest access to POST /publicRooms | Erik Johnston | 2016-09-17 | 1 | -2/+2 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pag | Erik Johnston | 2016-09-17 | 1 | -110/+123 |
|\| | | | | | | | | |||||
| * | | | | | | | | Spelling | Erik Johnston | 2016-09-17 | 1 | -1/+1 |
| * | | | | | | | | Fix and clean up publicRooms pagination | Erik Johnston | 2016-09-17 | 1 | -110/+123 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1127 from matrix-org/dbkr/publicroom_search_case_insensitive | Erik Johnston | 2016-09-17 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make public room search case insensitive | David Baker | 2016-09-16 | 1 | -4/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | mention client_reader worker | Matthew Hodgson | 2016-09-17 | 1 | -0/+1 |
* | | | | | | | | fix logger for client_reader worker | Matthew Hodgson | 2016-09-17 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Fix public room pagination for client_reader app | Erik Johnston | 2016-09-16 | 1 | -0/+1 |
* | | | | | | | Merge pull request #1126 from matrix-org/erikj/public_room_cache | Erik Johnston | 2016-09-16 | 7 | -24/+158 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Comment | Erik Johnston | 2016-09-16 | 1 | -0/+2 |
| * | | | | | | | Make POST /publicRooms require auth | Erik Johnston | 2016-09-16 | 1 | -2/+1 |
| * | | | | | | | Comment | Erik Johnston | 2016-09-16 | 1 | -0/+2 |
| * | | | | | | | Add remote reoom cache | Erik Johnston | 2016-09-16 | 1 | -2/+23 |
| * | | | | | | | Support filtering remote room lists | Erik Johnston | 2016-09-16 | 3 | -6/+18 |
| * | | | | | | | Filter remote rooms lists locally | Erik Johnston | 2016-09-16 | 2 | -11/+25 |
| * | | | | | | | Don't cache searched in /publicRooms | Erik Johnston | 2016-09-16 | 1 | -1/+5 |
| * | | | | | | | Add new storage function to slave store | Erik Johnston | 2016-09-16 | 1 | -0/+1 |
| * | | | | | | | Add very basic filter API to /publicRooms | Erik Johnston | 2016-09-15 | 1 | -5/+18 |
| * | | | | | | | Change the way we calculate new_limit in /publicRooms and add POST API | Erik Johnston | 2016-09-15 | 2 | -15/+62 |
| * | | | | | | | Handling expiring stream extrems correctly. | Erik Johnston | 2016-09-15 | 2 | -3/+22 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1125 from matrix-org/erikj/public_room_cache | Erik Johnston | 2016-09-15 | 2 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change get_pos_of_last_change to return upper bound | Erik Johnston | 2016-09-15 | 2 | -6/+6 |
* | | | | | | | | Merge pull request #1124 from matrix-org/erikj/enable_state_caching_workers | Erik Johnston | 2016-09-15 | 6 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Enable state caches on workers | Erik Johnston | 2016-09-15 | 6 | -0/+6 |
* | | | | | | | | | Merge pull request #1123 from matrix-org/erikj/public_room_cache | Erik Johnston | 2016-09-15 | 3 | -2/+19 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | Use stream_change cache to make get_forward_extremeties_for_room cache more e... | Erik Johnston | 2016-09-15 | 3 | -2/+19 |
* | | | | | | | | Merge pull request #1122 from matrix-org/erikj/public_room_cache | Erik Johnston | 2016-09-15 | 2 | -1/+2 |
|\| | | | | | | | |||||
| * | | | | | | | Add cache to get_forward_extremeties_for_room | Erik Johnston | 2016-09-15 | 2 | -1/+2 |
|/ / / / / / / | |||||
* | | | | | | | Remove default public rooms limit | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
* | | | | | | | Merge pull request #1120 from matrix-org/erikj/push_invite_cache | Erik Johnston | 2016-09-15 | 1 | -9/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Ensure we don't mutate the cache of push rules | Erik Johnston | 2016-09-15 | 1 | -9/+1 |
* | | | | | | | | Merge pull request #1121 from matrix-org/erikj/public_room_paginate | Erik Johnston | 2016-09-15 | 18 | -139/+595 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | By default limit /publicRooms to 100 entries | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
| * | | | | | | | Stream public room changes down replication | Erik Johnston | 2016-09-15 | 4 | -1/+74 |
| * | | | | | | | Base public room list off of public_rooms stream | Erik Johnston | 2016-09-15 | 2 | -7/+79 |
| * | | | | | | | Pass since/from parameters over federation | Erik Johnston | 2016-09-15 | 6 | -57/+63 |
| * | | | | | | | Allow paginating both forwards and backwards | Erik Johnston | 2016-09-15 | 2 | -24/+65 |
| * | | | | | | | Remove support for aggregate room lists | Erik Johnston | 2016-09-15 | 3 | -65/+1 |
| * | | | | | | | Accept optional token to public room list | Erik Johnston | 2016-09-15 | 2 | -7/+76 |
| * | | | | | | | Calculate the public room list from a stream_ordering | Erik Johnston | 2016-09-14 | 2 | -3/+43 |
| * | | | | | | | Refactor public rooms to not pull out the full state for each room | Erik Johnston | 2016-09-14 | 2 | -16/+33 |
| * | | | | | | | Add a room visibility stream | Erik Johnston | 2016-09-14 | 4 | -16/+100 |
| * | | | | | | | Add a DB index to figure out past state at a stream ordering in a room | Erik Johnston | 2016-09-14 | 2 | -0/+118 |
* | | | | | | | | Merge pull request #1117 from matrix-org/erikj/fix_state | Erik Johnston | 2016-09-14 | 3 | -20/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Amalgamate two identical consecutive if statements | Erik Johnston | 2016-09-14 | 1 | -7/+5 |
| * | | | | | | | | Fix reindex | Erik Johnston | 2016-09-14 | 1 | -15/+16 |
| * | | | | | | | | Ensure we don't mutate state cache entries | Erik Johnston | 2016-09-14 | 3 | -22/+33 |
* | | | | | | | | | Merge pull request #1118 from matrix-org/erikj/public_rooms_splitout | Erik Johnston | 2016-09-14 | 5 | -159/+403 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | Enable testing of client_reader | Erik Johnston | 2016-09-14 | 1 | -0/+2 |