summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / /
* | | | Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-1914-98/+149
* | | | Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-194-256/+325
* | | | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-182-5/+32
* | | | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-156-22/+102
* | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-157-761/+864
|\ \ \ \
| * | | | Rename and move the classesRichard van der Hoff2019-03-137-811/+864
| * | | | Factor per-destination stuff out of TransactionQueueRichard van der Hoff2019-03-131-132/+182
* | | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-155-55/+110
|\| | | |
| * | | | Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-134-33/+78
| * | | | declare a ReadReceipt classRichard van der Hoff2019-03-132-24/+34
* | | | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ciErik Johnston2019-03-154-17/+53
|\ \ \ \ \
| * | | | | Correctly handle all command line optionsErik Johnston2019-03-143-16/+42
| * | | | | Allow passing --daemonize to workersErik Johnston2019-03-132-1/+11
* | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ...Erik Johnston2019-03-142-8/+8
* | | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-147-123/+183
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixupAmber Brown2019-03-132-2/+2
| * | | | | fixupAmber Brown2019-03-133-55/+16
| * | | | | fixupAmber Brown2019-03-121-1/+1
| * | | | | fixupAmber Brown2019-03-121-1/+2
| * | | | | fixupAmber Brown2019-03-123-160/+139
| * | | | | fixupAmber Brown2019-03-121-1/+1
| * | | | | use the old methodAmber Brown2019-03-121-3/+2
| * | | | | fixAmber Brown2019-03-121-1/+1
| * | | | | pep8Amber Brown2019-03-121-2/+1
| * | | | | fixesAmber Brown2019-03-123-48/+62
| * | | | | master startupAmber Brown2019-03-112-0/+9
| * | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-searchAmber Brown2019-03-114-19/+53
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | initialAmber Brown2019-03-114-4/+102
| | |_|/ / | |/| | |
* | | | | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-131-0/+5
| |_|/ / |/| | |
* | | | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-122-0/+61
* | | | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-111-2/+2
| |_|/ |/| |
* | | Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-112-8/+8
* | | Correctly log expected errors when fetching server keysErik Johnston2019-03-111-2/+2
| |/ |/|
* | fix incorrect encoding of filenames with spaces in (#2090)Matthew Hodgson2019-03-111-3/+51
* | Add comment to schemaErik Johnston2019-03-081-0/+2
* | Make `prev_state` field optionalErik Johnston2019-03-082-16/+0
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_...Erik Johnston2019-03-0817-426/+384
|\
| * Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-081-3/+7
| |\
| | * When re-syncing device lists reset the stateErik Johnston2019-03-071-3/+7
| * | Add some debug logging for device list handlingErik Johnston2019-03-071-2/+38
| |/
| * Rewrite userdir to be faster (#4537)Amber Brown2019-03-073-366/+174
| * Merge pull request #4779 from matrix-org/travis/iconsTravis Ralston2019-03-063-7/+7
| |\
| | * Use static locations for Riot iconsTravis Ralston2019-03-013-7/+7
| * | Merge pull request #4818 from matrix-org/erikj/prefill_client_ipsErik Johnston2019-03-061-0/+2
| |\ \
| | * | Prefill client IPs cache on workersErik Johnston2019-03-061-0/+2
| * | | Merge pull request #4815 from matrix-org/erikj/docstringsErik Johnston2019-03-062-7/+45
| |\ \ \
| | * | | Add docstrings from matrix-org-hotfixesErik Johnston2019-03-062-7/+45
| | |/ /
| * | | Merge pull request #4816 from matrix-org/erikj/4422_debugErik Johnston2019-03-061-7/+46
| |\ \ \
| | * | | Port #4422 debug logging from hotfixesErik Johnston2019-03-061-7/+46
| | |/ /
| * / / Send message after room has been shutdownErik Johnston2019-03-061-11/+11
| |/ /
| * | Merge pull request #4792 from matrix-org/anoa/replication_tokensAndrew Morgan2019-03-061-3/+28
| |\ \
| | * | Simplify token replication logicAndrew Morgan2019-03-051-23/+14
| | * | Clean up logic and add commentsAndrew Morgan2019-03-041-11/+18
| | * | Clearer branching, fix missing list clearAndrew Morgan2019-03-041-4/+11
| | * | Prevent replication wedgingAndrew Morgan2019-03-041-4/+24
| * | | Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-063-2/+6
| * | | Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-065-11/+7
| * | | Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-055-7/+11
| * | | Move settings from registration to ratelimiting in config fileBrendan Abolivier2019-03-052-18/+20
* | | | Factor out soft fail checksErik Johnston2019-03-081-5/+22
* | | | Implement soft failErik Johnston2019-03-064-1/+95
|/ / /
* | | Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-0/+23
|\ \ \
| * | | Add 'server_version' endpoint to admin APIJoseph Weston2019-03-011-0/+23
* | | | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-056-31/+102
* | | | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahsAndrew Morgan2019-03-051-22/+22
|\ \ \ \
| * | | | Remove unnecessary dollar signsAndrew Morgan2019-03-041-22/+22
* | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-053-29/+126
|\ \ \ \ \
| * | | | | clarify commentsErik Johnston2019-03-052-9/+12
| * | | | | Fix missing null guardErik Johnston2019-03-041-1/+1
| * | | | | Only check history visibility when filteringErik Johnston2019-03-042-35/+46
| * | | | | s/get_forward_events/get_successor_events/Erik Johnston2019-03-042-3/+3
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n...Erik Johnston2019-03-0436-191/+571
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Update commentsErik Johnston2019-02-271-3/+13
| * | | | | Stop backpaginating when events not visibleErik Johnston2019-02-203-5/+78
* | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_codeErik Johnston2019-03-051-60/+5
|\ \ \ \ \ \
| * | | | | | Remove redundant PreserveLoggingContextRichard van der Hoff2019-03-041-10/+5
| * | | | | | Remove unused `wait_for_replication` methodRichard van der Hoff2019-03-041-50/+0
* | | | | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-059-747/+762
|\ \ \ \ \ \ \
| * | | | | | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-042-2/+13
| * | | | | | | Split DeviceHandler into master and workerErik Johnston2019-03-042-170/+179
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 09:52:07 +0000