summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1157 from Rugvip/nolimitErik Johnston2016-10-1114-77/+64
|\ | | | | Remove rate limiting from app service senders and fix get_or_create_user requester
| * rest/client/v1/register: use the correct requester in createUserPatrik Oldsberg2016-10-064-31/+22
| | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| * handlers/profile: added admin override for set_displayname and set_avatar_urlPatrik Oldsberg2016-10-061-4/+4
| | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| * handers: do not ratelimit app service sendersPatrik Oldsberg2016-10-061-1/+7
| | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
| * storage/appservice: make appservice methods only relying on the cache ↵Patrik Oldsberg2016-10-0610-41/+31
| | | | | | | | synchronous
* | Merge pull request #1150 from Rugvip/state_keyErik Johnston2016-10-111-10/+0
|\ \ | | | | | | api/auth: fix for not being allowed to set your own state_key
| * | api/auth: fix for not being allowed to set your own state_keyPatrik Oldsberg2016-09-301-10/+0
| | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | Merge pull request #1160 from matrix-org/rav/401_on_password_failRichard van der Hoff2016-10-071-32/+52
|\ \ \ | | | | | | | | Interactive Auth: Return 401 from for incorrect password
| * | | Interactive Auth: Return 401 from for incorrect passwordRichard van der Hoff2016-10-071-32/+52
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This requires a bit of fettling, because I want to return a helpful error message too but we don't want to distinguish between unknown user and invalid password. To avoid hardcoding the error message into 15 places in the code, I've had to refactor a few methods to return None instead of throwing. Fixes https://matrix.org/jira/browse/SYN-744
* | | Merge pull request #1159 from matrix-org/rav/uia_fallback_postmessageRichard van der Hoff2016-10-061-1/+3
|\ \ \ | |_|/ |/| | window.postmessage for Interactive Auth fallback
| * | window.postmessage for Interactive Auth fallbackRichard van der Hoff2016-10-061-1/+3
| |/ | | | | | | | | If you're a webapp running the fallback in an iframe, you can't set set a window.onAuthDone function. Let's post a message back to window.opener instead.
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-10-052-1/+30
|\ \
| * \ Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse v0.18.1Erik Johnston2016-10-0524-611/+942
| |\ \
| | * | Bump changelog and versionErik Johnston2016-10-052-1/+7
| | | |
| | * | Update changelog v0.18.1-rc1Erik Johnston2016-09-301-0/+2
| | | |
| | * | Bump version and changelogErik Johnston2016-09-302-1/+22
| | | |
* | | | Merge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brandDavid Baker2016-10-041-1/+3
|\ \ \ \ | |_|/ / |/| | | Add Riot brand to email notifs
| * | | Add Riot brand to email notifsDavid Baker2016-10-041-1/+3
|/ / /
* | | Merge pull request #1153 from matrix-org/erikj/ldap_restructureErik Johnston2016-09-301-87/+192
|\ \ \ | | | | | | | | Restructure ldap authentication
| * | | Restructure ldap authenticationMartin Weinelt2016-09-291-87/+192
|/ / / | | | | | | | | | | | | | | | | | | | | | - properly parse return values of ldap bind() calls - externalize authentication methods - change control flow to be more error-resilient - unbind ldap connections in many places - improve log messages and loglevels
* | | Merge pull request #1145 from matrix-org/erikj/fix_reindexErik Johnston2016-09-291-15/+29
|\ \ \ | |_|/ |/| | Fix background reindex of origin_server_ts
| * | Fix background reindex of origin_server_tsErik Johnston2016-09-271-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | The storage function `_get_events_txn` was removed everywhere except from this background reindex. The function was removed due to it being (almost) completely unused while also being large and complex. Therefore, instead of resurrecting `_get_events_txn` we manually reimplement the bits that are needed directly.
* | | Merge pull request #1146 from matrix-org/erikj/port_script_fixErik Johnston2016-09-271-0/+9
|\ \ \ | | | | | | | | Update port script with recently added tables
| * | | Update port script with recently added tablesErik Johnston2016-09-271-0/+9
| |/ / | | | | | | | | | | | | | | | This also fixes a bug where the port script would explode when it encountered the newly added boolean column `public_room_list_stream.visibility`
* | | Merge pull request #1144 from matrix-org/erikj/sqlite_state_perfErik Johnston2016-09-271-23/+29
|\ \ \ | |/ / |/| | Fix perf of fetching state in SQLite
| * | Remove duplicationErik Johnston2016-09-271-31/+19
| | |
| * | Remove unused variableErik Johnston2016-09-271-3/+0
| | |
| * | Fix perf of fetching state in SQLiteErik Johnston2016-09-261-20/+41
|/ /
* | Merge pull request #1140 from matrix-org/erikj/typing_fed_timeoutErik Johnston2016-09-266-83/+122
|\ \ | | | | | | Time out typing over federation
| * | Move FEDERATION_PING_INTERVAL timer. Update log lineErik Johnston2016-09-231-8/+10
| | |
| * | Time out typing over federationErik Johnston2016-09-236-83/+120
| | |
* | | typoMatthew Hodgson2016-09-251-1/+1
| | |
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-09-232-1/+55
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse v0.18.0Erik Johnston2016-09-1980-777/+3089
| |\
| | * Bump version and changelogErik Johnston2016-09-192-3/+16
| | |
| | * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0Erik Johnston2016-09-195-118/+194
| | |\
| | * | Update changelog v0.18.0-rc1Erik Johnston2016-09-161-2/+3
| | | |
| | * | Update changelog and bump versionErik Johnston2016-09-162-1/+41
| | | |
| * | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse v0.17.3Erik Johnston2016-09-093-3/+10
| |\ \ \
* | \ \ \ Merge pull request #1136 from matrix-org/erikj/fix_signed_3pidErik Johnston2016-09-223-12/+35
|\ \ \ \ \ | | | | | | | | | | | | Allow invites via 3pid to bypass sender sig check
| * | | | | Update commentsErik Johnston2016-09-221-2/+3
| | | | | |
| * | | | | Add commentsErik Johnston2016-09-222-0/+6
| | | | | |
| * | | | | Shuffle things around to make unit tests workErik Johnston2016-09-222-15/+16
| | | | | |
| * | | | | Allow invites via 3pid to bypass sender sig checkErik Johnston2016-09-222-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a server sends a third party invite another server may be the one that the inviting user registers with. In this case it is that remote server that will issue an actual invitation, and wants to do it "in the name of" the original invitee. However, the new proper invite will not be signed by the original server, and thus other servers would reject the invite if it was seen as coming from the original user. To fix this, a special case has been added to the auth rules whereby another server can send an invite "in the name of" another server's user, so long as that user had previously issued a third party invite that is now being accepted.
* | | | | | Merge pull request #1132 from matrix-org/erikj/initial_sync_splitErik Johnston2016-09-226-383/+461
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Support /initialSync in synchrotron worker
| * | | | | Support /initialSync in synchrotron workerErik Johnston2016-09-216-383/+461
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1134 from matrix-org/erikj/fix_stream_public_deletionErik Johnston2016-09-213-6/+31
|\ \ \ \ \ | | | | | | | | | | | | Fix _delete_old_forward_extrem_cache query
| * | | | | Match against event_id, rather than room_idErik Johnston2016-09-211-1/+1
| | | | | |
| * | | | | Remove spurious AS clauseErik Johnston2016-09-211-1/+1
| | | | | |
| * | | | | Update correct tableErik Johnston2016-09-211-6/+10
| | | | | |
| * | | | | Readd entries to public_room_list_stream that were deletedErik Johnston2016-09-212-1/+23
| | | | | |
| * | | | | Fix _delete_old_forward_extrem_cache queryErik Johnston2016-09-211-5/+4
| |/ / / /
* | | | | Merge pull request #1133 from matrix-org/erikj/public_room_countErik Johnston2016-09-211-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | Add total_room_count_estimate to /publicRooms
| * | | | Add total_room_count_estimate to /publicRoomsErik Johnston2016-09-211-0/+3
|/ / / /
* | | | Merge pull request #1131 from matrix-org/matthew/e2e-notifsErik Johnston2016-09-191-0/+49
|\ \ \ \ | | | | | | | | | | Notify on e2e events
| * | | | _id field must uniquely identify different conditionsErik Johnston2016-09-191-2/+2
| | | | |
| * | | | proposal for notifying on e2e eventsMatthew Hodgson2016-09-171-0/+49
| | | | |
* | | | | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pagErik Johnston2016-09-191-12/+25
|\ \ \ \ \ | | | | | | | | | | | | Handle fact that _generate_room_entry may not return a room entry
| * | | | | PEP8Erik Johnston2016-09-171-1/+1
| | | | | |
| * | | | | Handle fact that _generate_room_entry may not return a room entryErik Johnston2016-09-171-12/+25
| | | | | |
* | | | | | Enable guest access to POST /publicRoomsErik Johnston2016-09-171-2/+2
| |/ / / / |/| | | |
* | | | | Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pagErik Johnston2016-09-171-110/+123
|\| | | | | | | | | | | | | | Fix and clean up publicRooms pagination
| * | | | SpellingErik Johnston2016-09-171-1/+1
| | | | |
| * | | | Fix and clean up publicRooms paginationErik Johnston2016-09-171-110/+123
| | |_|/ | |/| |
* | | | Merge pull request #1127 from matrix-org/dbkr/publicroom_search_case_insensitiveErik Johnston2016-09-171-4/+4
|\ \ \ \ | | | | | | | | | | Make public room search case insensitive
| * | | | Make public room search case insensitiveDavid Baker2016-09-161-4/+4
| |/ / /
* | | | mention client_reader workerMatthew Hodgson2016-09-171-0/+1
| | | |
* | | | fix logger for client_reader workerMatthew Hodgson2016-09-171-1/+1
|/ / /
* | | Fix public room pagination for client_reader appErik Johnston2016-09-161-0/+1
| | |
* | | Merge pull request #1126 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-167-24/+158
|\ \ \ | | | | | | | | Add very basic filter API to /publicRooms
| * | | CommentErik Johnston2016-09-161-0/+2
| | | |
| * | | Make POST /publicRooms require authErik Johnston2016-09-161-2/+1
| | | |
| * | | CommentErik Johnston2016-09-161-0/+2
| | | |
| * | | Add remote reoom cacheErik Johnston2016-09-161-2/+23
| | | |
| * | | Support filtering remote room listsErik Johnston2016-09-163-6/+18
| | | |
| * | | Filter remote rooms lists locallyErik Johnston2016-09-162-11/+25
| | | |
| * | | Don't cache searched in /publicRoomsErik Johnston2016-09-161-1/+5
| | | |
| * | | Add new storage function to slave storeErik Johnston2016-09-161-0/+1
| | | |
| * | | Add very basic filter API to /publicRoomsErik Johnston2016-09-151-5/+18
| | | |
| * | | Change the way we calculate new_limit in /publicRooms and add POST APIErik Johnston2016-09-152-15/+62
| | | |
| * | | Handling expiring stream extrems correctly.Erik Johnston2016-09-152-3/+22
|/ / /
* | | Merge pull request #1125 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-152-6/+6
|\ \ \ | | | | | | | | Change get_pos_of_last_change to return upper bound
| * | | Change get_pos_of_last_change to return upper boundErik Johnston2016-09-152-6/+6
| | | |
* | | | Merge pull request #1124 from matrix-org/erikj/enable_state_caching_workersErik Johnston2016-09-156-0/+6
|\ \ \ \ | | | | | | | | | | Enable state caches on workers
| * | | | Enable state caches on workersErik Johnston2016-09-156-0/+6
| | | | |
* | | | | Merge pull request #1123 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-153-2/+19
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Use stream_change cache to make get_forward_extremeties_for_room cache more effective
| * | | Use stream_change cache to make get_forward_extremeties_for_room cache more ↵Erik Johnston2016-09-153-2/+19
| | | | | | | | | | | | | | | | effective
* | | | Merge pull request #1122 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-152-1/+2
|\| | | | | | | | | | | Add cache to get_forward_extremeties_for_room
| * | | Add cache to get_forward_extremeties_for_roomErik Johnston2016-09-152-1/+2
|/ / /
* | | Remove default public rooms limitErik Johnston2016-09-151-1/+1
| | |
* | | Merge pull request #1120 from matrix-org/erikj/push_invite_cacheErik Johnston2016-09-151-9/+1
|\ \ \ | | | | | | | | Ensure we don't mutate the cache of push rules
| * | | Ensure we don't mutate the cache of push rulesErik Johnston2016-09-151-9/+1
| | | |
* | | | Merge pull request #1121 from matrix-org/erikj/public_room_paginateErik Johnston2016-09-1518-139/+595
|\ \ \ \ | |/ / / |/| | | Add pagination support to publicRooms
| * | | By default limit /publicRooms to 100 entriesErik Johnston2016-09-151-1/+1
| | | |
| * | | Stream public room changes down replicationErik Johnston2016-09-154-1/+74
| | | |
| * | | Base public room list off of public_rooms streamErik Johnston2016-09-152-7/+79
| | | |
| * | | Pass since/from parameters over federationErik Johnston2016-09-156-57/+63
| | | |
| * | | Allow paginating both forwards and backwardsErik Johnston2016-09-152-24/+65
| | | |
| * | | Remove support for aggregate room listsErik Johnston2016-09-153-65/+1
| | | |
| * | | Accept optional token to public room listErik Johnston2016-09-152-7/+76
| | | |
| * | | Calculate the public room list from a stream_orderingErik Johnston2016-09-142-3/+43
| | | |
| * | | Refactor public rooms to not pull out the full state for each roomErik Johnston2016-09-142-16/+33
| | | |
| * | | Add a room visibility streamErik Johnston2016-09-144-16/+100
| | | |
| * | | Add a DB index to figure out past state at a stream ordering in a roomErik Johnston2016-09-142-0/+118
| | | |
* | | | Merge pull request #1117 from matrix-org/erikj/fix_stateErik Johnston2016-09-143-20/+30
|\ \ \ \ | | | | | | | | | | Ensure we don't mutate state cache entries
| * | | | Amalgamate two identical consecutive if statementsErik Johnston2016-09-141-7/+5
| | | | |
| * | | | Fix reindexErik Johnston2016-09-141-15/+16
| | | | |
| * | | | Ensure we don't mutate state cache entriesErik Johnston2016-09-143-22/+33
| | | | |
* | | | | Merge pull request #1118 from matrix-org/erikj/public_rooms_splitoutErik Johnston2016-09-145-159/+403
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Split out public room list into a worker process
| * | | Enable testing of client_readerErik Johnston2016-09-141-0/+2
| | | |
| * | | Split out public room list into a worker processErik Johnston2016-09-141-0/+215
| | | |
| * | | Move RoomListHandler into a separate fileErik Johnston2016-09-143-159/+186
|/ / /
* | | Merge pull request #1111 from matrix-org/matthew/device-idsMatthew Hodgson2016-09-141-1/+1
|\ \ \ | | | | | | | | make device IDs more useful for human disambiguation
| * | | make device IDs more useful for human disambiguationMatthew Hodgson2016-09-131-1/+1
| | | |
* | | | Merge pull request #1116 from matrix-org/paul/tiny-fixesPaul Evans2016-09-131-2/+2
|\ \ \ \ | | | | | | | | | | Fix typo "persiting"
| * | | | Fix typo "persiting"Paul "LeoNerd" Evans2016-09-131-2/+2
| | | | |
* | | | | Merge pull request #1114 from matrix-org/markjh/limit_key_retriesMark Haines2016-09-131-11/+30
|\ \ \ \ \ | |/ / / / |/| | | | Limit how often we ask for keys from dead servers
| * | | | Limit how often we ask for keys from dead serversMark Haines2016-09-131-11/+30
|/ / / /
* | | | Merge pull request #1112 from matrix-org/markjh/e2e_key_handlerMark Haines2016-09-132-115/+118
|\ \ \ \ | | | | | | | | | | Move the E2E key handling into the e2e handler
| * | | | Move the E2E key handling into the e2e handlerMark Haines2016-09-132-115/+118
|/ / / /
* | | | Merge pull request #1110 from matrix-org/markjh/e2e_timeoutMark Haines2016-09-135-55/+115
|\ \ \ \ | | | | | | | | | | Add a timeout parameter for end2end key queries.
| * | | | Add a timeout parameter for end2end key queries.Mark Haines2016-09-125-55/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a timeout parameter for controlling how long synapse will wait for responses from remote servers. For servers that fail include how they failed to make it easier to debug. Fetch keys from different servers in parallel rather than in series. Set the default timeout to 10s.
* | | | | Merge pull request #1109 from matrix-org/erikj/partial_indicesErik Johnston2016-09-134-10/+41
|\ \ \ \ \ | | | | | | | | | | | | Add WHERE clause support to index creation
| * | | | | Remove where clauseErik Johnston2016-09-121-1/+0
| | | | | |
| * | | | | Index contains_url for file search queriesErik Johnston2016-09-122-0/+25
| | | | | |
| * | | | | Add WHERE clause support to index creationErik Johnston2016-09-122-10/+17
| | | | | |
* | | | | | Merge pull request #1108 from matrix-org/erikj/create_dmErik Johnston2016-09-121-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add is_direct param to /createRoom
| * | | | | Add is_direct param to /createRoomErik Johnston2016-09-121-0/+6
| |/ / / /
* | | | | Merge pull request #1107 from matrix-org/erikj/backfill_noneErik Johnston2016-09-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix backfill when cannot find an event.
| * | | | | Fix backfill when cannot find an event.Erik Johnston2016-09-121-1/+1
| |/ / / / | | | | | | | | | | | | | | | `get_pdu` can succeed but return None.
* | | | | Merge pull request #1106 from matrix-org/erikj/state_reindex_concurrentErik Johnston2016-09-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Create new index concurrently
| * | | | | Create new index concurrentlyErik Johnston2016-09-121-1/+1
| |/ / / /
* | | | | Merge pull request #1105 from matrix-org/erikj/make_notif_highlight_query_fastErik Johnston2016-09-122-1/+29
|\ \ \ \ \ | |/ / / / |/| | | | Optimise /notifications query
| * | | | Change the index to be stream_ordering, highlightErik Johnston2016-09-121-1/+1
| | | | |
| * | | | Remove unused importErik Johnston2016-09-121-1/+0
| | | | |
| * | | | Use register_background_index_updateErik Johnston2016-09-121-24/+4
| | | | |
| * | | | Add back in query changeErik Johnston2016-09-121-1/+3
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-09-1216-48/+133
| |\ \ \ \ | | | | | | | | | | | | | | | | | | erikj/make_notif_highlight_query_fast
| * | | | | Make reindex happen in bgErik Johnston2016-09-122-3/+32
| | | | | |
* | | | | | Merge pull request #1104 from matrix-org/markjh/direct_to_device_federation_syncMark Haines2016-09-121-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix direct to device messages recieved over federation to notify sync
| * | | | | Fix direct to device messages recieved over federation to notify syncMark Haines2016-09-121-0/+2
| | | | | |
* | | | | | Merge pull request #1103 from matrix-org/markjh/comment_on_create_indexMark Haines2016-09-126-0/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add comments to existing schema deltas that used "CREATE INDEX" directly
| * | | | | Add comments to existing schema deltas that used "CREATE INDEX" directlyMark Haines2016-09-126-0/+24
|/ / / / /
* | | | | Merge pull request #1102 from ↵Erik Johnston2016-09-122-21/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/revert-1099-dbkr/make_notif_highlight_query_fast Revert "Add index to event_push_actions"
| * | | | | Revert "Add index to event_push_actions"Erik Johnston2016-09-122-21/+1
|/ / / / /
* | | | | Merge pull request #1101 from matrix-org/erikj/state_types_idxErik Johnston2016-09-121-19/+35
|\ \ \ \ \ | | | | | | | | | | | | Change state fetch query for postgres to be faster
| * | | | | Change state fetch query for postgres to be fasterErik Johnston2016-09-121-19/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that postgres doesn't like doing a list of OR's and is about 1000x slower, so we just issue a query for each specific type seperately.
* | | | | | Merge pull request #1097 from matrix-org/erikj/replication_typing_restErik Johnston2016-09-122-1/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Correctly handle typing stream id resetting
| * | | | | CommentErik Johnston2016-09-091-0/+3
| | | | | |
| * | | | | Correctly handle typing stream id resettingErik Johnston2016-09-091-1/+8
| | | | | |
* | | | | | Merge pull request #1095 from matrix-org/erikj/batch_edusErik Johnston2016-09-125-20/+60
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Clobber EDUs in send queue
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edusErik Johnston2016-09-099-33/+148
| |\ \ \ \ \
| * | | | | | Fix incorrect attribute nameErik Johnston2016-09-091-1/+1
| | | | | | |
| * | | | | | CommentErik Johnston2016-09-091-0/+1
| | | | | | |
| * | | | | | Add edu.type as part of key. Remove debug loggingErik Johnston2016-09-091-2/+3
| | | | | | |
| * | | | | | Clobber EDUs in send queueErik Johnston2016-09-095-20/+58
| | | | | | |
* | | | | | | Merge pull request #1100 from VShell/fix-casRichard van der Hoff2016-09-091-5/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Conform better to the CAS protocol specification
| * | | | | | | Conform better to the CAS protocol specificationShell Turner2016-09-091-5/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to CAS's /login endpoint properly, and don't require an <attributes> element. Signed-off-by: Shell Turner <cam.turn@gmail.com>
* | | | | | | Merge pull request #1099 from matrix-org/dbkr/make_notif_highlight_query_fastDavid Baker2016-09-092-1/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | Add index to event_push_actions
| * | | | | Merge remote-tracking branch 'origin/develop' into ↵David Baker2016-09-0932-256/+967
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | dbkr/make_notif_highlight_query_fast
* | | | | | Merge pull request #1096 from matrix-org/markjh/get_access_tokenMark Haines2016-09-096-27/+67
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add helper function for getting access_tokens from requests
| * | | | | Add helper function for getting access_tokens from requestsMark Haines2016-09-096-27/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than reimplementing the token parsing in the various places. This will make it easier to change the token parsing to allow access_tokens in HTTP headers.
* | | | | | Merge pull request #1091 from matrix-org/paul/third-party-lookupPaul Evans2016-09-093-4/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improvements to 3PE lookup API
| * | | | | | Log if rejecting 3PE query metadata result due to type checkPaul "LeoNerd" Evans2016-09-091-4/+11
| | | | | | |
| * | | | | | Reject malformed 3PE query metadata results earlier in AS API handling codePaul "LeoNerd" Evans2016-09-092-11/+15
| | | | | | |
| * | | | | | Minor fixes from PR commentsPaul "LeoNerd" Evans2016-09-091-2/+2
| | | | | | |
| * | | | | | appease pep8Paul "LeoNerd" Evans2016-09-091-1/+2
| | | | | | |
| * | | | | | Python isn't JavaScript; have to quote dict keysPaul "LeoNerd" Evans2016-09-091-1/+1
| | | | | | |
| * | | | | | Efficiency fix for lookups of a single protocolPaul "LeoNerd" Evans2016-09-092-2/+7
| | | | | | |
| * | | | | | Allow lookup of a single 3PE protocol query metadataPaul "LeoNerd" Evans2016-09-091-0/+21
| | | | | | |
| * | | | | | Don't corrupt shared cache on subsequent protocol requestsPaul "LeoNerd" Evans2016-09-091-0/+2
| | | | | | |
| * | | | | | Collect up all the "instances" lists of individual AS protocol results into ↵Paul "LeoNerd" Evans2016-09-081-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | one combined answer to the client
* | | | | | | Merge pull request #1094 from matrix-org/paul/get-state-whole-eventPaul Evans2016-09-091-2/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Allow clients to ask for the whole of a single state event
| * | | | | | Filter returned events for client-facing formatPaul "LeoNerd" Evans2016-09-091-2/+3
| | | | | | |
| * | | | | | Allow clients to specify the format a room state event is returned inPaul "LeoNerd" Evans2016-09-091-1/+7
| | |/ / / / | |/| | | |
* | | | | | Drop replication log levelsErik Johnston2016-09-092-3/+2
| | | | | |
* | | | | | Merge pull request #1093 from matrix-org/erikj/dedupe_presenceErik Johnston2016-09-091-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Deduplicate presence in _update_states
| * | | | | Deduplicate presence in _update_statesErik Johnston2016-09-091-0/+6
|/ / / / /
* | | | | Merge pull request #1092 from matrix-org/erikj/transaction_queue_checkErik Johnston2016-09-091-15/+16
|\ \ \ \ \ | | | | | | | | | | | | Check if destination is ready for retry earlier
| * | | | | Check if destination is ready for retry earlierErik Johnston2016-09-091-15/+16
| | | | | |
* | | | | | Merge pull request #1089 from matrix-org/markjh/direct_to_device_streamMark Haines2016-09-094-4/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | Track the max device stream_id in a separate table,
| * | | | | | Use the previous MAX value if any to set the stream_idMark Haines2016-09-091-1/+2
| | | | | | |
| * | | | | | Track the max_stream_device_id in a separate table, since we delete from the ↵Mark Haines2016-09-094-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | inbox table
* | | | | | | Merge pull request #1090 from matrix-org/erikj/transaction_queue_checkErik Johnston2016-09-091-122/+134
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fix tightloop on sending transaction
| * | | | | | Fix tightloop on sending transactionErik Johnston2016-09-091-122/+134
|/ / / / / /
* | | | | | Merge pull request #1088 from matrix-org/erikj/transaction_queue_checkErik Johnston2016-09-091-38/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Correctly guard against multiple concurrent transactions
| * | | | | Correctly guard against multiple concurrent transactionsErik Johnston2016-09-091-38/+41
| | | | | |
* | | | | | Merge pull request #1087 from matrix-org/markjh/reapply_deltaMark Haines2016-09-091-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Reapply 34/device_outbox in 35/device_outbox_again.py since the schem…
| * | | | | Just move the schema and add some DROPsMark Haines2016-09-092-35/+4
| | | | | |
| * | | | | Only catch databas errorsMark Haines2016-09-081-1/+1
| | | | | |
| * | | | | Add a stub run_upgradeMark Haines2016-09-081-0/+4
| | | | | |
| * | | | | Reapply 34/device_outbox in 35/device_outbox_again.py since the schema was ↵Mark Haines2016-09-081-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | bumped before it landed on develop
* | | | | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse into developErik Johnston2016-09-093-3/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Bump changelog and versionErik Johnston2016-09-092-2/+9
| | | | | |
| * | | | | Reduce batch size to be under SQL limitErik Johnston2016-09-091-1/+1
| | |_|_|/ | |/| | |
* | | | | Update last_device_stream_id_by_dest if there is nothing to sendErik Johnston2016-09-091-0/+1
| | | | |
* | | | | Merge pull request #1081 from matrix-org/dbkr/notifications_only_highlightMatthew Hodgson2016-09-092-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Implement `only=highlight` on `/notifications`
* \ \ \ \ \ Merge pull request #1080 from matrix-org/dbkr/fix_notifications_api_with_fromDavid Baker2016-09-081-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix /notifications API when used with `from` param
| * | | | | Fix /notifications API when used with `from` paramDavid Baker2016-09-081-1/+1
| | | | | |
* | | | | | Merge pull request #1085 from matrix-org/erikj/reindex_state_groupsErik Johnston2016-09-083-2/+57
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Reindex state_groups_state after pruning
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-09-083-24/+63
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | erikj/reindex_state_groups
* | | | | | Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcardMark Haines2016-09-081-18/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support wildcard device_ids for direct to device messages
| * | | | | | Support wildcard device_ids for direct to device messagesMark Haines2016-09-081-18/+36
| | | | | | |
* | | | | | | Merge pull request #1082 from matrix-org/erikj/remote_public_roomsErik Johnston2016-09-082-6/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add server param to /publicRooms
| * | | | | | | Use parse_stringErik Johnston2016-09-081-2/+2
| | | | | | | |
| * | | | | | | Add server param to /publicRoomsErik Johnston2016-09-082-5/+26
| | | | | | | |
| | | * | | | | Add delta fileErik Johnston2016-09-081-0/+20
| | | | | | | |
| | | * | | | | Reindex state_groups_state after pruningErik Johnston2016-09-082-2/+37
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-09-082-1/+38
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'release-v0.17.2' of github.com:matrix-org/synapse v0.17.2Erik Johnston2016-09-0860-673/+1836
| |\ \ \ \ \ \
| | * | | | | | Bump version and changelogErik Johnston2016-09-082-1/+10
| | | | | | | |
| | * | | | | | Mention get_pdu bug v0.17.2-rc1Erik Johnston2016-09-051-0/+2
| | | | | | | |
| | * | | | | | TypoErik Johnston2016-09-051-1/+1
| | | | | | | |
| | * | | | | | Bump changelog and versionErik Johnston2016-09-052-1/+27
| | | | | | | |
* | | | | | | | Merge pull request #1083 from matrix-org/erikj/check_originErik Johnston2016-09-082-1/+15
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Check the user_id for presence/typing matches origin
| * | | | | | | Check the user_id for presence/typing matches originErik Johnston2016-09-082-1/+15
|/ / / / / / /
* | | | | | | Merge pull request #1074 from matrix-org/markjh/direct_to_device_federationMark Haines2016-09-0811-71/+456
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Send device messages over federation
| * \ \ \ \ \ \ Merge branch 'develop' into markjh/direct_to_device_federationMark Haines2016-09-0813-132/+542
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add a new method to enqueue the device messages rather than sending a dummy EDUMark Haines2016-09-073-7/+20
| | | | | | | |
| * | | | | | | Fix the stream change cache to work over replicationMark Haines2016-09-072-1/+12
| | | | | | | |
| * | | | | | | Move the check for federated device_messages.Mark Haines2016-09-071-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the check into _attempt_new_transaction. Only delete messages if there were messages to delete.
| * | | | | | | Add stream change caches for device messagesMark Haines2016-09-073-1/+53
| | | | | | | |
| * | | | | | | Comment the add_messages storage functionsMark Haines2016-09-071-8/+16
| | | | | | | |
| * | | | | | | Fix unit testsMark Haines2016-09-061-0/+8
| | | | | | | |
| * | | | | | | Send device messages over federationMark Haines2016-09-067-48/+179
| | | | | | | |
| * | | | | | | Add storage methods for federated device messagesMark Haines2016-09-061-7/+132
| | | | | | | |
| * | | | | | | Add tables for federated device messagesMark Haines2016-09-061-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tables for storing the messages that need to be sent to a remote device and for deduplicating messages received.
| * | | | | | | Move _add_messages_to_device_inbox_txn into a separate methodMark Haines2016-09-061-37/+32
| | |/ / / / / | |/| | | | |
| | | | | | * Add index to event_push_actionsDavid Baker2016-09-092-1/+21
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove room_id caluse so it uses it Mostly from @negativemjark
| | | | | * Implement `only=highlight` on `/notifications`David Baker2016-09-082-2/+10
| |_|_|_|/ |/| | | |
* | | | | Log delta files we're applyingErik Johnston2016-09-081-2/+2
| |_|/ / |/| | |
* | | | Merge pull request #1079 from matrix-org/erikj/state_seqscanErik Johnston2016-09-081-0/+4
|\ \ \ \ | |_|_|/ |/| | | Temporarily disable sequential scans for state fetching
| * | | Temporarily disable sequential scans for state fetchingErik Johnston2016-09-081-0/+4
|/ / /
* | | Merge pull request #1077 from matrix-org/markjh/device_loggingMark Haines2016-09-071-2/+6
|\ \ \ | | | | | | | | Log the types and values when failing to store devices
| * | | Log the types and values when failing to store devicesMark Haines2016-09-071-2/+6
| |/ /
* | | Merge pull request #1076 from matrix-org/erikj/state_storageErik Johnston2016-09-071-5/+10
|\ \ \ | | | | | | | | Use windowing function to make use of index
| * | | CommentErik Johnston2016-09-071-0/+4
| | | |
| * | | Add appopriate framing clauseErik Johnston2016-09-071-0/+1
| | | |
| * | | Use windowing function to make use of indexErik Johnston2016-09-071-5/+5
|/ / /
* | | Merge pull request #1065 from matrix-org/erikj/state_storageErik Johnston2016-09-078-73/+482
|\ \ \ | | | | | | | | Move to storing state_groups_state as deltas
| * | | Scale the batch size so that we're not bitten by the minimumErik Johnston2016-09-051-1/+5
| | | |
| * | | Correctly handle reindexing state groups that already have an edgeErik Johnston2016-09-051-0/+19
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storageErik Johnston2016-09-055-60/+35
| |\ \ \
| * | | | Take value in a better wayErik Johnston2016-09-052-3/+3
| | | | |
| * | | | Comment about sqlite and WITH RECURSIVEErik Johnston2016-09-051-0/+4
| | | | |
| * | | | Correctly delete old state groups in purge history APIErik Johnston2016-09-052-20/+80
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storageErik Johnston2016-09-053-4/+12
| |\ \ \ \
| * | | | | Add commentsErik Johnston2016-09-052-41/+43
| | | | | |
| * | | | | Add upgrade script that will slowly prune state_groups_state entriesErik Johnston2016-09-053-75/+223
| | | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storageErik Johnston2016-09-026-15/+59
| |\ \ \ \ \