summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* avoid leaking twisted log events by routing them to python's logging instead github/matthew/logging-memleak matthew/logging-memleakMatthew Hodgson2016-12-301-0/+12
* Bump changelog and version v0.18.6-rc1Mark Haines2016-12-292-1/+8
* Merge pull request #1725 from matrix-org/erikj/timeout_connMark Haines2016-12-292-7/+70
|\
| * Manually abort the underlying TLS connection.Mark Haines2016-12-291-2/+10
| * Respect long_retries param and default to offErik Johnston2016-12-291-2/+2
| * Spelling and commentsErik Johnston2016-12-291-4/+6
| * Clean upErik Johnston2016-12-292-7/+4
| * Wrap connections in an N minute timeout to ensure they get reaped correctlyErik Johnston2016-12-292-5/+61
| * Merge branch 'release-v0.18.5' of github.com:matrix-org/synapse v0.18.5Erik Johnston2016-12-16105-1213/+2917
| |\ | |/ |/|
* | Bump version and changelogErik Johnston2016-12-162-1/+10
* | Merge pull request #1704 from matrix-org/rav/log_todevice_syncsRichard van der Hoff2016-12-152-5/+10
|\ \
| * | Add some logging for syncing to_device eventsRichard van der Hoff2016-12-152-5/+10
|/ /
* | Merge pull request #1698 from matrix-org/erikj/room_listErik Johnston2016-12-151-2/+4
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_listErik Johnston2016-12-132-1/+35
| |\ \
| * | | Fix caching on public room listErik Johnston2016-12-131-2/+4
* | | | Merge pull request #1702 from manuroe/mac_install_updateErik Johnston2016-12-151-0/+1
|\ \ \ \
| * | | | Update prerequisites instructions on Mac OSmanuroe2016-12-151-0/+1
|/ / / /
* | | | Merge pull request #1700 from matrix-org/erikj/backfill_filterErik Johnston2016-12-151-2/+5
|\ \ \ \
| * | | | CommentErik Johnston2016-12-141-0/+2
| * | | | Fix /backfill returning events it shouldn'tErik Johnston2016-12-141-2/+3
* | | | | Merge pull request #1701 from mbachry/fix-preview-crashErik Johnston2016-12-152-1/+54
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix crash in url preview when html tag has no textMarcin Bachry2016-12-142-1/+54
|/ / / /
* | / / Fixup membership queryErik Johnston2016-12-141-2/+2
| |/ / |/| |
* | | Update changelog v0.18.5-rc3 github/release-v0.18.5 release-v0.18.5Erik Johnston2016-12-131-1/+1
* | | Bump changelog and versionErik Johnston2016-12-132-1/+35
|/ /
* | Merge pull request #1697 from matrix-org/erikj/fix_bg_memberErik Johnston2016-12-121-1/+1
|\ \
| * | Fix background update that prematurely stoppedErik Johnston2016-12-121-1/+1
* | | Merge pull request #1676 from matrix-org/erikj/room_listErik Johnston2016-12-1215-42/+399
|\ \ \ | |/ / |/| |
| * | Rename network_id to instance_id on client sideErik Johnston2016-12-121-1/+1
| * | Add cache to get_public_room_ids_at_stream_idErik Johnston2016-12-122-1/+4
| * | Notify replication. Use correct network_idErik Johnston2016-12-121-1/+3
| * | DocstringErik Johnston2016-12-121-0/+12
| * | CommentsErik Johnston2016-12-073-2/+12
| * | Don't include appservice idErik Johnston2016-12-061-1/+0
| * | Add new API appservice specific public room listErik Johnston2016-12-0614-40/+371
* | | Merge pull request #1694 from matrix-org/rav/no_get_e2e_keysRichard van der Hoff2016-12-121-39/+4
|\ \ \
| * | | Remove unspecced GET endpoints for e2e keysRichard van der Hoff2016-12-121-39/+4
|/ / /
* | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2016-12-121-4/+13
|\ \ \ | | |/ | |/|
| * | Merge pull request #1685 from matrix-org/rav/update_readme_for_testsRichard van der Hoff2016-12-121-5/+14
| |\ \
| | * | fix pythonpathRichard van der Hoff2016-12-091-1/+1
| | * | Update the readme to use trialRichard van der Hoff2016-12-091-5/+14
| |/ /
* | | Merge pull request #1620 from matrix-org/erikj/concurrent_room_accessErik Johnston2016-12-123-27/+161
|\ \ \
| * | | CommentsErik Johnston2016-11-112-0/+15
| * | | Limit the number of events that can be created on a given room concurretnlyErik Johnston2016-11-101-27/+31
| * | | Add Limiter: limit concurrent access to resourceErik Johnston2016-11-102-0/+115
* | | | Merge pull request #1686 from matrix-org/rav/fix_federation_key_failsRichard van der Hoff2016-12-121-0/+10
|\ \ \ \
| * | | | Remove unused importRichard van der Hoff2016-12-121-1/+0
| * | | | E2E key query: handle federation failsRichard van der Hoff2016-12-091-0/+11
* | | | | Merge pull request #1684 from matrix-org/rav/no_run_tox_from_setupRichard van der Hoff2016-12-091-33/+40
|\ \ \ \ \
| * | | | | Implement a null 'test' commandRichard van der Hoff2016-12-091-2/+15
| * | | | | Don't try to run tox from setup.pyRichard van der Hoff2016-12-091-34/+28
* | | | | | Merge pull request #1683 from matrix-org/erikj/notifier_sadnessErik Johnston2016-12-094-18/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix unit testsErik Johnston2016-12-091-0/+4
| * | | | | Correctly handle timeout errorsErik Johnston2016-12-092-7/+20
| * | | | | Fix rare notifier bug where listeners dont timeoutErik Johnston2016-12-092-11/+10
* | | | | | Fix broken README mergeRichard van der Hoff2016-12-091-1/+1
|/ / / / /
* | | | | Merge pull request #1680 from matrix-org/erikj/joined_roomsErik Johnston2016-12-096-9/+165
|\ \ \ \ \
| * | | | | Add /room/<room_id>/joined_members APIErik Johnston2016-12-083-9/+38
| * | | | | Add profile data to the room_membership table for joinsErik Johnston2016-12-084-0/+110
| * | | | | Add joined_rooms servletErik Johnston2016-12-081-0/+17
| |/ / / /
* | | | | Merge pull request #1678 from matrix-org/rav/fix_receipt_notificationsRichard van der Hoff2016-12-082-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix ignored read-receiptsRichard van der Hoff2016-12-081-1/+5
| * | | | Fix result of insert_receiptRichard van der Hoff2016-12-081-1/+1
|/ / / /
* | | | Merge pull request #1672 from williamleuschner/developErik Johnston2016-12-061-0/+30
|\ \ \ \
| * | | | Fix incorrect numbering on OpenBSD instructions caused by my own incompetenceWilliam Leuschner2016-12-061-7/+7
| * | | | Update incorrect information in README about ksh and sourceWilliam Leuschner2016-12-061-6/+2
| * | | | Add README instructions for OpenBSD installationWilliam Leuschner2016-12-051-0/+34
* | | | | Prevent user tokens being used as guest tokens (#1675)Richard van der Hoff2016-12-063-31/+115
| |_|_|/ |/| | |
* | | | Travis config (#1674)Richard van der Hoff2016-12-061-0/+17
* | | | Merge pull request #1673 from matrix-org/rav/fix_tox_testsRichard van der Hoff2016-12-061-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fix unittests under toxRichard van der Hoff2016-12-061-0/+7
* | | | Merge pull request #653 from matrix-org/erikj/preset_guest_joinErik Johnston2016-12-051-0/+10
|\ \ \ \
| * | | | Enable guest access for private rooms by defaultErik Johnston2016-03-171-0/+10
* | | | | Merge pull request #1649 from matrix-org/dbkr/log_ui_auth_argsErik Johnston2016-12-051-1/+9
|\ \ \ \ \
| * | | | | Clarify that creds doesn not contain passwords.David Baker2016-11-241-1/+3
| * | | | | Log the args that we have on UI auth completionDavid Baker2016-11-241-1/+7
* | | | | | Merge pull request #1668 from pik/bug-console-filterErik Johnston2016-12-051-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bugfix: Console logging handler missing default filterpik2016-12-031-0/+1
* | | | | | Merge pull request #1671 from kyrias/fix-preview-testRichard van der Hoff2016-12-051-68/+68
|\ \ \ \ \ \
| * | | | | | test_preview: Fix incorrect wrappingJohannes Löthberg2016-12-051-2/+2
| * | | | | | Make test_preview use unicode stringsJohannes Löthberg2016-12-051-68/+68
|/ / / / / /
* | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2016-12-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | README: fix linkRichard van der Hoff2016-12-031-1/+1
* | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2016-12-032-187/+355
|\| | | |
| * | | | Merge pull request #1667 from matrix-org/rav/update_readmeRichard van der Hoff2016-12-032-192/+359
| |\ \ \ \
| | * | | | README: review commentsRichard van der Hoff2016-12-021-32/+54
| | * | | | README: rewrite federation sectionRichard van der Hoff2016-12-021-50/+55
| | * | | | README: add reverse-proxying sectionRichard van der Hoff2016-12-021-0/+99
| | * | | | README: Rewrite "Identity servers" sectionRichard van der Hoff2016-12-021-15/+22
| | * | | | README: rewrite installation instructionsRichard van der Hoff2016-12-021-10/+57
| | * | | | README: remove refs to demo clientRichard van der Hoff2016-12-021-36/+22
| | * | | | README: code quotesRichard van der Hoff2016-12-021-10/+10
| | * | | | README: "About matrix" updatesRichard van der Hoff2016-12-021-8/+1
| | * | | | README: Fix linksRichard van der Hoff2016-12-021-10/+11
| | * | | | Rearrange the READMERichard van der Hoff2016-12-021-85/+93
| | * | | | rename CAPTCHA_SETUPRichard van der Hoff2016-12-012-8/+7
| |/ / / /
* | | | | Merge pull request #1664 from kyrias/preview-url-resource-encodingMatthew Hodgson2016-12-031-1/+1
|\ \ \ \ \
| * | | | | preview_url_resource: Ellipsis must be in unicode stringJohannes Löthberg2016-12-011-1/+1
|/ / / / /
* | | | | Merge pull request #1654 from matrix-org/rav/no_more_refresh_tokensRichard van der Hoff2016-12-019-210/+26
|\ \ \ \ \
| * | | | | Fix doc-stringRichard van der Hoff2016-12-011-2/+1
| * | | | | fix importsRichard van der Hoff2016-11-301-3/+0
| * | | | | Rip out more refresh_token codeRichard van der Hoff2016-11-307-160/+5
| * | | | | Merge branch 'develop' into rav/no_more_refresh_tokensRichard van der Hoff2016-11-3014-78/+94
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1660 from matrix-org/rav/better_content_type_validationRichard van der Hoff2016-11-301-18/+30
|\ \ \ \ \ \
| * | | | | | More intelligent Content-Type parsingRichard van der Hoff2016-11-301-18/+30
* | | | | | | Merge pull request #1656 from matrix-org/rav/remove_time_caveatRichard van der Hoff2016-11-307-36/+26
|\ \ \ \ \ \ \
| * | | | | | | CommentsRichard van der Hoff2016-11-301-3/+9
| * | | | | | | Stop putting a time caveat on access tokensRichard van der Hoff2016-11-297-33/+17
| |/ / / / / /
* | | | | | | Merge pull request #1653 from matrix-org/rav/guest_e2eRichard van der Hoff2016-11-295-14/+29
|\ \ \ \ \ \ \
| * | | | | | | Allow guest access to endpoints for E2ERichard van der Hoff2016-11-253-9/+9
| * | | | | | | Give guest users a device_idRichard van der Hoff2016-11-252-5/+20
* | | | | | | | Merge pull request #1657 from matrix-org/rav/hurry_up_pipRichard van der Hoff2016-11-292-10/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Let pip install multiple packages at onceRichard van der Hoff2016-11-292-10/+9
|/ / / / / / /
| | * / / / / Stop generating refresh tokensRichard van der Hoff2016-11-284-45/+20
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checksRichard van der Hoff2016-11-251-26/+8
|\ \ \ \ \ \
| * | | | | | Remove redundant list of known caveat prefixesRichard van der Hoff2016-11-241-26/+8
| |/ / / / /
* | | | | | Merge pull request #1650 from matrix-org/erikj/respect_ratelimitedErik Johnston2016-11-242-1/+8
|\ \ \ \ \ \
| * | | | | | Use correct varErik Johnston2016-11-241-1/+1
| * | | | | | Correctly handle 500's and 429 on federationErik Johnston2016-11-242-1/+8
|/ / / / / /
* | | | | | Bump version and changelog v0.18.5-rc2Erik Johnston2016-11-242-1/+8
* | | | | | Don't send old events as federationErik Johnston2016-11-241-1/+1
* | | | | | Bump changelog and version v0.18.5-rc1Erik Johnston2016-11-242-1/+16
| |_|/ / / |/| | | |
* | | | | Merge pull request #1644 from matrix-org/erikj/efficient_notif_countsErik Johnston2016-11-232-8/+50
|\ \ \ \ \
| * | | | | CommentErik Johnston2016-11-231-1/+3
| * | | | | More efficient notif count queriesErik Johnston2016-11-232-8/+48
|/ / / / /
* | | | | Merge pull request #1635 from matrix-org/erikj/split_out_fed_txnErik Johnston2016-11-2338-219/+1131
|\ \ \ \ \
| * | | | | Shuffle receipt handler around so that worker apps don't need to load itErik Johnston2016-11-237-9/+11
| * | | | | Fix testsErik Johnston2016-11-231-0/+1
| * | | | | Ensure only main or federation_sender process can send federation trafficErik Johnston2016-11-233-5/+21
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2016-11-2310-25/+396
| |\ \ \ \ \
| * | | | | | CommentErik Johnston2016-11-231-0/+3
| * | | | | | Explicit federation ackErik Johnston2016-11-233-8/+25
| * | | | | | Fix tests and flake8Erik Johnston2016-11-222-1/+1
| * | | | | | Invalidate retry cache in both directionsErik Johnston2016-11-226-27/+132
| * | | | | | CommentsErik Johnston2016-11-211-0/+2
| * | | | | | Add federation-sender to sytestErik Johnston2016-11-211-0/+1
| * | | | | | Add some metricsErik Johnston2016-11-211-48/+68
| * | | | | | CommentsErik Johnston2016-11-213-0/+41
| * | | | | | Remove explicit calls to send_pduErik Johnston2016-11-213-61/+9
| * | | | | | Fix testsErik Johnston2016-11-214-7/+24
| * | | | | | Store federation stream positions in the databaseErik Johnston2016-11-216-24/+94
| * | | | | | Handle sending events and device messages over federationErik Johnston2016-11-1714-55/+185
| * | | | | | Hook up the send queue and create a federation sender workerErik Johnston2016-11-168-22/+419
| * | | | | | Add initial cut of federation send queueErik Johnston2016-11-161-0/+174
| * | | | | | Use new federation_sender DIErik Johnston2016-11-167-63/+26
| * | | | | | Add transaction queue and transport layer to DIErik Johnston2016-11-165-10/+16
| * | | | | | Move logic into transaction_queueErik Johnston2016-11-163-19/+18
| * | | | | | Rename transaction queue functions to send_*Erik Johnston2016-11-162-12/+12
* | | | | | | Merge pull request #1641 from matrix-org/erikj/as_pushersErik Johnston2016-11-232-2/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Ignore AS users when fetching push rulesErik Johnston2016-11-232-2/+18
* | | | | | | Merge pull request #1640 from matrix-org/kegan/sync-perfKegsay2016-11-222-9/+51
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Return early on /sync code paths if a '*' filter is usedKegan Dougal2016-11-222-9/+51
|/ / / / / /
* | | | | | Merge pull request #1638 from matrix-org/kegan/sync-event-fieldsKegsay2016-11-224-15/+296
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Review commentsKegan Dougal2016-11-222-21/+11
| * | | | | Also check for dict since sometimes they aren't frozenKegan Dougal2016-11-221-1/+1
| * | | | | Glue only_event_fields into the sync rest servletKegan Dougal2016-11-223-11/+15
| * | | | | More testsKegan Dougal2016-11-222-4/+60
| * | | | | Add remaining testsKegan Dougal2016-11-211-4/+70
| * | | | | Start adding some testsKegan Dougal2016-11-212-4/+40
| * | | | | Move event_fields filtering to serialize_eventKegan Dougal2016-11-213-59/+119
| * | | | | Add filter_event_fields and filter_field to FilterCollectionKegan Dougal2016-11-211-0/+69
| |/ / / /
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-11-223-1/+40
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4Erik Johnston2016-11-2232-430/+383
| |\ \ \ \
| | * | | | Bump changelogErik Johnston2016-11-221-0/+8
| | * | | | Merge branch 'dbkr/work_around_devicename_bug' of github.com:matrix-org/synap...Erik Johnston2016-11-221-0/+11
| | |\ \ \ \
| | | * | | | Fix flake8Mark Haines2016-11-181-1/+0
| | | * | | | Work around client replacing reg paramsDavid Baker2016-11-181-0/+12
| | |/ / / /
| | * | | | Bump changelog and version v0.18.4-rc1Erik Johnston2016-11-142-1/+21
* | | | | | Merge pull request #1636 from matrix-org/kegan/filter-error-msgKegsay2016-11-212-0/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fail with a coherent error message if `/sync?filter=` is invalidKegan Dougal2016-11-212-0/+9
|/ / / / /
* | | | | Merge pull request #1628 from matrix-org/erikj/ldap_split_outErik Johnston2016-11-154-378/+17
|\ \ \ \ \
| * | | | | Use external ldap auth pacakgeErik Johnston2016-11-154-378/+17
* | | | | | Merge pull request #1617 from matrix-org/erikj/intern_state_dictErik Johnston2016-11-151-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Correctly intern keys in state cacheErik Johnston2016-11-081-1/+4
* | | | | | New Flake8 fixesErik Johnston2016-11-152-0/+3
| |_|/ / / |/| | | |
* | | | | Merge pull request #1624 from matrix-org/kegan/idempotent-requestsKegsay2016-11-147-184/+202
|\ \ \ \ \
| * | | | | Clean transactions based on time. Add HttpTransactionCache tests.Kegan Dougal2016-11-145-8/+99
| * | | | | Move .observe() up to the cache to make things neaterKegan Dougal2016-11-143-33/+11
| * | | | | Review commentsKegan Dougal2016-11-115-158/+119
| * | | | | More flake8Kegan Dougal2016-11-111-1/+3
| * | | | | Flake8 and fix whoopsieKegan Dougal2016-11-111-4/+8
| * | | | | Use ObservableDeferreds instead of Deferreds as they behave as intendedKegan Dougal2016-11-112-30/+31
| * | | | | Use observable deferreds because they are saneKegan Dougal2016-11-111-3/+4
| * | | | | Flake8Kegan Dougal2016-11-102-4/+4
| * | | | | Store Promise<Response> instead of Response for HTTP API transactionsKegan Dougal2016-11-104-88/+68
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1625 from DanielDent/patch-1Erik Johnston2016-11-121-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add support for durations in minutesDaniel Dent2016-11-121-2/+3
| | |/ / | |/| |
* | | | Merge pull request #1619 from matrix-org/erikj/pwd_provider_errorErik Johnston2016-11-091-2/+7
|\ \ \ \
| * | | | Don't assume providers raise ConfigError'sErik Johnston2016-11-081-2/+7
|/ / / /
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-11-083-2/+16
|\| | |
| * | | Merge branch 'erikj/ldap3_auth' v0.18.3Erik Johnston2016-11-083-2/+16
| |\ \ \
| | * | | Bump version and changelogErik Johnston2016-11-082-1/+14
| | * | | Explicitly set authentication mode in ldap3Erik Johnston2016-11-081-1/+2
| |/ / /
* | | | Merge pull request #1615 from matrix-org/erikj/limit_prev_eventsErik Johnston2016-11-081-0/+15
|\ \ \ \
| * | | | Sample correctlyErik Johnston2016-11-081-1/+3
| * | | | Limit the number of prev_events of new eventsErik Johnston2016-11-081-0/+13
| | |/ / | |/| |
* | | | Merge pull request #1616 from matrix-org/erikj/worker_frozen_dictErik Johnston2016-11-086-0/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Respect use_frozen_dicts option in workersErik Johnston2016-11-086-0/+22
|/ / /
* | | Merge pull request #1198 from euank/more-ip-blacklistErik Johnston2016-11-071-0/+2
|\ \ \
| * | | default config: blacklist more internal ipsEuan Kemp2016-11-061-0/+2
| |/ /
* | | Merge pull request #1195 from matrix-org/erikj/incorrect_funcErik Johnston2016-11-041-11/+2
|\ \ \
| * | | CommentErik Johnston2016-11-041-0/+1
| * | | Remove unused but buggy functionErik Johnston2016-11-041-11/+1
|/ / /
* | | Merge pull request #1193 from matrix-org/paul/metricsPaul Evans2016-11-033-71/+18
|\ \ \
| * | | Fix copypasto error in metric rename table in docsPaul "LeoNerd" Evans2016-11-031-4/+4
| * | | Rename the python-specific metrics now the docs claim that we have donePaul "LeoNerd" Evans2016-11-031-7/+9
| * | | Since we don't export per-filetype fd counts any more, delete all the code re...Paul "LeoNerd" Evans2016-11-031-36/+4
| * | | Remove now-unused 'resource' importPaul "LeoNerd" Evans2016-11-031-8/+0
| * | | Now we have new-style metrics don't bother exporting legacy-named process onesPaul "LeoNerd" Evans2016-11-031-16/+1
|/ / /
* | | Merge pull request #1192 from matrix-org/erikj/postgres_gistErik Johnston2016-11-033-1/+45
|\ \ \
| * | | Remove spurious commentErik Johnston2016-11-031-2/+2
| * | | Replace postgres GIN with GISTErik Johnston2016-11-033-1/+45
|/ / /
* | | Merge pull request #1191 from matrix-org/dbkr/non_ascii_passwordsDavid Baker2016-11-031-1/+1
|\ \ \
| * | | Don't error on non-ascii passwordsDavid Baker2016-11-031-1/+1
|/ / /
* | | Merge pull request #1190 from matrix-org/markjh/media_corsMark Haines2016-11-023-7/+22
|\ \ \
| * | | Set CORs headers on responses from the media repoMark Haines2016-11-023-7/+22
|/ / /
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-11-010-0/+0
|\| |
| * | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2Erik Johnston2016-11-0157-807/+1566
| |\ \
* | \ \ Merge pull request #1188 from matrix-org/erikj/sent_transactionsErik Johnston2016-11-011-150/+4
|\ \ \ \
| * | | | Continue to clean up received_transactionsErik Johnston2016-11-011-0/+14
| * | | | Removed unused stuffErik Johnston2016-10-311-163/+3
| * | | | Increase batching of sent transaction insertsErik Johnston2016-10-311-1/+1
* | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into developErik Johnston2016-11-013-34/+66
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Bump version and changelogErik Johnston2016-11-012-1/+7
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2Erik Johnston2016-11-011-33/+42
| |\ \ \
| | * | | Merge pull request #1187 from matrix-org/paul/metrics-howtoPaul Evans2016-10-311-33/+42
| |/| | | |/| | | |
| | * | | Add details of renamed metricsPaul "LeoNerd" Evans2016-10-311-0/+34
| | * | | Remove long-deprecated instructions about promethesus console; also fix for m...Paul "LeoNerd" Evans2016-10-281-33/+8
| |/ / / |/| | |
| * | | Changelog formattting v0.18.2-rc5Erik Johnston2016-10-281-0/+1
| * | | Bump changelog and versionMark Haines2016-10-282-1/+8
| * | | Merge branch 'develop' into release-v0.18.2Mark Haines2016-10-283-9/+9
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1184 from matrix-org/paul/metricsPaul Evans2016-10-273-9/+9
|\ \ \ \
| * | | | Set up the process collector during metrics __init__; that way all split-proc...Paul "LeoNerd" Evans2016-10-272-2/+3
| * | | | Pass the Metrics group into the process collector instead of having it find i...Paul "LeoNerd" Evans2016-10-272-8/+4
| * | | | Allow creation of a 'subspace' within a Metrics object, returning another onePaul "LeoNerd" Evans2016-10-271-0/+3
|/ / / /
| * / / Bump changelog and version v0.18.2-rc4Erik Johnston2016-10-272-1/+10
|/ / /
* | | Merge pull request #1183 from matrix-org/erikj/fix_email_updateErik Johnston2016-10-271-1/+30
|\ \ \
| * | | Use most recently added binding, not most recently seen user.Erik Johnston2016-10-271-19/+11
| * | | Fix user_threepids schema deltaErik Johnston2016-10-271-1/+38
|/ / /
* | | Update changelog v0.18.2-rc3Erik Johnston2016-10-271-0/+1
* | | Bump changelog and versionErik Johnston2016-10-272-2/+8
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2Erik Johnston2016-10-2727-170/+509
|\ \ \
| * \ \ Merge pull request #1098 from matrix-org/markjh/bearer_tokenMark Haines2016-10-256-23/+66
| |\ \ \
| | * \ \ Merge branch 'develop' into markjh/bearer_tokenMark Haines2016-09-129-45/+108
| | |\ \ \
| | * | | | Fix unit testsMark Haines2016-09-126-15/+30
| | * | | | Merge branch 'develop' into markjh/bearer_tokenMark Haines2016-09-097-9/+89
| | |\ \ \ \
| | * | | | | Allow clients to supply access_tokens as headersMark Haines2016-09-091-9/+37
| * | | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into developErik Johnston2016-10-252-1/+20
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Fixup change log v0.18.2-rc2Erik Johnston2016-10-251-2/+2
* | | | | | | Bump version and changelogErik Johnston2016-10-252-1/+20
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-21 07:26:02 +0000