summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix wordsErik Johnston2019-05-211-3/+3
* Block attempts to annotate the same event twiceErik Johnston2019-05-202-4/+60
* Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)"Richard van der Hoff2019-05-201-2/+0
* Add a test room version which updates event ID format (#5210)Richard van der Hoff2019-05-202-3/+33
* Rename relation types to match MSCErik Johnston2019-05-203-9/+9
* Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-2012-16/+899
|\
| * Correctly update aggregation counts after redactionErik Johnston2019-05-202-0/+20
| * Fixup bsaed on review commentsErik Johnston2019-05-173-19/+19
| * Add basic editing supportErik Johnston2019-05-163-6/+85
| * Move parsing of tokens out of storage layerErik Johnston2019-05-162-14/+21
| * Indirect tuple conversionErik Johnston2019-05-161-0/+6
| * Check that event is visible in new APIsErik Johnston2019-05-161-2/+15
| * Fix relations in worker modeErik Johnston2019-05-165-13/+28
| * Add cache to relationsErik Johnston2019-05-161-0/+8
| * Add aggregations APIErik Johnston2019-05-164-10/+395
| * Actually check for None rather falseyErik Johnston2019-05-151-2/+2
| * Actually implement idempotencyErik Johnston2019-05-151-1/+8
| * Add simple pagination APIErik Johnston2019-05-152-0/+130
| * Add simple send_relation API and track in DBErik Johnston2019-05-157-0/+213
* | Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-202-1/+13
* | fix mapping of return values for get_or_register_3pid_guest (#5177)bytepoets-blo2019-05-171-1/+1
* | Merge pull request #5191 from matrix-org/erikj/refactor_pagination_boundsErik Johnston2019-05-171-61/+133
|\ \
| * | Spelling and clarificationsErik Johnston2019-05-171-5/+9
| * | Update docstringErik Johnston2019-05-161-1/+12
| |/
| * Make generating SQL bounds for pagination genericErik Johnston2019-05-151-61/+118
* | expose SlavedProfileStore to ClientReaderSlavedStore (#5200)Neil Johnson2019-05-171-0/+2
* | Merge pull request #5196 from matrix-org/babolivier/per_room_profilesBrendan Abolivier2019-05-172-0/+20
|\ \
| * | Add option to disable per-room profilesBrendan Abolivier2019-05-162-0/+20
* | | Fix image orientation when generating thumbnail (#5039)PauRE2019-05-163-1/+45
* | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-5/+17
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec...David Baker2019-05-131-1/+0
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec...David Baker2019-05-132-20/+35
| |\ \ \
| * | | | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| * | | | CommentDavid Baker2019-05-101-0/+4
| * | | | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* | | | | Make /sync attempt to return device updates for both joined and invited users...Matthew Hodgson2019-05-161-19/+25
* | | | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_...David Baker2019-05-161-18/+22
|\ \ \ \ \
| * | | | | Only check 3pids not in use when registeringDavid Baker2019-05-141-18/+22
* | | | | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-155-91/+104
* | | | | | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-157-26/+20
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-05-151-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 0.99.4Richard van der Hoff2019-05-151-1/+1
* | | | | | Merge pull request #5183 from matrix-org/erikj/async_serialize_eventErik Johnston2019-05-1512-101/+193
|\ \ \ \ \ \
| * | | | | | Update docstring with correct return typeErik Johnston2019-05-151-1/+1
| * | | | | | NewsfileErik Johnston2019-05-141-6/+6
| * | | | | | Allow client event serialization to be asyncErik Johnston2019-05-1412-95/+187
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_arrayErik Johnston2019-05-155-29/+53
|\ \ \ \ \ \
| * | | | | | Update docstring with correct typeErik Johnston2019-05-151-1/+1
| * | | | | | Expose DataStore._get_events as get_events_as_listErik Johnston2019-05-145-29/+53
| |/ / / / /
* / / / / / comment about user_joined_roomRichard van der Hoff2019-05-141-0/+1
|/ / / / /
* | | | | Migrate all tests to use the dict-based config format instead of hanging item...Amber Brown2019-05-131-0/+1
* | | | | Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-133-14/+78
|/ / / /
* | | / 0.99.4rc1 v0.99.4rc1Brendan Abolivier2019-05-131-1/+1
| |_|/ |/| |
* | | Fix CI after new release of isortBrendan Abolivier2019-05-131-1/+0
| |/ |/|
* | URL preview blacklisting fixes (#5155)Andrew Morgan2019-05-102-20/+35
|/
* Revert 085ae346ace418e0fc043ac5f568f85ebf80038eDavid Baker2019-05-101-1/+1
* Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* Run `black` on per_destination_queueRichard van der Hoff2019-05-091-35/+39
* Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)Quentin Dufour2019-05-092-27/+31
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-085-12/+114
* Merge pull request #5037 from matrix-org/erikj/limit_inflight_dnsErik Johnston2019-05-081-1/+82
|\
| * Limit in flight DNS requestsErik Johnston2019-04-091-1/+82
* | Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-085-8/+55
* | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_inviteErik Johnston2019-05-071-0/+11
|\ \
| * | Rate limit earlyErik Johnston2019-05-021-2/+3
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_...Erik Johnston2019-04-2663-959/+1158
| |\ \
| * | | Ratelimit 3pid invitesErik Johnston2019-04-261-0/+10
* | | | Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-071-10/+5
* | | | Merge branch 'master' into developRichard van der Hoff2019-05-034-13/+37
|\ \ \ \
| * | | | 0.99.3.2 v0.99.3.2 github/release-v0.99.3.2 release-v0.99.3.2Richard van der Hoff2019-05-031-1/+1
| * | | | pin urllib3 to <1.25Richard van der Hoff2019-05-031-0/+8
| * | | | 0.99.3.1Richard van der Hoff2019-05-031-1/+1
| * | | | Merge pull request #5134 from matrix-org/rav/url_preview_blacklistRichard van der Hoff2019-05-031-10/+21
| |\ \ \ \
| | * | | | more config comment updatesRichard van der Hoff2019-05-031-2/+5
| | * | | | Blacklist 0.0.0.0 and :: by default for URL previewsRichard van der Hoff2019-05-031-10/+18
| * | | | | Merge pull request #5133 from matrix-org/rav/systemrandomRichard van der Hoff2019-05-031-2/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Use SystemRandom for token generationRichard van der Hoff2019-05-031-2/+7
* | | | | | Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-023-3/+118
* | | | | | Merge pull request #5124 from matrix-org/babolivier/aliasesBrendan Abolivier2019-05-023-2/+34
|\ \ \ \ \ \
| * | | | | | Add some limitations to alias creationBrendan Abolivier2019-05-023-2/+34
* | | | | | | Factor out an "assert_requester_is_admin" function (#5120)Richard van der Hoff2019-05-023-76/+80
* | | | | | | fix examplesRichard van der Hoff2019-05-011-4/+4
* | | | | | | Move admin api impl to its own packageRichard van der Hoff2019-05-013-5/+4
* | | | | | | Move admin API to a new prefixRichard van der Hoff2019-05-014-24/+64
* | | | | | | Move admin API away from ClientV1RestServletRichard van der Hoff2019-05-011-33/+33
|/ / / / / /
* | | | | | Add a default .m.rule.tombstone push rule (#4867)Travis Ralston2019-04-291-0/+17
* | | | | | Merge pull request #5100 from matrix-org/rav/verification_hackeryRichard van der Hoff2019-04-292-18/+54
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | more logging improvementsRichard van der Hoff2019-04-251-8/+11
| * | | | | remove extraneous exception loggingRichard van der Hoff2019-04-252-18/+34
| * | | | | Clarify logging when PDU signature checking failsRichard van der Hoff2019-04-252-3/+20
* | | | | | Fix infinite loop in presence handlerRichard van der Hoff2019-04-262-0/+23
|/ / / / /
* | | | | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-254-15/+121
* | | | | Remove log error for .well-known/matrix/client (#4972)Michael Kaye2019-04-241-1/+1
* | | | | Prevent "producer not unregistered" message (#5009)Amber Brown2019-04-241-0/+4
* | | | | Don't crash on lack of expiry templatesBrendan Abolivier2019-04-181-2/+6
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-17139-4477/+4027
|\ \ \ \ \
| * \ \ \ \ Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-1714-39/+573
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-171-0/+18
| |\ \ \ \ \ \
| | * | | | | | Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-171-0/+18
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #5070 from matrix-org/erikj/postpathErik Johnston2019-04-171-8/+8
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Remove usage of request.postpathErik Johnston2019-04-161-8/+8
| * | | | | | Merge pull request #5065 from matrix-org/erikj/fix_versionsErik Johnston2019-04-161-1/+1
| |\ \ \ \ \ \
| | * | | | | | VersionRestServlet doesn't take a paramErik Johnston2019-04-151-1/+1
| * | | | | | | Add systemd-python to optional dependencies (#4339)Silke Hofstra2019-04-161-5/+9
| |/ / / / / /
| * | | | | | Merge pull request #5063 from matrix-org/erikj/move_endpointsErik Johnston2019-04-152-4/+14
| |\| | | | |
| | * | | | | Only handle GET requests for /push_rulesErik Johnston2019-04-151-0/+7
| | * | | | | Move some rest endpoints to client readerErik Johnston2019-04-151-4/+7
| * | | | | | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-119-9/+9
| * | | | | | Merge pull request #5033 from matrix-org/erikj/fix_schema_deltaErik Johnston2019-04-101-1/+3
| |\ \ \ \ \ \
| | * | | | | | Fix schema upgrade when dropping tablesErik Johnston2019-04-091-1/+3
| * | | | | | | Fix disappearing exceptions in manhole. (#5035)Richard van der Hoff2019-04-101-2/+57
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-095-0/+84
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_kRichard van der Hoff2019-04-093-71/+72
| |\ \ \ \ \ \
| | * | | | | | Rewrite Datastore.get_server_verify_keysRichard van der Hoff2019-04-092-49/+63
| | * | | | | | Replace SlavedKeyStore with a shimRichard van der Hoff2019-04-081-14/+4
| | * | | | | | Remove redundant merged_keys dictRichard van der Hoff2019-04-081-8/+5
| * | | | | | | Bump psycopg requirement (#5032)Richard van der Hoff2019-04-091-1/+3
| |/ / / / / /
| * | | | | | Remove unused server_tls_certificates functions (#5028)Richard van der Hoff2019-04-084-62/+5
| * | | | | | add context to phonehome stats (#5020)Neil Johnson2019-04-082-1/+5
| * | | | | | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeysRichard van der Hoff2019-04-081-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix from_server buglet in get_keys_from_perspectivesRichard van der Hoff2019-04-081-1/+1
| * | | | | | | drop tables listed in #1830 (#4992)Neil Johnson2019-04-0824-752/+42
| |/ / / / / /
| * | | | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2019-04-082-33/+50
| |\ \ \ \ \ \
| | * | | | | | Hoist server_name check out of process_v2_responseRichard van der Hoff2019-04-041-13/+7
| | * | | | | | Clean up Keyring.process_v2_responseRichard van der Hoff2019-04-041-23/+46
| | * | | | | | Fix docstring on get_server_keys_jsonRichard van der Hoff2019-04-041-2/+2
| * | | | | | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-042-0/+10
| | |_|/ / / / | |/| | | | |
| * | | | | | Clean up the database pagination code (#5007)Amber Brown2019-04-052-67/+63
| * | | | | | Merge pull request #5002 from matrix-org/erikj/delete_groupErik Johnston2019-04-043-0/+136
| |\ \ \ \ \ \
| | * | | | | | Add admin API for group deletionErik Johnston2019-04-031-0/+26
| | * | | | | | Add functions to delete a groupErik Johnston2019-04-032-0/+110
| * | | | | | | Prevent kicking users who aren't in the room (#4999)Andrew Morgan2019-04-041-0/+9
| * | | | | | | Avoid redundant URL encoding (#4555)Marcel Krüger2019-04-041-1/+1
| |/ / / / / /
| * / / / / / Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-0311-18/+29
| |/ / / / /
| * | | | | Remove presence lists (#4989)Neil Johnson2019-04-037-338/+22
| * | | | | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-036-17/+215
| |\ \ \ \ \
| | * | | | | Correctly handle id_server paramErik Johnston2019-04-021-0/+1
| | * | | | | Remove threepid binding if id server returns 400/404/501Erik Johnston2019-04-021-9/+10
| | * | | | | Fixup docstringsErik Johnston2019-04-023-7/+9
| | * | | | | Add unbind API to /r0 as it is now stabalisedErik Johnston2019-04-011-1/+1
| | * | | | | Grandfather in existing user threepidsErik Johnston2019-04-012-0/+37
| | * | | | | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-014-8/+20
| | * | | | | For unbind poke IS used during binding of 3PIDErik Johnston2019-04-011-9/+35
| | * | | | | Track IS used to bind 3PIDsErik Johnston2019-04-013-0/+119
| * | | | | | Run black on the rest of the storage module (#4996)Amber Brown2019-04-0341-2455/+2130
| * | | | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startupErik Johnston2019-04-024-8/+73
| |\ \ \ \ \ \
| | * | | | | | Make starting pushers faster during start upErik Johnston2019-04-024-8/+73
| * | | | | | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-022-0/+2
| * | | | | | | Add config.signing_key_path. (#4974)Richard van der Hoff2019-04-021-1/+2
| |/ / / / / /
| * | | | | | Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-023-20/+40
| * | | | | | Merge branch 'master' into developNeil Johnson2019-04-011-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-0118-142/+188
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #4955 from matrix-org/rav/merge_state_into_eventsRichard van der Hoff2019-03-288-49/+140
| |\ \ \ \ \
| | * | | | | Combine the CurrentStateDeltaStream into the EventStreamRichard van der Hoff2019-03-275-33/+43
| | * | | | | Make EventStream rows have a typeRichard van der Hoff2019-03-274-17/+98
| * | | | | | Merge pull request #4954 from matrix-org/rav/refactor_parse_rowRichard van der Hoff2019-03-283-5/+21
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_rowRichard van der Hoff2019-03-282-380/+335
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Skip building a ROW_TYPE when building updatesRichard van der Hoff2019-03-271-2/+2
| | * | | | | | Add parse_row method to replication stream classRichard van der Hoff2019-03-273-3/+19
| * | | | | | | remove log line for password (#4965)Neil Johnson2019-03-281-2/+0
| * | | | | | | Allow password providers to bind emails (#4947)Andrew Morgan2019-03-282-4/+22
| * | | | | | | Merge pull request #4942 from matrix-org/erikj/fix_presenceErik Johnston2019-03-283-32/+236
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Use an assertErik Johnston2019-03-281-2/+1
| | * | | | | | Review commentsErik Johnston2019-03-281-44/+62
| | * | | | | | Use event streams to calculate presenceErik Johnston2019-03-273-32/+219
| * | | | | | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streamsRichard van der Hoff2019-03-286-76/+133
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | move FederationStream out to its own fileRichard van der Hoff2019-03-274-23/+43
| | * | | | | | move EventsStream out to its own fileRichard van der Hoff2019-03-273-23/+42
| | * | | | | | Move replication.tcp.streams into a packageRichard van der Hoff2019-03-273-34/+52
| * | | | | | | Run `black` on some storage modules that the stats branch touches (#4959)Amber Brown2019-03-292-380/+335
| |/ / / / / /
| * / / / / / Fix/improve some docstrings in the replication code. (#4949)Richard van der Hoff2019-03-272-7/+19
| |/ / / / /
* | | | / / Add management endpoints for account validityBrendan Abolivier2019-04-175-18/+116
| |_|_|/ / |/| | | |
* | | | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-1714-39/+573
| |_|/ / |/| | |
* | | | Add account expiration featureBrendan Abolivier2019-04-096-1/+85
| |/ / |/| |
* | | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3Neil Johnson2019-04-011-1/+1
* | | bump versionNeil Johnson2019-03-271-1/+1
|/ /
* | Support 3PID login in password providers (#4931)Andrew Morgan2019-03-266-26/+122
* | Use the state event amount for userdir import batching, not room count (#4944)Amber Brown2019-03-271-8/+20
* | Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-263-8/+9
* | Fix ClientReplicationStreamProtocol.__str__ (#4929)Richard van der Hoff2019-03-252-4/+5
* | Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-253-12/+30
* | Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-254-110/+151
* | Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-223-5/+5
|\ \
| * | Use yaml safe_loadErik Johnston2019-03-223-5/+5
* | | Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-212-17/+89
|\ \ \ | |/ / |/| |
| * | Clean up backoff_on_404 and metehod callsAndrew Morgan2019-03-211-9/+13
| * | kwargs doesn't like commas on calling funcs either. TILAndrew Morgan2019-03-201-2/+2
| * | lintAndrew Morgan2019-03-201-2/+6
| * | New test, fix issuesAndrew Morgan2019-03-201-49/+28
| * | Fix comments. v0.99.2 -> v0.99.3Andrew Morgan2019-03-201-5/+5
| * | Just return if not doing any trailing slash shennanigansAndrew Morgan2019-03-201-0/+2
| * | lintAndrew Morgan2019-03-181-1/+1
| * | Better exception handlingAndrew Morgan2019-03-181-16/+17
| * | Correct var nameAndrew Morgan2019-03-131-2/+2
| * | receiving a 400 caused an exception. handle itAndrew Morgan2019-03-131-5/+12
| * | is this what purgatory feels likeAndrew Morgan2019-03-131-3/+3
| * | i should have given up x2Andrew Morgan2019-03-131-18/+13
| * | i should have given upAndrew Morgan2019-03-131-1/+1
| * | there comes a time when you should give up. but you dontAndrew Morgan2019-03-131-1/+1
| * | as aboveAndrew Morgan2019-03-131-2/+4
| * | no kwargs todayAndrew Morgan2019-03-131-7/+12
| * | Or perhaps I was the one who was drunkAndrew Morgan2019-03-131-6/+3
| * | go home python, you're drunkAndrew Morgan2019-03-131-4/+2
| * | Syntax checker is borkAndrew Morgan2019-03-131-6/+5
| * | Destructure againAndrew Morgan2019-03-131-7/+8
| * | Are you happy nowAndrew Morgan2019-03-131-2/+2
| * | Syntax testAndrew Morgan2019-03-131-6/+5
| * | Remove testing codeAndrew Morgan2019-03-131-3/+0
| * | Add missing docstring detailAndrew Morgan2019-03-131-1/+1
| * | Fix syntax issuesAndrew Morgan2019-03-131-7/+10
| * | Switch to wrapper function around _send_requestAndrew Morgan2019-03-132-37/+76
| * | Retry on 400:M_UNRECOGNIZEDAndrew Morgan2019-03-131-6/+10
| * | Fix paranthesis indentAndrew Morgan2019-03-131-1/+2
| * | Add workaround noteAndrew Morgan2019-03-131-10/+4
| * | Cleaner way of implementing trailing slashesAndrew Morgan2019-03-122-68/+62
| * | Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-112-9/+9
| |\ \
| * \ \ Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-114-19/+53
| |\ \ \
| * | | | lintAndrew Morgan2019-03-081-1/+3
| * | | | Retry certain federation requests on 404Andrew Morgan2019-03-082-5/+50
| * | | | Remove trailing slashes from outbound federation requestsAndrew Morgan2019-03-081-7/+7
* | | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-212-2/+11
|\ \ \ \ \
| * | | | | Deny peeking into rooms that have been blockedErik Johnston2019-03-212-2/+11
* | | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-216-24/+62
|\| | | | |
| * | | | | Fix upsertErik Johnston2019-03-211-0/+1
| * | | | | Revert spurious deleteErik Johnston2019-03-201-0/+4
| * | | | | comment block_roomErik Johnston2019-03-201-0/+9
| * | | | | Use flagsErik Johnston2019-03-205-15/+17
| * | | | | Move requester check into assert_accepted_privacy_policyErik Johnston2019-03-201-5/+8
| * | | | | Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
| * | | | | Log new room IDErik Johnston2019-03-201-1/+6
| * | | | | Only require consent for events with an associated requestErik Johnston2019-03-201-1/+5
| * | | | | Allow blocking a room multiple timesErik Johnston2019-03-201-2/+4
* | | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-213-0/+32
|\ \ \ \ \ \
| * | | | | | Disable publishing to room list when its disabledErik Johnston2019-03-201-0/+8
| * | | | | | Pull out config optionErik Johnston2019-03-201-3/+3
| * | | | | | Return before we logErik Johnston2019-03-201-4/+5
| * | | | | | Fix up config commentsErik Johnston2019-03-201-3/+4
| * | | | | | Add option to disable search room listsErik Johnston2019-03-192-0/+22
* | | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-202-0/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix up sample configErik Johnston2019-03-201-2/+4
| * | | | | | Update synapse/config/user_directory.pyRichard van der Hoff2019-03-201-1/+1
| * | | | | | Add option to disable searching in the user dirErik Johnston2019-03-192-0/+13
| |/ / / / /
* | | | | | Batching in the user directory import (#4900)Amber Brown2019-03-211-0/+13
* | | | | | Add a config option for torture-testing worker replication. (#4902)Richard van der Hoff2019-03-202-1/+22
* | | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-204-22/+171
|/ / / / /
* | | | | Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-192-2/+10
* | | | | Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-193-4/+16
|\ \ \ \ \
| * | | | | fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-192-3/+15
| * | | | | Fix user directory background update (#4887)Erik Johnston2019-03-191-1/+1
* | | | | | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-191-3/+5
|/ / / / /