summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos and reinheritErik Johnston2017-08-251-12/+6
|
* Split out profile handler to fix testsErik Johnston2017-08-2511-29/+35
|
* Add remote profile cacheErik Johnston2017-08-255-5/+237
|
* Add _simple_updateErik Johnston2017-08-251-19/+32
|
* Merge pull request #2410 from matrix-org/erikj/groups_publiciseErik Johnston2017-08-216-0/+197
|\ | | | | Add ability to publicise group membership
| * Use BOOLEAN rather than TEXT typeErik Johnston2017-08-211-1/+1
| |
| * FixupErik Johnston2017-08-112-9/+14
| |
| * Add bulk group publicised lookup APIErik Johnston2017-08-095-0/+142
| |
| * Allow update group publicityErik Johnston2017-08-082-0/+43
| |
| * Store whether the user wants to publicise their membership of a groupErik Johnston2017-08-083-0/+7
| |
* | Merge pull request #2426 from matrix-org/erikj/groups_fix_syncErik Johnston2017-08-211-1/+7
|\ \ | |/ |/| Groups: Fix mising json.load in initial sync
| * Groups: Fix mising json.load in initial syncErik Johnston2017-08-211-1/+7
|/
* Remove stale TODO commentsErik Johnston2017-08-041-10/+0
|
* Merge pull request #2382 from matrix-org/erikj/group_privilegeErik Johnston2017-07-242-1/+85
|\ | | | | Include users membership in group in summary API
| * Update commentErik Johnston2017-07-241-2/+2
| |
| * Use join rather than joined, etc.Erik Johnston2017-07-241-2/+2
| |
| * Fix all the typosErik Johnston2017-07-241-8/+7
| |
| * Include users membership in group in summary APIErik Johnston2017-07-242-0/+60
| |
| * Check users/rooms are in group before adding to summaryErik Johnston2017-07-241-0/+25
|/
* Correctly add joins to correct segmentErik Johnston2017-07-241-1/+1
|
* Merge pull request #2378 from matrix-org/erikj/group_sync_supportErik Johnston2017-07-2112-12/+283
|\ | | | | Add groups to sync stream
| * Add notifierErik Johnston2017-07-201-0/+1
| |
| * Fix replication. And notifyErik Johnston2017-07-205-4/+119
| |
| * Remember to cast to boolErik Johnston2017-07-201-1/+1
| |
| * Fix bug in generating current tokenErik Johnston2017-07-201-0/+2
| |
| * Add groups to sync streamErik Johnston2017-07-208-8/+161
| |
* | Merge pull request #2377 from matrix-org/erikj/group_profile_updateErik Johnston2017-07-205-0/+55
|\ \ | |/ |/| Add update group profile API
| * Remove spurious content paramErik Johnston2017-07-201-1/+1
| |
| * Check values are stringsErik Johnston2017-07-201-1/+4
| |
| * Fix a storage descErik Johnston2017-07-201-1/+1
| |
| * Add update group profile APIErik Johnston2017-07-205-0/+52
| |
* | Merge pull request #2374 from matrix-org/erikj/group_server_localErik Johnston2017-07-2011-34/+1457
|\ \ | | | | | | Add local group server support
| * | Fix typoErik Johnston2017-07-201-1/+1
| |/
| * CommentsErik Johnston2017-07-184-13/+24
| |
| * CommentsErik Johnston2017-07-182-103/+88
| |
| * Fix permissionsErik Johnston2017-07-181-2/+6
| |
| * Add DELETEErik Johnston2017-07-181-0/+46
| |
| * Add 'args' param to post_jsonErik Johnston2017-07-181-9/+15
| |
| * Fix typosErik Johnston2017-07-183-12/+22
| |
| * Correctly parse query paramsErik Johnston2017-07-181-19/+19
| |
| * Update federation client pokesErik Johnston2017-07-181-13/+22
| |
| * Add client apisErik Johnston2017-07-182-10/+188
| |
| * CommentsErik Johnston2017-07-182-15/+22
| |
| * Use transport client directlyErik Johnston2017-07-181-18/+25
| |
| * CommentErik Johnston2017-07-181-0/+14
| |
| * Remove sync stuffErik Johnston2017-07-182-29/+1
| |
| * Add GroupID typeErik Johnston2017-07-181-0/+5
| |
| * Remove unused tablesErik Johnston2017-07-181-7/+0
| |
| * Remove sync stuffErik Johnston2017-07-182-70/+0
| |
| * Add local group server supportErik Johnston2017-07-1710-2/+1248
|/
* Merge pull request #2363 from matrix-org/erikj/group_server_summaryErik Johnston2017-07-174-22/+1131
|\ | | | | Add group summary APIs
| * Ensure category and role ids are non-nullErik Johnston2017-07-141-0/+24
| |
| * Add DEFAULT_ROLE_IDErik Johnston2017-07-141-4/+5
| |
| * Correctly increment ordersErik Johnston2017-07-141-2/+2
| |
| * Remove unused functionsErik Johnston2017-07-131-152/+0
| |
| * CommentsErik Johnston2017-07-132-12/+32
| |
| * Remove TODOErik Johnston2017-07-131-1/+0
| |
| * Add summary APIs to federationErik Johnston2017-07-131-11/+223
| |
| * raise NotImplementedErrorErik Johnston2017-07-131-5/+2
| |
| * CommentsErik Johnston2017-07-123-5/+79
| |
| * Simplify checking if adminErik Johnston2017-07-121-53/+19
| |
| * Add group summary APIsErik Johnston2017-07-124-2/+970
|/
* Merge pull request #2352 from matrix-org/erikj/group_server_splitErik Johnston2017-07-1211-11/+1206
|\ | | | | Initial Group Server
| * CommentErik Johnston2017-07-121-1/+1
| |
| * Move commentErik Johnston2017-07-111-2/+2
| |
| * Add federation API for adding room to groupErik Johnston2017-07-111-0/+18
| |
| * CommentErik Johnston2017-07-111-5/+8
| |
| * TypoErik Johnston2017-07-111-1/+1
| |
| * Rename column to attestation_jsonErik Johnston2017-07-112-5/+5
| |
| * CommentsErik Johnston2017-07-113-5/+9
| |
| * CommentErik Johnston2017-07-112-0/+26
| |
| * Remove u/ requirementErik Johnston2017-07-111-2/+3
| |
| * Lift out visibility parsingErik Johnston2017-07-111-20/+21
| |
| * CommentsErik Johnston2017-07-114-43/+132
| |
| * Initial group server implementationErik Johnston2017-07-1011-11/+1064
| |
* | Merge pull request #2354 from krombel/reduce_static_sync_replyErik Johnston2017-07-111-16/+25
|\ \ | | | | | | encode sync-response statically
| * | split out reducing stuff; just make encode_* staticKrombel2017-07-111-35/+27
| | |
| * | fix testKrombel2017-07-101-1/+3
| | |
| * | encode sync-response statically; omit empty objects from sync-responseKrombel2017-07-101-33/+48
| | |
* | | Merge pull request #2357 from matrix-org/erikj/pushErik Johnston2017-07-111-1/+1
|\ \ \ | | | | | | | | Don't compute push actions for backfilled events
| * | | Don't compute push actions for backfilled eventsErik Johnston2017-07-111-1/+1
| | |/ | |/|
* / | Reduce log levels in tcp replicationErik Johnston2017-07-111-2/+2
|/ /
* | Include registration and as stores in frontend proxyErik Johnston2017-07-071-0/+4
| |
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-072-1/+10
|\ \
| * \ Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse v0.22.1Erik Johnston2017-07-065-11/+21
| |\ \
| | * | Bump version and changelogErik Johnston2017-07-062-1/+10
| | | |
* | | | Merge pull request #2344 from matrix-org/erikj/frontend_proxyErik Johnston2017-07-072-0/+269
|\ \ \ \ | | | | | | | | | | Add a frontend proxy
| * | | | Add a frontend proxyErik Johnston2017-07-072-0/+269
|/ / / /
* | | | Merge pull request #2343 from matrix-org/erikj/fastpushErik Johnston2017-07-073-36/+21
|\ \ \ \ | |_|_|/ |/| | | Perf: Don't filter events for push
| * | | Perf: Don't filter events for pushErik Johnston2017-07-073-36/+21
|/ / / | | | | | | | | | | | | We know the users are joined and we can explicitly check for if they are ignoring the user, so lets do that.
* | | Merge pull request #2342 from matrix-org/erikj/pusher_pool_instantiateErik Johnston2017-07-063-10/+11
|\ \ \ | | |/ | |/| Fix bug where pusherpool didn't start and broke some rooms
| * | Fix bug where pusherpool didn't start and broke some roomsErik Johnston2017-07-063-10/+11
| |/ | | | | | | | | | | | | | | Since we didn't instansiate the PusherPool at start time it could fail at run time, which it did for some users. This may or may not fix things for those users, but it should happen at start time and stop the server from starting.
* | Merge pull request #2309 from matrix-org/erikj/user_ip_replErik Johnston2017-07-066-17/+18
|\ \ | | | | | | Fix up user_ip replication commands
| * | Serialize user ip command as jsonErik Johnston2017-06-271-5/+9
| | |
| * | Fix upErik Johnston2017-06-275-12/+9
| | |
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-062-1/+23
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0Erik Johnston2017-07-0691-488/+3929
| |\ \
| | * | Bump version and changelog github/release-v0.22.0 release-v0.22.0Erik Johnston2017-07-062-1/+7
| | | |
| | * | Bump version and changelog v0.22.0-rc2Erik Johnston2017-07-042-1/+17
| | | |
* | | | Merge pull request #2334 from matrix-org/erikj/refactor_transport_serverErik Johnston2017-07-051-8/+16
|\ \ \ \ | | | | | | | | | | Separate federation servlet into different lists
| * | | | Separate federation servlet into different listsErik Johnston2017-07-051-8/+16
| | |/ / | |/| |
* | | | Merge pull request #2332 from matrix-org/rav/fix_pushesRichard van der Hoff2017-07-051-1/+3
|\ \ \ \ | |/ / / |/| | | Fix caching error in the push evaluator
| * | | Fix caching error in the push evaluatorRichard van der Hoff2017-07-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialising `result` to `{}` in the parameters meant that every call to _flatten_dict used the *same* target dictionary. I'm hopeful this will fix https://github.com/matrix-org/synapse/issues/2270, but I suspect it won't. (This code seems to have been here since forever, unlike the bug, and I don't really think it explains the observed behaviour). Still, it makes it hard to investigate the problem.
* | | | Merge pull request #2330 from matrix-org/erikj/cache_size_factorErik Johnston2017-07-048-30/+12
|\ \ \ \ | | | | | | | | | | Increase default cache size
| * | | | Update testErik Johnston2017-07-041-1/+1
| | | | |
| * | | | Update READMEErik Johnston2017-07-041-7/+4
| | | | |
| * | | | Increase default cache factor size.Erik Johnston2017-07-041-1/+1
| | | | |
| * | | | Define CACHE_SIZE_FACTOR onceErik Johnston2017-07-045-21/+6
| | | | |
* | | | | Merge pull request #2323 from matrix-org/markjh/invite_checksMark Haines2017-07-041-2/+17
|\ \ \ \ \ | |/ / / / |/| | | | Improve the error handling for bad invites received over federation
| * | | | Improve the error handling for bad invites received over federationMark Haines2017-06-301-2/+17
|/ / / /
* | | | Merge pull request #2321 from matrix-org/erikj/prefill_forwardErik Johnston2017-06-302-2/+13
|\ \ \ \ | | | | | | | | | | Prefill forward extrems and event to state groups
| * | | | Make into listErik Johnston2017-06-291-1/+1
| | | | |
| * | | | Prefill forward extrems and event to state groupsErik Johnston2017-06-292-2/+13
|/ / / /
* | | | Merge pull request #2320 from matrix-org/erikj/cache_macaroon_parseErik Johnston2017-06-291-13/+60
|\ \ \ \ | | | | | | | | | | Cache macaroon parse and validation
| * | | | Cache macaroon parse and validationErik Johnston2017-06-291-13/+60
|/ / / / | | | | | | | | | | | | | | | | | | | | Turns out this can be quite expensive for requests, and is easily cachable. We don't cache the lookup to the DB so invalidation still works.
* | | | Merge pull request #2319 from matrix-org/erikj/prune_sessionsErik Johnston2017-06-292-11/+13
|\ \ \ \ | | | | | | | | | | Use an ExpiringCache for storing registration sessions
| * | | | Use an ExpiringCache for storing registration sessionsErik Johnston2017-06-292-11/+13
|/ / / / | | | | | | | | | | | | | | | | This is because pruning them was a significant performance drain on matrix.org
* | | | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into developErik Johnston2017-06-272-1/+35
|\ \ \ \
| * | | | Update version and changelog v0.22.0-rc1Erik Johnston2017-06-262-1/+35
| | | | |
* | | | | Merge pull request #2308 from matrix-org/erikj/user_ip_replErik Johnston2017-06-279-8/+111
|\ \ \ \ \ | | |_|_|/ | |/| | | Make workers report to master for user ip updates
| * | | | Make workers report to master for user ip updatesErik Johnston2017-06-279-8/+111
| | | | |
* | | | | Merge pull request #2307 from matrix-org/erikj/user_ip_batchErik Johnston2017-06-275-48/+101
|\| | | | | | | | | | | | | | Batch upsert user ips
| * | | | Fix up client ips to read from pending dataErik Johnston2017-06-274-27/+62
| | | | |
| * | | | Batch upsert user ipsErik Johnston2017-06-272-21/+39
| |/ / /
* | | | Merge pull request #2290 from matrix-org/erikj/ensure_round_tripErik Johnston2017-06-261-0/+9
|\ \ \ \ | |/ / / |/| | | Reject local events that don't round trip the DB
| * | | Remove unused variablesErik Johnston2017-06-261-1/+1
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2017-06-2626-58/+535
| |\ \ \ | | | | | | | | | | | | | | | erikj/ensure_round_trip
| * | | | Reject local events that don't round trip the DBErik Johnston2017-06-191-0/+9
| | | | |
* | | | | Merge pull request #2304 from matrix-org/erikj/users_share_fixErik Johnston2017-06-261-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Fix up indices for users_who_share_rooms
| * | | | Fix up indices for users_who_share_roomsErik Johnston2017-06-261-1/+2
|/ / / /
* | | | Merge pull request #2301 from xwiki-labs/push-redact-contentErik Johnston2017-06-243-2/+48
|\ \ \ \ | | | | | | | | | | Add configuration parameter to allow redaction of content from push m…
| * | | | Change the config file generator to more descriptive explanation of ↵Caleb James DeLisle2017-06-241-3/+11
| | | | | | | | | | | | | | | | | | | | push.redact_content
| * | | | Fix TravisCI tests for PR #2301 - Fat finger mistakeCaleb James DeLisle2017-06-231-0/+0
| | | | |
| * | | | Fix TravisCI tests for PR #2301Caleb James DeLisle2017-06-233-5/+2
| | | | |
| * | | | Add configuration parameter to allow redaction of content from push messages ↵Caleb James DeLisle2017-06-233-2/+43
| | | | | | | | | | | | | | | | | | | | for google/apple devices
* | | | | Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloadsErik Johnston2017-06-237-20/+94
|\ \ \ \ \ | |/ / / / |/| | | | Store URL cache preview downloads separately
| * | | | Store URL cache preview downloads seperatelyErik Johnston2017-06-237-20/+94
|/ / / / | | | | | | | | | | | | This makes it easier to clear old media out at a later date
* | | | Merge pull request #2297 from matrix-org/erikj/user_dir_fixErik Johnston2017-06-221-7/+10
|\ \ \ \ | | | | | | | | | | Fix thinko in initial public room user spam
| * | | | Make some more params configurableErik Johnston2017-06-221-5/+8
| | | | |
| * | | | Typo. ARGH.Erik Johnston2017-06-221-1/+1
| | | | |
| * | | | Fix thinko in unhandled user spamErik Johnston2017-06-221-2/+2
|/ / / /
* | | | Merge branch 'master' into developMatthew Hodgson2017-06-222-1/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #2282 from matrix-org/release-v0.21.1 v0.21.1Erik Johnston2017-06-157-218/+97
| |\ \ \ | | | | | | | | | | Release v0.21.1
| | * | | Bump version and changelogErik Johnston2017-06-152-1/+9
| | | | |
* | | | | Add descErik Johnston2017-06-221-0/+1
| | | | |
* | | | | Merge pull request #2296 from matrix-org/erikj/dont_appserver_sharErik Johnston2017-06-214-18/+37
|\ \ \ \ \ | | | | | | | | | | | | Don't work out users who share room with appservice users
| * | | | | Initialise exclusive_user_regexErik Johnston2017-06-212-15/+22
| | | | | |
| * | | | | Fix for workersErik Johnston2017-06-212-1/+4
| | | | | |
| * | | | | Don't work out users who share room with appservice usersErik Johnston2017-06-211-2/+11
| | | | | |
* | | | | | Merge pull request #2219 from krombel/avoid_duplicate_filtersErik Johnston2017-06-211-1/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | only add new filter when not existent prevoisly
| * | | | | Merge branch 'develop' into avoid_duplicate_filtersKrombel2017-06-2175-593/+3545
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #2292 from matrix-org/erikj/quarantine_mediaErik Johnston2017-06-197-5/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add API to quarantine media
| * | | | | | Handle thumbnail urlsErik Johnston2017-06-191-12/+14
| | | | | | |
| * | | | | | Add API to quarantine mediaErik Johnston2017-06-197-5/+119
| | | | | | |
* | | | | | | Merge pull request #2291 from matrix-org/erikj/shutdown_roomErik Johnston2017-06-197-5/+205
|\| | | | | | | |_|_|_|/ / |/| | | | | Add shutdown room API
| * | | | | Handle all cases of sending membership eventsErik Johnston2017-06-191-0/+5
| | | | | |
| * | | | | Remove unused importErik Johnston2017-06-191-1/+1
| | | | | |
| * | | | | Change to create new room and join other usersErik Johnston2017-06-192-10/+70
| | | | | |
| * | | | | Forget roomErik Johnston2017-06-191-0/+2
| | | | | |
| * | | | | Add shutdown room APIErik Johnston2017-06-196-1/+134
|/ / / / /
* | | | | add missing boolean to synapse_port_dbMatthew2017-06-161-0/+1
| | | | |
* | | | | fix synapse_port scriptMatthew2017-06-161-1/+1
| | | | |
* | | | | Merge pull request #2286 from matrix-org/erikj/split_out_user_dirErik Johnston2017-06-166-7/+328
|\ \ \ \ \ | | | | | | | | | | | | Split out user directory to a separate process
| * | | | | Initial worker implErik Johnston2017-06-166-7/+328
| | | | | |
* | | | | | Merge pull request #2280 from matrix-org/erikj/share_room_user_dirErik Johnston2017-06-165-60/+508
|\| | | | | | | | | | | | | | | | | Include users who you share a room with in user directory
| * | | | | Include users who share room with requester in user directoryErik Johnston2017-06-153-26/+47
| | | | | |
| * | | | | Implement updating users who share rooms on the flyErik Johnston2017-06-152-24/+235
| | | | | |
| * | | | | Implement initial population of users who share rooms tableErik Johnston2017-06-152-9/+193
| | | | | |
| * | | | | Add DB schema for tracking users who share roomsErik Johnston2017-06-152-1/+33
| | | | | |
* | | | | | Merge pull request #2285 from krombel/allow_authorization_headerErik Johnston2017-06-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | allow Authorization header
| * | | | | | allow Authorization header which handling got implemented in #1098Krombel2017-06-161-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Kesler <krombel@krombel.de>
* | | | | | Merge pull request #2281 from matrix-org/erikj/phone_home_statsErik Johnston2017-06-155-217/+88
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | Fix phone home stats
| * | | | | TypoErik Johnston2017-06-151-1/+3
| | | | | |
| * | | | | Add some more statsErik Johnston2017-06-153-0/+35
| | | | | |
| * | | | | Remove unhelpful testErik Johnston2017-06-151-115/+0
| | | | | |
| * | | | | Fix phone home statsErik Johnston2017-06-143-107/+56
| | |_|/ / | |/| | |
* | | | | add notes on running out of FDsMatthew Hodgson2017-06-141-0/+24
| |/ / / |/| | |
* | | | Merge pull request #2279 from matrix-org/erikj/fix_user_dirErik Johnston2017-06-132-4/+9
|\ \ \ \ | | | | | | | | | | Fix user directory insertion due to missing room_id
| * | | | Fix user directory insertion due to missing room_idErik Johnston2017-06-132-4/+9
| | | | |
* | | | | Merge pull request #2278 from matrix-org/erikj/fix_user_dirErik Johnston2017-06-131-24/+41
|\| | | | | | | | | | | | | | Fix user dir to not assume existence of user
| * | | | Fix up sqlErik Johnston2017-06-131-10/+12
| | | | |
| * | | | Fix user dir to not assume existence of userErik Johnston2017-06-131-22/+37
|/ / / /
* | | | Merge pull request #2274 from matrix-org/erikj/cache_is_host_joinedErik Johnston2017-06-133-2/+7
|\ \ \ \ | | | | | | | | | | Add cache for is_host_joined
| * | | | Add cache for is_host_joinedErik Johnston2017-06-133-2/+7
| | | | |
* | | | | Merge pull request #2275 from matrix-org/erikj/tweark_user_directory_searchErik Johnston2017-06-131-13/+40
|\ \ \ \ \ | | | | | | | | | | | | Tweak the ranking of PG user dir search
| * | | | | Tweak the ranking of PG user dir searchErik Johnston2017-06-131-13/+40
| |/ / / /
* | | | | Merge pull request #2276 from matrix-org/erikj/fix_user_diErik Johnston2017-06-131-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Don't assume existence of events when updating user directory
| * | | | | Don't assume existance of events when updating user directoryErik Johnston2017-06-131-3/+6
| |/ / / /
* | | | | Merge pull request #2277 from matrix-org/erikj/mediaErik Johnston2017-06-131-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Throw exception when not retrying when downloading media
| * | | | Throw exception when not retrying when downloading mediaErik Johnston2017-06-131-0/+1
|/ / / /
* | | | Merge pull request #2266 from matrix-org/erikj/host_in_roomErik Johnston2017-06-125-55/+31
|\ \ \ \ | | | | | | | | | | Change is_host_joined to use current_state table
| * | | | Tweak SQLErik Johnston2017-06-091-3/+6
| | | | |
| * | | | Fix replicationErik Johnston2017-06-091-1/+0
| | | | |
| * | | | Change is_host_joined to use current_state tableErik Johnston2017-06-094-54/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bypasses a bug where using the state groups to figure out if a host is in a room sometimes errors if the servers isn't in the room. (For example when the server rejected an invite to a remote room)
* | | | | Merge pull request #2269 from matrix-org/erikj/cache_state_deltaErik Johnston2017-06-092-4/+16
|\ \ \ \ \ | | | | | | | | | | | | Cache state deltas
| * | | | | Fix replicationErik Johnston2017-06-092-2/+2
| | | | | |
| * | | | | CommentsErik Johnston2017-06-091-0/+3
| | | | | |
| * | | | | Cache state deltasErik Johnston2017-06-091-3/+12
|/ / / / /
* | | | | Merge pull request #2268 from matrix-org/erikj/entity_has_changedErik Johnston2017-06-091-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix has_any_entity_changed
| * | | | | Rewrite conditionalErik Johnston2017-06-091-1/+1
| | | | | |
| * | | | | Fix has_any_entity_changedErik Johnston2017-06-091-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occaisonally has_any_entity_changed would throw the error: "Set changed size during iteration" when taking the max of the `sorteddict`. While its uncertain how that happens, its quite inefficient to iterate over the entire dict anyway so we change to using the more traditional `bisect_*` functions.
* | | | | Merge pull request #2267 from matrix-org/erikj/missing_notifierErik Johnston2017-06-091-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix removing of pushers when using workers
| * | | | | Add missing notifierErik Johnston2017-06-091-1/+2
| |/ / / /
* | | | | Merge pull request #2265 from matrix-org/erikj/remote_leave_outlierErik Johnston2017-06-091-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | Mark remote invite rejections as outliers
| * | | | CommentErik Johnston2017-06-091-0/+2
| | | | |
| * | | | Mark remote invite rejections as outliersErik Johnston2017-06-091-0/+1
|/ / / /
* | | | Merge pull request #2263 from matrix-org/erikj/fix_state_woesErik Johnston2017-06-082-7/+19
|\ \ \ \ | | | | | | | | | | Ensure we don't use unpersisted state group as prev group
| * | | | Ensure we don't use unpersisted state group as prev groupErik Johnston2017-06-082-7/+19
|/ / / /
* | | | Merge pull request #2259 from matrix-org/erikj/fix_state_woesErik Johnston2017-06-073-10/+24
|\ \ \ \ | | | | | | | | | | Fix bug where state_group tables got corrupted
| * | | | Fix bug where state_group tables got corruptedErik Johnston2017-06-073-10/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to the fact that we prefilled caches using txn.call_after, which always gets called including on error. We fix this by making txn.call_after only fire when a transaction completes successfully, which is what we want most of the time anyway.
* | | | Merge pull request #2258 from matrix-org/erikj/user_dirErik Johnston2017-06-072-3/+3
|\ \ \ \ | | | | | | | | | | Don't start user_directory handling on workers
| * | | | Don't start user_directory handling on workersErik Johnston2017-06-072-3/+3
| | | | |
* | | | | Merge pull request #2248 from matrix-org/erikj/state_fixupErik Johnston2017-06-077-56/+156
|\ \ \ \ \ | |/ / / / |/| | | | Faster cache for get_joined_hosts
| * | | | CommentsErik Johnston2017-06-072-0/+15
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixupErik Johnston2017-06-0716-12/+1175
| |\ \ \ \
| * | | | | Remove spurious log linesErik Johnston2017-06-073-4/+0
| | | | | |
| * | | | | Handle None state group correctlyErik Johnston2017-05-262-4/+7
| | | | | |
| * | | | | Fix typing testsErik Johnston2017-05-262-7/+7
| | | | | |
| * | | | | Faster cache for get_joined_hostsErik Johnston2017-05-255-29/+117
| | | | | |
| * | | | | Don't return weird prev_groupErik Johnston2017-05-251-8/+13
| | | | | |
| * | | | | Remove unused optionsErik Johnston2017-05-251-11/+4
| | | | | |
* | | | | | Add some logging to user directoryErik Johnston2017-06-071-0/+7
| | | | | |
* | | | | | Merge pull request #2256 from matrix-org/erikj/faster_device_updatesErik Johnston2017-06-072-13/+65
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Split up device_lists_outbound_pokes table for faster updates.
| * | | | | When pruning, delete from device_lists_outbound_last_successErik Johnston2017-06-071-0/+8
| | | | | |
| * | | | | Keep pruning background taskErik Johnston2017-06-071-0/+45
| | | | | |
| * | | | | Split up device_lists_outbound_pokes table for faster updates.Erik Johnston2017-06-072-58/+57
|/ / / / /
* | | | / Increase size of IP cacheErik Johnston2017-06-071-1/+6
| |_|_|/ |/| | |
* | | | Fix typo when getting app nameErik Johnston2017-06-061-1/+1
| | | |
* | | | Fix wrong number of argumentsErik Johnston2017-06-061-1/+1
| | | |
* | | | Merge pull request #2253 from matrix-org/erikj/user_dirErik Johnston2017-06-012-0/+74
|\ \ \ \ | | | | | | | | | | Handle profile updates in user directory
| * | | | Handle profile updates in user directoryErik Johnston2017-06-012-0/+74
| | | | |
* | | | | Merge pull request #2252 from matrix-org/erikj/user_dirErik Johnston2017-06-0113-1/+1043
|\| | | | | | | | | | | | | | Add a user directory
| * | | | Fix sqliteErik Johnston2017-06-011-1/+1
| | | | |
| * | | | Split the table in twoErik Johnston2017-06-014-31/+138
| | | | |
| * | | | Tweak search queryErik Johnston2017-06-011-1/+1
| | | | |
| * | | | Tweak search queryErik Johnston2017-06-011-2/+2
| | | | |
| * | | | CommentsErik Johnston2017-06-011-3/+3
| | | | |
| * | | | Check if host is still in roomErik Johnston2017-06-011-0/+11
| | | | |
| * | | | Remove spurious inlineCallbacksErik Johnston2017-06-011-1/+0
| | | | |
| * | | | Fix removing usersErik Johnston2017-06-011-0/+5
| | | | |
| * | | | Bug fixes and loggingErik Johnston2017-06-012-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | - Check if room is public when a user joins before adding to user dir - Fix typo of field name "content.join_rules" -> "content.join_rule"
| * | | | Order by if they have profile infoErik Johnston2017-06-011-2/+11
| | | | |
| * | | | Use prefix matchingErik Johnston2017-06-011-5/+29
| | | | |
| * | | | Comment on why arbitrary commentsErik Johnston2017-05-311-2/+6
| | | | |
| * | | | Use unique indicesErik Johnston2017-05-311-2/+2
| | | | |
| * | | | Comment briefly on how we keep user_directory up to dateErik Johnston2017-05-311-0/+10
| | | | |
| * | | | Convert to intErik Johnston2017-05-311-0/+1
| | | | |
| * | | | Lifts things into separate functionErik Johnston2017-05-311-56/+54
| | | | |
| * | | | TyposErik Johnston2017-05-311-8/+8
| | | | |
| * | | | Fix testsErik Johnston2017-05-312-2/+3
| | | | |