| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 #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 |
| * | | | | Split out public room list into a worker process | Erik Johnston | 2016-09-14 | 1 | -0/+215 |
| * | | | | Move RoomListHandler into a separate file | Erik Johnston | 2016-09-14 | 3 | -159/+186 |
|/ / / / |
|
* | | | | Merge pull request #1111 from matrix-org/matthew/device-ids | Matthew Hodgson | 2016-09-14 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | make device IDs more useful for human disambiguation | Matthew Hodgson | 2016-09-13 | 1 | -1/+1 |
* | | | | | Merge pull request #1116 from matrix-org/paul/tiny-fixes | Paul Evans | 2016-09-13 | 1 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | Fix typo "persiting" | Paul "LeoNerd" Evans | 2016-09-13 | 1 | -2/+2 |
* | | | | | | Merge pull request #1114 from matrix-org/markjh/limit_key_retries | Mark Haines | 2016-09-13 | 1 | -11/+30 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Limit how often we ask for keys from dead servers | Mark Haines | 2016-09-13 | 1 | -11/+30 |
|/ / / / / |
|
* | | | | | Merge pull request #1112 from matrix-org/markjh/e2e_key_handler | Mark Haines | 2016-09-13 | 2 | -115/+118 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Move the E2E key handling into the e2e handler | Mark Haines | 2016-09-13 | 2 | -115/+118 |
|/ / / / |
|
* | | | | Merge pull request #1110 from matrix-org/markjh/e2e_timeout | Mark Haines | 2016-09-13 | 5 | -55/+115 |
|\ \ \ \ |
|
| * | | | | Add a timeout parameter for end2end key queries. | Mark Haines | 2016-09-12 | 5 | -55/+115 |
* | | | | | Merge pull request #1109 from matrix-org/erikj/partial_indices | Erik Johnston | 2016-09-13 | 4 | -10/+41 |
|\ \ \ \ \ |
|
| * | | | | | Remove where clause | Erik Johnston | 2016-09-12 | 1 | -1/+0 |
| * | | | | | Index contains_url for file search queries | Erik Johnston | 2016-09-12 | 2 | -0/+25 |
| * | | | | | Add WHERE clause support to index creation | Erik Johnston | 2016-09-12 | 2 | -10/+17 |
* | | | | | | Merge pull request #1108 from matrix-org/erikj/create_dm | Erik Johnston | 2016-09-12 | 1 | -0/+6 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Add is_direct param to /createRoom | Erik Johnston | 2016-09-12 | 1 | -0/+6 |
| |/ / / / |
|
* | | | | | Merge pull request #1107 from matrix-org/erikj/backfill_none | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Fix backfill when cannot find an event. | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
| |/ / / / |
|
* | | | | | Merge pull request #1106 from matrix-org/erikj/state_reindex_concurrent | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Create new index concurrently | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
| |/ / / / |
|
* | | | | | Merge pull request #1105 from matrix-org/erikj/make_notif_highlight_query_fast | Erik Johnston | 2016-09-12 | 2 | -1/+29 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Change the index to be stream_ordering, highlight | Erik Johnston | 2016-09-12 | 1 | -1/+1 |
| * | | | | Remove unused import | Erik Johnston | 2016-09-12 | 1 | -1/+0 |
| * | | | | Use register_background_index_update | Erik Johnston | 2016-09-12 | 1 | -24/+4 |
| * | | | | Add back in query change | Erik Johnston | 2016-09-12 | 1 | -1/+3 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_notif... | Erik Johnston | 2016-09-12 | 16 | -48/+133 |
| |\ \ \ \ |
|
| * | | | | | Make reindex happen in bg | Erik Johnston | 2016-09-12 | 2 | -3/+32 |
* | | | | | | Merge pull request #1104 from matrix-org/markjh/direct_to_device_federation_sync | Mark Haines | 2016-09-12 | 1 | -0/+2 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Fix direct to device messages recieved over federation to notify sync | Mark Haines | 2016-09-12 | 1 | -0/+2 |
* | | | | | | Merge pull request #1103 from matrix-org/markjh/comment_on_create_index | Mark Haines | 2016-09-12 | 6 | -0/+24 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Add comments to existing schema deltas that used "CREATE INDEX" directly | Mark Haines | 2016-09-12 | 6 | -0/+24 |
|/ / / / / |
|
* | | | | | Merge pull request #1102 from matrix-org/revert-1099-dbkr/make_notif_highligh... | Erik Johnston | 2016-09-12 | 2 | -21/+1 |
|\ \ \ \ \ |
|
| * | | | | | Revert "Add index to event_push_actions" | Erik Johnston | 2016-09-12 | 2 | -21/+1 |
|/ / / / / |
|
* | | | | | Merge pull request #1101 from matrix-org/erikj/state_types_idx | Erik Johnston | 2016-09-12 | 1 | -19/+35 |
|\ \ \ \ \ |
|
| * | | | | | Change state fetch query for postgres to be faster | Erik Johnston | 2016-09-12 | 1 | -19/+35 |
* | | | | | | Merge pull request #1097 from matrix-org/erikj/replication_typing_rest | Erik Johnston | 2016-09-12 | 2 | -1/+11 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Comment | Erik Johnston | 2016-09-09 | 1 | -0/+3 |
| * | | | | | Correctly handle typing stream id resetting | Erik Johnston | 2016-09-09 | 1 | -1/+8 |
* | | | | | | Merge pull request #1095 from matrix-org/erikj/batch_edus | Erik Johnston | 2016-09-12 | 5 | -20/+60 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edus | Erik Johnston | 2016-09-09 | 9 | -33/+148 |
| |\ \ \ \ \ |
|
| * | | | | | | Fix incorrect attribute name | Erik Johnston | 2016-09-09 | 1 | -1/+1 |
| * | | | | | | Comment | Erik Johnston | 2016-09-09 | 1 | -0/+1 |
| * | | | | | | Add edu.type as part of key. Remove debug logging | Erik Johnston | 2016-09-09 | 1 | -2/+3 |
| * | | | | | | Clobber EDUs in send queue | Erik Johnston | 2016-09-09 | 5 | -20/+58 |
* | | | | | | | Merge pull request #1100 from VShell/fix-cas | Richard van der Hoff | 2016-09-09 | 1 | -5/+2 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Conform better to the CAS protocol specification | Shell Turner | 2016-09-09 | 1 | -5/+2 |
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | Merge pull request #1099 from matrix-org/dbkr/make_notif_highlight_query_fast | David Baker | 2016-09-09 | 2 | -1/+21 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | / / /
| | |_|/ / /
| |/| | | | |
|
| * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_... | David Baker | 2016-09-09 | 32 | -256/+967 |
| |\ \ \ \ \
| |/ / / / /
|/| | | | | |
|
* | | | | | | Merge pull request #1096 from matrix-org/markjh/get_access_token | Mark Haines | 2016-09-09 | 6 | -27/+67 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | Add helper function for getting access_tokens from requests | Mark Haines | 2016-09-09 | 6 | -27/+67 |
* | | | | | | Merge pull request #1091 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-09-09 | 3 | -4/+72 |
|\ \ \ \ \ \ |
|
| * | | | | | | Log if rejecting 3PE query metadata result due to type check | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -4/+11 |
| * | | | | | | Reject malformed 3PE query metadata results earlier in AS API handling code | Paul "LeoNerd" Evans | 2016-09-09 | 2 | -11/+15 |
| * | | | | | | Minor fixes from PR comments | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+2 |
| * | | | | | | appease pep8 | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+2 |
| * | | | | | | Python isn't JavaScript; have to quote dict keys | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+1 |
| * | | | | | | Efficiency fix for lookups of a single protocol | Paul "LeoNerd" Evans | 2016-09-09 | 2 | -2/+7 |
| * | | | | | | Allow lookup of a single 3PE protocol query metadata | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -0/+21 |
| * | | | | | | Don't corrupt shared cache on subsequent protocol requests | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -0/+2 |
| * | | | | | | Collect up all the "instances" lists of individual AS protocol results into o... | Paul "LeoNerd" Evans | 2016-09-08 | 1 | -1/+29 |
* | | | | | | | Merge pull request #1094 from matrix-org/paul/get-state-whole-event | Paul Evans | 2016-09-09 | 1 | -2/+9 |
|\ \ \ \ \ \ \
| |_|_|_|/ / /
|/| | | | | | |
|
| * | | | | | | Filter returned events for client-facing format | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+3 |
| * | | | | | | Allow clients to specify the format a room state event is returned in | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+7 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | Drop replication log levels | Erik Johnston | 2016-09-09 | 2 | -3/+2 |
* | | | | | | Merge pull request #1093 from matrix-org/erikj/dedupe_presence | Erik Johnston | 2016-09-09 | 1 | -0/+6 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Deduplicate presence in _update_states | Erik Johnston | 2016-09-09 | 1 | -0/+6 |
|/ / / / / |
|
* | | | | | Merge pull request #1092 from matrix-org/erikj/transaction_queue_check | Erik Johnston | 2016-09-09 | 1 | -15/+16 |
|\ \ \ \ \ |
|
| * | | | | | Check if destination is ready for retry earlier | Erik Johnston | 2016-09-09 | 1 | -15/+16 |
* | | | | | | Merge pull request #1089 from matrix-org/markjh/direct_to_device_stream | Mark Haines | 2016-09-09 | 4 | -4/+38 |
|\ \ \ \ \ \ |
|
| * | | | | | | Use the previous MAX value if any to set the stream_id | Mark Haines | 2016-09-09 | 1 | -1/+2 |
| * | | | | | | Track the max_stream_device_id in a separate table, since we delete from the ... | Mark Haines | 2016-09-09 | 4 | -4/+37 |
* | | | | | | | Merge pull request #1090 from matrix-org/erikj/transaction_queue_check | Erik Johnston | 2016-09-09 | 1 | -122/+134 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Fix tightloop on sending transaction | Erik Johnston | 2016-09-09 | 1 | -122/+134 |
|/ / / / / / |
|
* | | | | | | Merge pull request #1088 from matrix-org/erikj/transaction_queue_check | Erik Johnston | 2016-09-09 | 1 | -38/+41 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Correctly guard against multiple concurrent transactions | Erik Johnston | 2016-09-09 | 1 | -38/+41 |
* | | | | | | Merge pull request #1087 from matrix-org/markjh/reapply_delta | Mark Haines | 2016-09-09 | 1 | -1/+4 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Just move the schema and add some DROPs | Mark Haines | 2016-09-09 | 2 | -35/+4 |
| * | | | | | Only catch databas errors | Mark Haines | 2016-09-08 | 1 | -1/+1 |
| * | | | | | Add a stub run_upgrade | Mark Haines | 2016-09-08 | 1 | -0/+4 |
| * | | | | | Reapply 34/device_outbox in 35/device_outbox_again.py since the schema was bu... | Mark Haines | 2016-09-08 | 1 | -0/+30 |
* | | | | | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-09-09 | 3 | -3/+10 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Bump changelog and version | Erik Johnston | 2016-09-09 | 2 | -2/+9 |
| * | | | | | Reduce batch size to be under SQL limit | Erik Johnston | 2016-09-09 | 1 | -1/+1 |
| | |_|_|/
| |/| | | |
|
* | | | | | Update last_device_stream_id_by_dest if there is nothing to send | Erik Johnston | 2016-09-09 | 1 | -0/+1 |
* | | | | | Merge pull request #1081 from matrix-org/dbkr/notifications_only_highlight | Matthew Hodgson | 2016-09-09 | 2 | -2/+10 |
|\ \ \ \ \ |
|
* \ \ \ \ \ | Merge pull request #1080 from matrix-org/dbkr/fix_notifications_api_with_from | David Baker | 2016-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | | |
|
| * | | | | | Fix /notifications API when used with `from` param | David Baker | 2016-09-08 | 1 | -1/+1 |
* | | | | | | Merge pull request #1085 from matrix-org/erikj/reindex_state_groups | Erik Johnston | 2016-09-08 | 3 | -2/+57 |
|\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | | |
|
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reindex_st... | Erik Johnston | 2016-09-08 | 3 | -24/+63 |
| |\ \ \ \ \
| |/ / / / /
|/| | | | | |
|
* | | | | | | Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcard | Mark Haines | 2016-09-08 | 1 | -18/+36 |
|\ \ \ \ \ \ |
|
| * | | | | | | Support wildcard device_ids for direct to device messages | Mark Haines | 2016-09-08 | 1 | -18/+36 |
* | | | | | | | Merge pull request #1082 from matrix-org/erikj/remote_public_rooms | Erik Johnston | 2016-09-08 | 2 | -6/+27 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Use parse_string | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
| * | | | | | | | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 2 | -5/+26 |
| | | * | | | | | Add delta file | Erik Johnston | 2016-09-08 | 1 | -0/+20 |