summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Update the readme to use trialRichard van der Hoff2016-12-091-5/+14
* README: fix linkRichard van der Hoff2016-12-031-1/+1
* 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 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 #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
| | * | | | Merge pull request #1179 from matrix-org/erikj/typing_timer_paranoiaErik Johnston2016-10-251-2/+10
| | |\ \ \ \
| | | * | | | Fix infinite typing bugErik Johnston2016-10-241-2/+10
| | |/ / / /
| | * | | | Merge pull request #1178 from matrix-org/erikj/current_room_tokenErik Johnston2016-10-244-12/+48
| | |\ \ \ \
| | | * | | | Actually use the new functionErik Johnston2016-10-241-1/+1
| | | * | | | Fix incredubly slow back pagination queryErik Johnston2016-10-244-12/+48
| | |/ / / /
| | * | | | Merge pull request #1177 from matrix-org/paul/standard-metric-namesPaul Evans2016-10-214-66/+191
| | |\ \ \ \
| | | * | | | Split callback metric lambda functions down onto their own lines to keep line...Paul "LeoNerd" Evans2016-10-191-8/+16
| | | * | | | Adjust code for <100 char line limitPaul "LeoNerd" Evans2016-10-191-1/+1
| | | * | | | Cut the raw /proc/self/stat line up into named fields at collection timePaul "LeoNerd" Evans2016-10-191-8/+22
| | | * | | | Move the process metrics collector code into its own filePaul "LeoNerd" Evans2016-10-193-141/+161
| | | * | | | A slightly neater way to manage metric collector functionsPaul "LeoNerd" Evans2016-10-191-2/+8
| | | * | | | appease pep8Paul "LeoNerd" Evans2016-10-191-3/+5
| | | * | | | Also guard /proc/self/fds-related code with a suitable psuedoconstantPaul "LeoNerd" Evans2016-10-191-3/+5
| | | * | | | Guard registration of process-wide metrics by existence of the requisite /pro...Paul "LeoNerd" Evans2016-10-191-45/+50
| | | * | | | Add standard process_start_time_seconds metricPaul "LeoNerd" Evans2016-10-191-0/+15
| | | * | | | Add standard process_max_fds metricPaul "LeoNerd" Evans2016-10-191-0/+13
| | | * | | | Add standard process_open_fds metricPaul "LeoNerd" Evans2016-10-191-20/+29
| | | * | | | Add standard process_*_memory_bytes metricsPaul "LeoNerd" Evans2016-10-191-0/+8
| | | * | | | Use /proc/self/stat to generate the new process_cpu_*_seconds_total metricsPaul "LeoNerd" Evans2016-10-191-4/+12
| | | * | | | Export CPU usage metrics also under prometheus-standard metric namePaul "LeoNerd" Evans2016-10-191-0/+15
| | | * | | | Callback metric values might not just be integers - allow floatsPaul "LeoNerd" Evans2016-10-191-2/+2
| | * | | | | Merge pull request #1175 from matrix-org/luke/feature-configurable-as-rate-li...Luke Barnard2016-10-205-12/+35
| | |\ \ \ \ \
| | | * | | | | StyleLuke Barnard2016-10-201-2/+3
| | | * | | | | Closing brace on following lineLuke Barnard2016-10-201-1/+2
| | | * | | | | as_user->app_service, less redundant comments, better positioned commentsLuke Barnard2016-10-203-14/+11
| | | * | | | | flake8Luke Barnard2016-10-201-1/+3
| | | * | | | | Use real AS object by passing it through the requesterLuke Barnard2016-10-203-18/+15
| | | * | | | | Allow Configurable Rate Limiting Per ASLuke Barnard2016-10-183-1/+26
| | * | | | | | Merge pull request #1164 from pik/error-codesErik Johnston2016-10-194-48/+94
| | |\ \ \ \ \ \
| | | * | | | | | Refactor test_filter to use real DataStorepik2016-10-183-46/+83
| | | * | | | | | Fix MockHttpRequest always returning M_UNKNOWN errcode in testingpik2016-10-141-1/+1
| | | * | | | | | Error codes for filtersAlexander Maznev2016-10-142-7/+16
| | * | | | | | | Merge pull request #1176 from matrix-org/erikj/eager_ratelimit_checkErik Johnston2016-10-192-6/+25
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | CommentErik Johnston2016-10-191-0/+3
| | | * | | | | | Check whether to ratelimit sooner to avoid workErik Johnston2016-10-192-6/+22
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge pull request #1170 from matrix-org/dbkr/password_reset_case_insensitiveDavid Baker2016-10-192-0/+35
| | |\ \ \ \ \ \
| | | * | | | | | Latest delta is now 37David Baker2016-10-191-0/+0
| | | * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_i...David Baker2016-10-198-6/+117
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #1174 from matrix-org/erikj/email_push_noopErik Johnston2016-10-182-1/+5
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Fix push notifications for a single unread messageErik Johnston2016-10-181-1/+1
| | | * | | | | | Reduce redundant database work in email pusherErik Johnston2016-10-181-0/+4
| | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into developErik Johnston2016-10-182-2/+29
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Update changelog v0.18.2-rc1Erik Johnston2016-10-171-4/+7
| * | | | | | | Bump version and changelogErik Johnston2016-10-172-2/+26
| |/ / / / / /
| * | | | | | Merge pull request #1113 from matrix-org/erikj/remove_authErik Johnston2016-10-173-2/+82
| |\ \ \ \ \ \
| | * | | | | | Bump schema versionErik Johnston2016-10-172-1/+1
| | * | | | | | Remove TODOErik Johnston2016-10-171-2/+0
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_authErik Johnston2016-10-1780-1379/+2949
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #1162 from larroy/masterErik Johnston2016-10-141-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Use sys.executable instead of hardcoded python. fixes #1161Pedro Larroy2016-10-081-1/+1
| |/ / / / / / / |/| | | | | | |
| | * | | | | | Drop some unused indicesErik Johnston2016-10-173-17/+83
| | * | | | | | Remove redundant event_auth indexErik Johnston2016-09-131-0/+16
| | | * | | | | Convert emails to lowercase when storingDavid Baker2016-10-192-1/+20
| | | * | | | | Revert part of 6207399David Baker2016-10-141-20/+10
| | | * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_i...David Baker2016-10-1417-477/+691
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #1169 from matrix-org/erikj/fix_email_notifsErik Johnston2016-10-141-14/+25
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_...Erik Johnston2016-10-1418-508/+734
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_deleteRichard van der Hoff2016-10-131-5/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Handle delete device requests with no bodyRichard van der Hoff2016-10-121-2/+11
| | * | | | | | | | User-interactive auth on delete deviceRichard van der Hoff2016-10-121-5/+11
| * | | | | | | | | Merge pull request #1167 from matrix-org/markjh/fingerprintsMark Haines2016-10-122-13/+46
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Explain how long the servers can cache the TLS fingerprints forMark Haines2016-10-121-3/+4
| | * | | | | | | | | Improve comment formattingMark Haines2016-10-122-4/+7
| | * | | | | | | | | Add config option for adding additional TLS fingerprintsMark Haines2016-10-112-12/+41
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #1155 from matrix-org/erikj/pluggable_pwd_authErik Johnston2016-10-127-401/+486
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Implement pluggable password authErik Johnston2016-10-037-401/+486
| * | | | | | | | | | Merge pull request #1141 from matrix-org/erikj/replication_noopErik Johnston2016-10-116-44/+114
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio...Erik Johnston2016-10-1128-331/+599
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix check of wrong variableErik Johnston2016-10-111-1/+1
| | * | | | | | | | | Reduce DB hits for replicationErik Johnston2016-09-236-45/+115
| | | | | * | | | | | Fix email push notifs being droppedErik Johnston2016-10-131-14/+25
| | | | | | | * | | | Make password reset email field case insensitiveDavid Baker2016-10-142-10/+36
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signupRichard van der Hoff2016-10-111-3/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Work around email-spamming Riot bugRichard van der Hoff2016-10-111-3/+14
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #1157 from Rugvip/nolimitErik Johnston2016-10-1114-77/+64
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | rest/client/v1/register: use the correct requester in createUserPatrik Oldsberg2016-10-064-31/+22
| | * | | | | | | | handlers/profile: added admin override for set_displayname and set_avatar_urlPatrik Oldsberg2016-10-061-4/+4
| | * | | | | | | | handers: do not ratelimit app service sendersPatrik Oldsberg2016-10-061-1/+7
| | * | | | | | | | storage/appservice: make appservice methods only relying on the cache synchro...Patrik Oldsberg2016-10-0610-41/+31
| * | | | | | | | | Merge pull request #1150 from Rugvip/state_keyErik Johnston2016-10-111-10/+0
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | api/auth: fix for not being allowed to set your own state_keyPatrik Oldsberg2016-09-301-10/+0
| * | | | | | | | | Merge pull request #1160 from matrix-org/rav/401_on_password_failRichard van der Hoff2016-10-071-32/+52
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Interactive Auth: Return 401 from for incorrect passwordRichard van der Hoff2016-10-071-32/+52
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #1159 from matrix-org/rav/uia_fallback_postmessageRichard van der Hoff2016-10-061-1/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | window.postmessage for Interactive Auth fallbackRichard van der Hoff2016-10-061-1/+3
| | |/ / / / / / /
| * | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-10-052-1/+30
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse v0.18.1Erik Johnston2016-10-0524-611/+942
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump changelog and versionErik Johnston2016-10-052-1/+7
| * | | | | | | | | Update changelog v0.18.1-rc1Erik Johnston2016-09-301-0/+2
| * | | | | | | | | Bump version and changelogErik Johnston2016-09-302-1/+22
| | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brandDavid Baker2016-10-041-1/+3
| |/| | | | | | |
| | * | | | | | | Add Riot brand to email notifsDavid Baker2016-10-041-1/+3
| |/ / / / / / /
| * | | | | | | Merge pull request #1153 from matrix-org/erikj/ldap_restructureErik Johnston2016-09-301-87/+192
| |\ \ \ \ \ \ \
| | * | | | | | | Restructure ldap authenticationMartin Weinelt2016-09-291-87/+192
| |/ / / / / / /
| * | | | | | | Merge pull request #1145 from matrix-org/erikj/fix_reindexErik Johnston2016-09-291-15/+29
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix background reindex of origin_server_tsErik Johnston2016-09-271-15/+29
| * | | | | | | Merge pull request #1146 from matrix-org/erikj/port_script_fixErik Johnston2016-09-271-0/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Update port script with recently added tablesErik Johnston2016-09-271-0/+9
| | |/ / / / / /
| * | | | | | | Merge pull request #1144 from matrix-org/erikj/sqlite_state_perfErik Johnston2016-09-271-23/+29
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove duplicationErik Johnston2016-09-271-31/+19
| | * | | | | | Remove unused variableErik Johnston2016-09-271-3/+0
| | * | | | | | Fix perf of fetching state in SQLiteErik Johnston2016-09-261-20/+41
| |/ / / / / /
| * | | | | | Merge pull request #1140 from matrix-org/erikj/typing_fed_timeoutErik Johnston2016-09-266-83/+122
| |\ \ \ \ \ \
| | * | | | | | Move FEDERATION_PING_INTERVAL timer. Update log lineErik Johnston2016-09-231-8/+10
| | * | | | | | Time out typing over federationErik Johnston2016-09-236-83/+120
| | |/ / / / /
| * | | | | | typoMatthew Hodgson2016-09-251-1/+1
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-09-232-1/+55
| |\ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
* | | | | | Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse v0.18.0Erik Johnston2016-09-1980-777/+3089
|\ \ \ \ \ \
| * | | | | | Bump version and changelogErik Johnston2016-09-192-3/+16
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0Erik Johnston2016-09-195-118/+194
| |\ \ \ \ \ \
| * | | | | | | Update changelog v0.18.0-rc1Erik Johnston2016-09-161-2/+3
| * | | | | | | Update changelog and bump versionErik Johnston2016-09-162-1/+41
* | | | | | | | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse v0.17.3Erik Johnston2016-09-093-3/+10
|\ \ \ \ \ \ \ \
| | | | * \ \ \ \ Merge pull request #1136 from matrix-org/erikj/fix_signed_3pidErik Johnston2016-09-223-12/+35
| | | | |\ \ \ \ \
| | | | | * | | | | Update commentsErik Johnston2016-09-221-2/+3
| | | | | * | | | | Add commentsErik Johnston2016-09-222-0/+6
| | | | | * | | | | Shuffle things around to make unit tests workErik Johnston2016-09-222-15/+16
| | | | | * | | | | Allow invites via 3pid to bypass sender sig checkErik Johnston2016-09-222-7/+22
| | | | * | | | | | Merge pull request #1132 from matrix-org/erikj/initial_sync_splitErik Johnston2016-09-226-383/+461
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | | * | | | | Support /initialSync in synchrotron workerErik Johnston2016-09-216-383/+461
| | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merge pull request #1134 from matrix-org/erikj/fix_stream_public_deletionErik Johnston2016-09-213-6/+31
| | | | |\ \ \ \ \
| | | | | * | | | | Match against event_id, rather than room_idErik Johnston2016-09-211-1/+1
| | | | | * | | | | Remove spurious AS clauseErik Johnston2016-09-211-1/+1
| | | | | * | | | | Update correct tableErik Johnston2016-09-211-6/+10
| | | | | * | | | | Readd entries to public_room_list_stream that were deletedErik Johnston2016-09-212-1/+23
| | | | | * | | | | Fix _delete_old_forward_extrem_cache queryErik Johnston2016-09-211-5/+4
| | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merge pull request #1133 from matrix-org/erikj/public_room_countErik Johnston2016-09-211-0/+3
| | | |/| | | | |
| | | | * | | | | Add total_room_count_estimate to /publicRoomsErik Johnston2016-09-211-0/+3
| | | |/ / / / /
| | | * | | | | Merge pull request #1131 from matrix-org/matthew/e2e-notifsErik Johnston2016-09-191-0/+49
| | | |\ \ \ \ \
| | | | * | | | | _id field must uniquely identify different conditionsErik Johnston2016-09-191-2/+2
| | | | * | | | | proposal for notifying on e2e eventsMatthew Hodgson2016-09-171-0/+49
| | | * | | | | | Merge pull request #1130 from matrix-org/erikj/fix_pubroom_pagErik Johnston2016-09-191-12/+25
| | | |\ \ \ \ \ \
| | | | * | | | | | PEP8Erik Johnston2016-09-171-1/+1
| | | | * | | | | | Handle fact that _generate_room_entry may not return a room entryErik Johnston2016-09-171-12/+25
| | | * | | | | | | Enable guest access to POST /publicRoomsErik Johnston2016-09-171-2/+2
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge pull request #1129 from matrix-org/erikj/fix_pubroom_pagErik Johnston2016-09-171-110/+123
| | | |\| | | | |
| | | | * | | | | SpellingErik Johnston2016-09-171-1/+1
| | | | * | | | | Fix and clean up publicRooms paginationErik Johnston2016-09-171-110/+123
| | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge pull request #1127 from matrix-org/dbkr/publicroom_search_case_insensitiveErik Johnston2016-09-171-4/+4
| | | |\ \ \ \ \
| | | | * | | | | Make public room search case insensitiveDavid Baker2016-09-161-4/+4
| | | |/ / / / / | | |/| | | | |
| | | * | | | | mention client_reader workerMatthew Hodgson2016-09-171-0/+1
| | | * | | | | fix logger for client_reader workerMatthew Hodgson2016-09-171-1/+1
| | |/ / / / /
| | * | | | | Fix public room pagination for client_reader appErik Johnston2016-09-161-0/+1
| | * | | | | Merge pull request #1126 from matrix-org/erikj/public_room_cacheErik Johnston2016-09-167-24/+158
| | |\ \ \ \ \
| | | * | | | | CommentErik Johnston2016-09-161-0/+2
| | | * | | | | Make POST /publicRooms require authErik Johnston2016-09-161-2/+1
| | | * | | | | CommentErik Johnston2016-09-161-0/+2
| | | * | | | | Add remote reoom cacheErik Johnston2016-09-161-2/+23
| | | * | | | | Support filtering remote room listsErik Johnston2016-09-163-6/+18
| | | * | | | | Filter remote rooms lists locallyErik Johnston2016-09-162-11/+25
| | | * | | | | Don't cache searched in /publicRoomsErik Johnston2016-09-161-1/+5
| | | * | | | | Add new storage function to slave storeErik Johnston2016-09-161-0/+1
| | | * | | | | Add very basic filter API to /publicRoomsErik Johnston2016-09-151-5/+18
| | | * | | | | Change the way we calculate new_limit in /publicRooms and add POST APIErik Johnston2016-09-152-15/+62
| | | * | | | | Handling expiring stream extrems correctly.Erik Johnston2016-09-152-3/+22
| | |/ / / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-01 09:43:09 +0000