summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Only count aggregations from distinct sendersErik Johnston2019-05-171-1/+1
* Make tests use different user for each reaction it sendsErik Johnston2019-05-171-12/+68
* Fixup bsaed on review commentsErik Johnston2019-05-173-19/+19
* Add basic editing supportErik Johnston2019-05-164-15/+167
* Merge pull request #5192 from matrix-org/erikj/relations_aggregationsErik Johnston2019-05-169-27/+706
|\
| * 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-162-3/+16
| * Fix relations in worker modeErik Johnston2019-05-165-13/+28
| * Add cache to relationsErik Johnston2019-05-161-0/+8
| * Add aggregations APIErik Johnston2019-05-165-13/+643
* | Merge pull request #5186 from matrix-org/erikj/simple_paginationErik Johnston2019-05-169-0/+479
|\|
| * Actually check for None rather falseyErik Johnston2019-05-151-2/+2
| * Actually implement idempotencyErik Johnston2019-05-151-1/+8
| * NewsfileErik Johnston2019-05-151-0/+1
| * Add simple pagination APIErik Johnston2019-05-153-0/+160
| * Add simple send_relation API and track in DBErik Johnston2019-05-158-0/+311
|/
* Merge branch 'erikj/refactor_pagination_bounds' into erikj/reactions_baseErik Johnston2019-05-155-63/+122
|\
| * NewsfileErik Johnston2019-05-151-0/+1
| * Make generating SQL bounds for pagination genericErik Johnston2019-05-151-61/+118
| * Merge pull request #5183 from matrix-org/erikj/async_serialize_eventErik Johnston2019-05-1513-101/+194
| |\
| | * Update docstring with correct return typeErik Johnston2019-05-151-1/+1
| * | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_arrayErik Johnston2019-05-157-30/+55
| |\ \
| | * | Update docstring with correct typeErik Johnston2019-05-151-1/+1
| * | | Merge pull request #5185 from matrix-org/erikj/fix_config_ratelimitingErik Johnston2019-05-152-1/+3
| |\ \ \
| * | | | comment about user_joined_roomRichard van der Hoff2019-05-141-0/+1
* | | | | Merge branch 'erikj/fix_config_ratelimiting' into erikj/testErik Johnston2019-05-142-1/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | NewsfileErik Johnston2019-05-141-0/+1
| * | | | Use correct config option for ratelimiting in testsErik Johnston2019-05-141-1/+2
| |/ / /
* | | | Merge branch 'erikj/async_serialize_event' into erikj/reactions_rebaseErik Johnston2019-05-1413-101/+194
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | NewsfileErik Johnston2019-05-142-6/+7
| * | Allow client event serialization to be asyncErik Johnston2019-05-1412-95/+187
| |/
* | NewsfileErik Johnston2019-05-141-0/+1
* | Expose DataStore._get_events as get_events_as_listErik Johnston2019-05-146-30/+54
|/
* Migrate all tests to use the dict-based config format instead of hanging item...Amber Brown2019-05-1323-203/+240
* Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-136-14/+168
* 0.99.4rc1 v0.99.4rc1Brendan Abolivier2019-05-1375-78/+83
* Merge pull request #5179 from matrix-org/babolivier/isortBrendan Abolivier2019-05-132-1/+1
|\
| * Fix changelogBrendan Abolivier2019-05-131-0/+0
| * ChangelogBrendan Abolivier2019-05-131-0/+1
| * Fix CI after new release of isortBrendan Abolivier2019-05-131-1/+0
|/
* Merge branch 'master' into developRichard van der Hoff2019-05-100-0/+0
|\
| * fix sample configRichard van der Hoff2019-05-101-1/+1
* | URL preview blacklisting fixes (#5155)Andrew Morgan2019-05-104-31/+47
* | Revert 085ae346ace418e0fc043ac5f568f85ebf80038eDavid Baker2019-05-101-1/+1
* | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* | Make Prometheus snippet less confusing on the metrics collection doc (#4288)Gergely Polonkai2019-05-101-1/+4
* | Set syslog identifiers in systemd units (#5023)Christoph Müller2019-05-106-1/+14
* | Run Black on the tests again (#5170)Amber Brown2019-05-1054-1169/+829
* | Add AllowEncodedSlashes to apache (#5068)colonelkrud2019-05-091-0/+2
* | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-05-091-16/+5
|\|
| * remove instructions for jessie installation (#5164)Richard van der Hoff2019-05-091-16/+5
* | 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-093-27/+32
* | Fix bogus imports in tests (#5154)Brendan Abolivier2019-05-084-5/+7
* | add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-089-13/+252
* | Merge pull request #5037 from matrix-org/erikj/limit_inflight_dnsErik Johnston2019-05-082-1/+83
|\ \
| * | NewsfileErik Johnston2019-04-091-0/+1
| * | Limit in flight DNS requestsErik Johnston2019-04-091-1/+82
* | | Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-087-8/+225
* | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_inviteErik Johnston2019-05-072-0/+12
|\ \ \
| * | | Rate limit earlyErik Johnston2019-05-021-2/+3
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_...Erik Johnston2019-04-26108-6218/+1842
| |\ \ \
| * | | | NewsfileErik Johnston2019-04-261-0/+1
| * | | | Ratelimit 3pid invitesErik Johnston2019-04-261-0/+10
* | | | | Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-075-38/+32
* | | | | Fix spelling in server notices admin API docs (#5142)Travis Ralston2019-05-062-1/+2
* | | | | Fix sample configRichard van der Hoff2019-05-061-1/+1
* | | | | Merge branch 'master' into developRichard van der Hoff2019-05-039-19/+84
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge tag 'v0.99.3.2'Richard van der Hoff2019-05-039-19/+84
| |\ \ \ \
| | * | | | 0.99.3.2 v0.99.3.2 github/release-v0.99.3.2 release-v0.99.3.2Richard van der Hoff2019-05-034-2/+16
| | * | | | include disco in deb build target listRichard van der Hoff2019-05-031-0/+1
| | * | | | Merge pull request #5135 from matrix-org/rav/build_fixesRichard van der Hoff2019-05-033-1/+11
| | |\ \ \ \
| | | * | | | changelogRichard van der Hoff2019-05-031-0/+1
| | | * | | | Debian: we now need libpq-dev.Richard van der Hoff2019-05-031-1/+2
| | | * | | | pin urllib3 to <1.25Richard van der Hoff2019-05-031-0/+8
| | |/ / / /
| | * | | | changelog tweaks v0.99.3.1 github/release-v0.99.3.1 release-v0.99.3.1Richard van der Hoff2019-05-031-2/+4
| | * | | | 0.99.3.1Richard van der Hoff2019-05-035-3/+16
| | * | | | Merge pull request #5134 from matrix-org/rav/url_preview_blacklistRichard van der Hoff2019-05-033-15/+34
| | |\ \ \ \
| | | * | | | more config comment updatesRichard van der Hoff2019-05-032-4/+10
| | | * | | | Blacklist 0.0.0.0 and :: by default for URL previewsRichard van der Hoff2019-05-033-15/+28
| | * | | | | Merge pull request #5133 from matrix-org/rav/systemrandomRichard van der Hoff2019-05-032-2/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | typoNeil Johnson2019-05-031-1/+1
| | | * | | | Use SystemRandom for token generationRichard van der Hoff2019-05-032-2/+8
* | | | | | | Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-0221-42/+196
* | | | | | | Merge pull request #5124 from matrix-org/babolivier/aliasesBrendan Abolivier2019-05-025-2/+40
|\ \ \ \ \ \ \
| * | | | | | | Add some limitations to alias creationBrendan Abolivier2019-05-025-2/+40
* | | | | | | | Factor out an "assert_requester_is_admin" function (#5120)Richard van der Hoff2019-05-024-76/+81
* | | | | | | | Merge pull request #5119 from matrix-org/rav/admin_api_urlsRichard van der Hoff2019-05-0230-114/+180
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix examplesRichard van der Hoff2019-05-011-4/+4
| * | | | | | | Fix sample configRichard van der Hoff2019-05-011-2/+2
| * | | | | | | changelogRichard van der Hoff2019-05-011-0/+1
| * | | | | | | Move admin api impl to its own packageRichard van der Hoff2019-05-0119-42/+67
| * | | | | | | Move admin API to a new prefixRichard van der Hoff2019-05-0112-36/+76
| * | | | | | | Move admin API away from ClientV1RestServletRichard van der Hoff2019-05-011-33/+33
|/ / / / / / /
* | | | | | | Merge pull request #5116 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-05-012-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Rename changelog fileBrendan Abolivier2019-05-011-0/+0
| * | | | | | | Add changelogBrendan Abolivier2019-05-011-0/+1
| * | | | | | | Fix whole path for admin routeBrendan Abolivier2019-05-011-1/+1
| * | | | | | | Fix typo in account validity admin routeBrendan Abolivier2019-05-011-1/+1
* | | | | | | | Add a default .m.rule.tombstone push rule (#4867)Travis Ralston2019-04-292-0/+18
* | | | | | | | Merge pull request #5100 from matrix-org/rav/verification_hackeryRichard van der Hoff2019-04-293-18/+55
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | changelogRichard van der Hoff2019-04-251-0/+1
| * | | | | | | 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
* | | | | | | | Merge pull request #5103 from matrix-org/rav/fix_notif_loopRichard van der Hoff2019-04-263-0/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix infinite loop in presence handlerRichard van der Hoff2019-04-263-0/+24
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-04-251-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | add gpg key fingerprintRichard van der Hoff2019-04-221-0/+2
* | | | | | | Merge pull request #5098 from matrix-org/rav/fix_pep_517Richard van der Hoff2019-04-253-2/+8
|\ \ \ \ \ \ \
| * | | | | | | ChangelogRichard van der Hoff2019-04-251-0/+1
| * | | | | | | Add --no-pep-517 to README instructionsRichard van der Hoff2019-04-251-2/+2
| * | | | | | | set PIP_USE_PEP517 = False for testsRichard van der Hoff2019-04-251-0/+5
* | | | | | | | Fix handling of SYNAPSE_NO_TLS in docker image (#5005)*=0=1=4=*2019-04-253-2/+16
|/ / / / / / /
* | | | | | | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-258-17/+158
* | | | | | | Remove log error for .well-known/matrix/client (#4972)Michael Kaye2019-04-242-1/+2
* | | | | | | Prevent "producer not unregistered" message (#5009)Amber Brown2019-04-242-0/+5
* | | | | | | Merge pull request #5077 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-182-2/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Don't crash on lack of expiry templatesBrendan Abolivier2019-04-182-2/+7
* | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-04-171-4/+24
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Update debian install docs for new key and repo (#5074)Richard van der Hoff2019-04-171-5/+25
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5073 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-178-26/+246
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-17216-10038/+5057
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-1717-43/+699
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-172-0/+19
|\ \ \ \ \ \ \
| * | | | | | | Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-172-0/+19
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5070 from matrix-org/erikj/postpathErik Johnston2019-04-172-8/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | NewsfileErik Johnston2019-04-161-0/+1
| * | | | | | Remove usage of request.postpathErik Johnston2019-04-161-8/+8
* | | | | | | Merge pull request #5065 from matrix-org/erikj/fix_versionsErik Johnston2019-04-162-1/+2
|\ \ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2019-04-151-0/+1
| * | | | | | | VersionRestServlet doesn't take a paramErik Johnston2019-04-151-1/+1
* | | | | | | | Use packages.matrix.org for packages (#5067)Travis Ralston2019-04-162-3/+4
* | | | | | | | Add systemd-python to optional dependencies (#4339)Silke Hofstra2019-04-164-10/+13
|/ / / / / / /
* | | | | | | Merge pull request #5063 from matrix-org/erikj/move_endpointsErik Johnston2019-04-154-4/+21
|\| | | | | |
| * | | | | | Only handle GET requests for /push_rulesErik Johnston2019-04-152-0/+10
| * | | | | | NewsfileErik Johnston2019-04-151-0/+1
| * | | | | | Move some rest endpoints to client readerErik Johnston2019-04-152-4/+10
* | | | | | | update grafana dashboardRichard van der Hoff2019-04-131-5211/+1
* | | | | | | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-1112-11/+12
* | | | | | | Merge pull request #5033 from matrix-org/erikj/fix_schema_deltaErik Johnston2019-04-102-1/+4
|\ \ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2019-04-091-0/+1
| * | | | | | | Fix schema upgrade when dropping tablesErik Johnston2019-04-091-1/+3
* | | | | | | | Fix disappearing exceptions in manhole. (#5035)Richard van der Hoff2019-04-102-2/+58
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-099-3/+143
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_kRichard van der Hoff2019-04-095-91/+136
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2019-04-091-0/+1
| * | | | | | | Rewrite Datastore.get_server_verify_keysRichard van der Hoff2019-04-093-52/+113
| * | | | | | | Rewrite test_keys as a HomeserverTestCaseRichard van der Hoff2019-04-081-19/+15
| * | | | | | | 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-092-1/+4
|/ / / / / / /
* | | | | | | Remove unused server_tls_certificates functions (#5028)Richard van der Hoff2019-04-086-63/+7
* | | | | | | add context to phonehome stats (#5020)Neil Johnson2019-04-084-1/+9
* | | | | | | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeysRichard van der Hoff2019-04-083-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix from_server buglet in get_keys_from_perspectivesRichard van der Hoff2019-04-083-1/+3
* | | | | | | | drop tables listed in #1830 (#4992)Neil Johnson2019-04-0826-757/+43
|/ / / / / / /
* | | | | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2019-04-084-33/+181
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2019-04-041-0/+1
| * | | | | | | 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
| * | | | | | | test for get_keys_from_perspectivesRichard van der Hoff2019-04-041-0/+67
| * | | | | | | add a test for get_keys_from_serverRichard van der Hoff2019-04-041-0/+63
| * | | | | | | 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-046-1/+81
| |_|/ / / / / |/| | | | | |
* | | | | | | Clean up the database pagination code (#5007)Amber Brown2019-04-053-67/+64
* | | | | | | Merge pull request #5002 from matrix-org/erikj/delete_groupErik Johnston2019-04-046-0/+275
|\ \ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2019-04-031-0/+1
| * | | | | | | Add unit test for deleting groupsErik Johnston2019-04-031-0/+124
| * | | | | | | Add admin API for group deletionErik Johnston2019-04-032-0/+40
| * | | | | | | Add functions to delete a groupErik Johnston2019-04-032-0/+110
* | | | | | | | Prevent kicking users who aren't in the room (#4999)Andrew Morgan2019-04-042-0/+10
* | | | | | | | Avoid redundant URL encoding (#4555)Marcel Krüger2019-04-042-1/+2
* | | | | | | | Merge pull request #5004 from ajensenwaud/developErik Johnston2019-04-042-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issue #4596Anders2019-04-032-1/+2
* | | | | | | | | Correct default POSTGRES_USER in Docker README (#4987)*=0=1=4=*2019-04-042-2/+4
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-0313-20/+32
| |/ / / / / / |/| | | | | |
* | | | | | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986)Richard van der Hoff2019-04-032-107/+105
* | | | | | | Remove presence lists (#4989)Neil Johnson2019-04-039-456/+23
* | | | | | | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-037-17/+216
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | NewsfileErik Johnston2019-04-011-0/+1
| * | | | | | | 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-0342-2455/+2131
* | | | | | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startupErik Johnston2019-04-025-8/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | s/misc/feature/Erik Johnston2019-04-021-0/+0
| * | | | | | | | NewsfileErik Johnston2019-04-021-0/+1
| * | | | | | | | Make starting pushers faster during start upErik Johnston2019-04-024-8/+73
* | | | | | | | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-023-0/+3
* | | | | | | | | Add config.signing_key_path. (#4974)Richard van der Hoff2019-04-022-1/+3
|/ / / / / / / /
* | / / / / / / Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-027-69/+237
| |/ / / / / / |/| | | | | |
* | | | | | | Neilj/fix threepid auth check (with tests) (#4474)Neil Johnson2019-04-012-0/+33
* | | | | | | Merge pull request #4981 from matrix-org/manuroe/demo_bypass_account_rate_lim...manuroe2019-04-012-5/+16
|\ \ \ \ \ \ \
| * | | | | | | start.sh: Fix the --no-rate-limit option for messages and make it bypass rate...manuroe2019-04-012-5/+16
* | | | | | | | Merge branch 'master' into developNeil Johnson2019-04-0188-89/+107
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
* | | | | | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-0128-168/+222
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #4968 from Jurrie/feature/fix_small_stuff_in_Docker_README.mdRichard van der Hoff2019-03-292-2/+4
|\ \ \ \ \ \
| * | | | | | Add changelog.d entryJurrie Overgoor2019-03-291-0/+1
| * | | | | | Add -p argument for docker run command exampleJurrie Overgoor2019-03-291-0/+1
| * | | | | | Fix typo in TLS filenamesJurrie Overgoor2019-03-291-2/+2
|/ / / / / /
* | | | | | Merge pull request #4955 from matrix-org/rav/merge_state_into_eventsRichard van der Hoff2019-03-289-49/+141
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2019-03-271-0/+1
| * | | | | | 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-284-5/+22
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_rowRichard van der Hoff2019-03-283-380/+336
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | changelogRichard van der Hoff2019-03-271-0/+1
| * | | | | | | 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-282-2/+1
* | | | | | | | Allow password providers to bind emails (#4947)Andrew Morgan2019-03-283-4/+23
* | | | | | | | Merge pull request #4942 from matrix-org/erikj/fix_presenceErik Johnston2019-03-285-33/+412
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Use an assertErik Johnston2019-03-281-2/+1
| * | | | | | | Review commentsErik Johnston2019-03-282-49/+71
| * | | | | | | NewsfileErik Johnston2019-03-271-0/+1
| * | | | | | | Add unit testsErik Johnston2019-03-271-1/+171
| * | | | | | | 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-288-77/+136
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | changelogRichard van der Hoff2019-03-271-0/+2
| * | | | | | | 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-274-35/+53
* | | | | | | | Run `black` on some storage modules that the stats branch touches (#4959)Amber Brown2019-03-293-380/+336
|/ / / / / / /
* / / / / / / Fix/improve some docstrings in the replication code. (#4949)Richard van der Hoff2019-03-273-7/+20
|/ / / / / /
| | | | * / Add management endpoints for account validityBrendan Abolivier2019-04-178-26/+246
| | | |/ /
| | | * / Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-1717-43/+699
| | |/ /
| | * / Add account expiration featureBrendan Abolivier2019-04-0910-4/+144
| |/ /
| * | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3Neil Johnson2019-04-013-3/+13
| * | convert rst link to mdNeil Johnson2019-04-011-1/+1
| * | 0.99.3rc1 v0.99.3rc1Neil Johnson2019-03-2785-85/+93
| * | bump versionNeil Johnson2019-03-271-1/+1
|/ /
* | Support 3PID login in password providers (#4931)Andrew Morgan2019-03-268-26/+137
* | Use the state event amount for userdir import batching, not room count (#4944)Amber Brown2019-03-272-8/+21
* | Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-265-11/+13
* | Fix ClientReplicationStreamProtocol.__str__ (#4929)Richard van der Hoff2019-03-253-4/+6
* | Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-258-12/+179
* | Use an explicit dbname for postgres connections in the tests. (#4928)Richard van der Hoff2019-03-252-18/+17
* | Fix nginx example in ACME doc. (#4923)Richard van der Hoff2019-03-252-1/+2
* | Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-255-110/+152
* | Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-228-11/+12
|\ \
| * | NewsfileErik Johnston2019-03-221-0/+1
| * | Use yaml safe_loadErik Johnston2019-03-227-11/+11
* | | Allow newsfragments to end with exclamation marks! (#4912)Richard van der Hoff2019-03-212-2/+3
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-18 15:18:19 +0000