summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Add a comment to a variable in federation code to explain what it's for paul/SYN-560Paul "LeoNerd" Evans2016-01-071-0/+1
* Use the returned backfill events to fill in any missing auth events before re...Paul "LeoNerd" Evans2015-12-211-0/+5
* Delete all the .coverage files, including the combined .coverageMark Haines2015-12-211-1/+2
* Use an absolute path when specifying the directory for synapse in jenkins.shMark Haines2015-12-211-8/+8
* Remove accidentally committed debug loggingMark Haines2015-12-211-1/+0
* Merge pull request #452 from matrix-org/paul/SYN-558Mark Haines2015-12-211-1/+3
|\
| * Actually look up required remote server key IDsPaul "LeoNerd" Evans2015-12-181-1/+3
|/
* Merge pull request #451 from matrix-org/markjh/branch_coverageMark Haines2015-12-182-6/+18
|\
| * Generate code coverage report when running jenkins.shMark Haines2015-12-182-6/+18
|/
* Merge pull request #450 from matrix-org/matthew/no-identiconsMatthew Hodgson2015-12-181-19/+3
|\
| * fix indentation levelMatthew Hodgson2015-12-171-3/+3
| * stop generating default identicons. reverts most of 582019f870adbc4a8a8a9ef97...Matthew Hodgson2015-12-171-19/+3
* | Merge branch 'release-v0.12.0' into developDavid Baker2015-12-181-1/+1
|\ \
| * | Fix typo that broke registration on the mobile clientsDavid Baker2015-12-181-1/+1
* | | Merge pull request #449 from matrix-org/daniel/3pidDaniel Wagner-Hall2015-12-181-1/+31
|\ \ \ | |_|/ |/| |
| * | Add display_name to 3pid invite in m.room.member invitesDaniel Wagner-Hall2015-12-171-1/+31
* | | Merge pull request #448 from matrix-org/daniel/3pidDaniel Wagner-Hall2015-12-172-2/+13
|\| | | |/ |/|
| * Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-172-2/+13
|/
* Merge pull request #447 from matrix-org/rav/fix_search_paginationMark Haines2015-12-171-2/+4
|\
| * Fix 500 error when back-paginating search resultsRichard van der Hoff2015-12-171-2/+4
|/
* Fix typoDaniel Wagner-Hall2015-12-161-1/+1
* Merge pull request #446 from matrix-org/daniel/invitemetadataDaniel Wagner-Hall2015-12-161-7/+60
|\
| * Give the IS a bunch more 3pid invite contextDaniel Wagner-Hall2015-12-161-7/+60
|/
* Merge pull request #440 from matrix-org/daniel/iseMark Haines2015-12-161-2/+5
|\
| * Include errcode on Internal Server ErrorDaniel Wagner-Hall2015-12-141-2/+5
* | Merge branch 'release-v0.12.0' into developMark Haines2015-12-164-5/+21
|\ \
| * \ Merge pull request #445 from matrix-org/markjh/rebind_threepidMark Haines2015-12-151-1/+1
| |\ \
| | * | Allow users to change which account a 3pid is bound toMark Haines2015-12-151-1/+1
| |/ /
| * | Changelog and version bump for v0.12.0-rc2 v0.12.0-rc2Mark Haines2015-12-142-1/+12
| * | Merge pull request #444 from matrix-org/markjh/presence_raceMark Haines2015-12-141-3/+8
| |\ \
| | * | Fix a race between started/stopped streamMark Haines2015-12-141-3/+8
| |/ /
* | | Merge pull request #443 from matrix-org/markjh/commentaryMark Haines2015-12-141-2/+15
|\ \ \
| * | | Fix spacingMark Haines2015-12-141-1/+1
| * | | Fix logging to lie lessMark Haines2015-12-141-2/+9
| * | | Add commentary for fix in PR#442Mark Haines2015-12-141-0/+6
|/ / /
* | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-143-7/+23
|\| |
| * | Merge pull request #441 from matrix-org/markjh/fts_skip_invalidMark Haines2015-12-141-0/+5
| |\ \
| | * | Skip events that where the body, name or topic isn't a string when back popul...Mark Haines2015-12-141-0/+5
| * | | Merge pull request #442 from matrix-org/markjh/missing_prev_contentMark Haines2015-12-141-3/+6
| |\ \ \
| | * | | Combine the prev content testsMark Haines2015-12-141-14/+12
| | * | | Check whether prev_content or prev_sender is set before trying to rollback stateMark Haines2015-12-141-8/+13
| |/ / /
| * | | Merge pull request #437 from matrix-org/markjh/parallel_syncMark Haines2015-12-141-4/+12
| |\ \ \ | | |/ / | |/| |
| | * | Do the /sync in parallel accross the rooms like /initialSync doesMark Haines2015-12-111-4/+12
| |/ /
* | | Merge pull request #439 from matrix-org/daniel/typoDaniel Wagner-Hall2015-12-141-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix typoDaniel Wagner-Hall2015-12-141-1/+1
|/ /
* | Merge pull request #438 from matrix-org/markjh/fix_search_sqlMark Haines2015-12-141-1/+1
|\ \
| * | Fix typo in sql for full text search on sqlite3Mark Haines2015-12-141-1/+1
|/ /
* | Merge branch 'release-v0.12.0' into developMark Haines2015-12-126-12/+47
|\|
| * Merge pull request #436 from matrix-org/markjh/pip_instructionsMark Haines2015-12-111-5/+3
| |\
| | * SYN-90: We don't need --proccess-dependency-linksMark Haines2015-12-111-5/+3
| |/
| * Merge pull request #434 from matrix-org/markjh/forget_roomsMark Haines2015-12-103-6/+9
| |\
| | * Missing yieldMark Haines2015-12-101-1/+1
| | * Add caches for whether a room has been forgotten by a userMark Haines2015-12-102-5/+8
| |/
| * Mark the version as a -rc1 release candidate v0.12.0-rc1Mark Haines2015-12-102-3/+3
| * Update release dateMark Haines2015-12-101-1/+1
| * Bump synapse version to v0.12.0Mark Haines2015-12-091-1/+1
| * Add to changelogMark Haines2015-12-091-7/+7
| * Changelog for v0.12.0Mark Haines2015-12-091-0/+34
* | Merge pull request #435 from matrix-org/erikj/searchErik Johnston2015-12-112-9/+72
|\ \
| * | Include approximate count of search resultsErik Johnston2015-12-112-3/+61
| * | Use more efficient query formErik Johnston2015-12-111-8/+13
* | | Merge pull request #433 from matrix-org/paul/tiny-fixesPaul Evans2015-12-111-6/+6
|\ \ \ | |/ / |/| |
| * | Ensure that the event that gets persisted is the one that was signedPaul "LeoNerd" Evans2015-12-101-6/+6
| * | Merge branch 'develop' into paul/tiny-fixesPaul "LeoNerd" Evans2015-12-1095-903/+2496
| |\|
* | | throwaway 1-liner for generating password hashesMatthew Hodgson2015-12-101-0/+1
| |/ |/|
* | Merge pull request #432 from matrix-org/pushrules_refactorDavid Baker2015-12-092-185/+234
|\ \
| * | pep8David Baker2015-12-091-4/+4
| * | Split out the push rule evaluator into a separate file so it can be more read...David Baker2015-12-092-185/+234
|/ /
* | Merge pull request #431 from matrix-org/markjh/filter_inlineMark Haines2015-12-091-9/+21
|\ \
| * | Allow filter JSON object in the filter query parameter in /syncMark Haines2015-12-091-9/+21
|/ /
* | Merge pull request #430 from matrix-org/daniel/unstableDaniel Wagner-Hall2015-12-095-85/+80
|\ \
| * | Actually host r0 and unstable prefixesDaniel Wagner-Hall2015-12-085-85/+80
* | | Merge pull request #405 from matrix-org/erikj/search-tsErik Johnston2015-12-081-6/+4
|\ \ \ | |/ / |/| |
| * | Change the result tict to be a listErik Johnston2015-12-011-6/+4
* | | Merge pull request #429 from matrix-org/markjh/db_countersMark Haines2015-12-085-4/+38
|\ \ \
| * | | Track the time spent in the database per request.Mark Haines2015-12-075-4/+38
|/ / /
* | | Merge pull request #423 from matrix-org/markjh/archived_flagMark Haines2015-12-072-6/+10
|\ \ \
| * | | Only include the archived rooms if a include_leave flag in set in the filterMark Haines2015-12-042-6/+10
* | | | Merge remote-tracking branch 'origin/master' into developMark Haines2015-12-074-2/+30
|\ \ \ \
| * \ \ \ Merge pull request #426 from OlegGirko/fix_mock_importMark Haines2015-12-071-1/+1
| |\ \ \ \
| | * | | | Fix mock import in tests.Oleg Girko2015-12-061-1/+1
| |/ / / /
| * | | | Merge branch 'release-v0.11.1' of github.com:matrix-org/synapse v0.11.1Erik Johnston2015-11-2022-114/+225
| |\ \ \ \
| | * \ \ \ Merge branch 'erikj/perspective_limiter' into release-v0.11.1Erik Johnston2015-11-202-22/+21
| | |\ \ \ \
| | * | | | | Mention report_stats in upgrade.rstErik Johnston2015-11-201-0/+13
| | * | | | | Fix englishErik Johnston2015-11-201-2/+2
| | * | | | | Bump changes and versionErik Johnston2015-11-202-1/+16
* | | | | | | Merge pull request #428 from matrix-org/pusher_api_logDavid Baker2015-12-071-0/+6
|\ \ \ \ \ \ \
| * | | | | | | also do more structured loggingDavid Baker2015-12-071-0/+1
| * | | | | | | pep8David Baker2015-12-071-0/+1
| * | | | | | | Add logging to pushers API to log the body of the requestDavid Baker2015-12-071-0/+4
|/ / / / / / /
* | | | | | | Merge pull request #427 from matrix-org/markjh/log_contextMark Haines2015-12-071-16/+24
|\ \ \ \ \ \ \
| * | | | | | | Add a setter for the current log context.Mark Haines2015-12-071-16/+24
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #424 from matrix-org/daniel/pushdictificationDaniel Wagner-Hall2015-12-071-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Take object not boolDaniel Wagner-Hall2015-12-071-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #425 from MadsRC/developMatthew Hodgson2015-12-051-2/+15
|\ \ \ \ \ \ \
| * | | | | | | Added installation instructions for postgres on CentOS 7Mads R. Christensen2015-12-051-2/+15
* | | | | | | | Merge pull request #422 from matrix-org/markjh/schemaMark Haines2015-12-045-24/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump schema version.Mark Haines2015-12-045-24/+37
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #421 from matrix-org/markjh/resource_metricsMark Haines2015-12-041-0/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add metrics to track the cpu on the main thread consumed by each type of requestMark Haines2015-12-041-0/+17
|/ / / / / / /
* | | | | | | Merge pull request #420 from matrix-org/markjh/resource_usageMark Haines2015-12-044-11/+91
|\ \ \ \ \ \ \
| * | | | | | | Add comments to explain why we are hardcoding RUSAGE_THREADMark Haines2015-12-041-0/+8
| * | | | | | | Fix warningsMark Haines2015-12-042-3/+13
| * | | | | | | Track the cpu used in the main thread by each logging contextMark Haines2015-12-033-10/+72
* | | | | | | | Merge pull request #419 from matrix-org/markjh/reuse_captcha_clientMark Haines2015-12-031-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Reuse the captcha client rather than creating a new one for each requestMark Haines2015-12-031-4/+2
| |/ / / / / / /
* / / / / / / / Flatten devices into a dict, not a listDaniel Wagner-Hall2015-12-031-4/+3
|/ / / / / / /
* | | | | | | Merge pull request #414 from matrix-org/erikj/if_not_existsErik Johnston2015-12-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Older versions of SQLite don't like IF NOT EXISTS in virtual tablesErik Johnston2015-12-021-1/+1
* | | | | | | | Merge pull request #415 from matrix-org/daniel/endpointsDaniel Wagner-Hall2015-12-036-35/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Update endpoints to reflect current specDaniel Wagner-Hall2015-12-026-35/+11
* | | | | | | | | Merge pull request #418 from matrix-org/daniel/whoisDaniel Wagner-Hall2015-12-032-18/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix implementation of /admin/whoisDaniel Wagner-Hall2015-12-022-18/+12
| |/ / / / / / / /
* | | | | | | | | Merge pull request #417 from matrix-org/fix_db_v15_postgresDavid Baker2015-12-021-12/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Just replace the table definition with the one from full_schema 16David Baker2015-12-021-11/+10
| * | | | | | | | | Fix schema delta 15 on postgres in the very unlikley event that anyone upgrad...David Baker2015-12-021-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #416 from matrix-org/markjh/idempotent_stateMark Haines2015-12-021-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Make state updates in the C+S API idempotentMark Haines2015-12-021-0/+12
|/ / / / / / / /
* | | | | | | | Merge pull request #412 from matrix-org/erikj/searchErik Johnston2015-12-021-11/+36
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Throw if unrecognized DB typeErik Johnston2015-12-021-1/+4
| * | | | | | | Fix so highlight matching works againErik Johnston2015-12-021-8/+13
| * | | | | | | Remove deuplication. Add comment about regex.Erik Johnston2015-12-021-21/+11
| * | | | | | | Search: Add prefix matching supportErik Johnston2015-12-021-5/+32
* | | | | | | | Merge pull request #410 from matrix-org/markjh/edu_frequencyMark Haines2015-12-022-5/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Use the context returned by _handle_new_eventMark Haines2015-12-021-4/+1
| * | | | | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-021-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add commentsMark Haines2015-12-022-0/+6
| * | | | | | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-0211-69/+109
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Only fire user_joined_room if the membership has changedMark Haines2015-12-011-3/+8
| * | | | | | | | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-0145-243/+845
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Only fire user_joined_room on the distributor if the user has actually joined...Mark Haines2015-12-011-4/+6
* | | | | | | | | | | | Merge pull request #413 from matrix-org/markjh/reuse_http_clientMark Haines2015-12-023-18/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reuse a single http client, rather than creating new onesMark Haines2015-12-023-18/+10
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #411 from matrix-org/default_dont_notifyDavid Baker2015-12-021-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Change the m.room.message rule to be disabled by default so we only notify fo...David Baker2015-12-021-0/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fix typo in collect_presencelike_dataMark Haines2015-12-021-1/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #409 from MadsRC/developErik Johnston2015-12-022-0/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Added a single line to explain what the server_name is used forMads R. Christensen2015-12-021-0/+1
| * | | | | | | | | Added a few lines to better explain how to run Synapse on a FQDN that is not ...Mads R. Christensen2015-12-021-0/+4
* | | | | | | | | | Merge pull request #408 from matrix-org/markjh/distributor_facadeMark Haines2015-12-027-53/+78
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into markjh/distributor_facadeMark Haines2015-12-011-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Wrap calls to distributor.fire in appropriately named functions so that stati...Mark Haines2015-12-017-53/+78
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #406 from matrix-org/erikj/searchErik Johnston2015-12-021-3/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Search: Don't disregard grouping info in pagination tokensErik Johnston2015-12-011-3/+12
* | | | | | | | | | | various fixes - thanks to Mark White for pointing out you need to run synapse...Matthew Hodgson2015-12-011-12/+13
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix definitions scriptMark Haines2015-12-011-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #392 from matrix-org/markjh/client_configMark Haines2015-12-0111-25/+476
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add API for setting account_data globaly or on a per room basisMark Haines2015-12-0111-25/+476
* | | | | | | | | | Merge pull request #407 from MadsRC/developMatthew Hodgson2015-12-011-3/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Added --report-status=yes|no as Synapse won't generate the config without itMads R. Christensen2015-12-011-2/+3
| * | | | | | | | Added libffi-devel in CentOS 7 installation requirements and fixed indentatio...Mads R. Christensen2015-12-011-2/+2
* | | | | | | | | Merge pull request #400 from matrix-org/daniel/versioningDaniel Wagner-Hall2015-12-0127-117/+133
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0127-117/+133
|/ / / / / / / /
* | | | | | | | Merge pull request #404 from matrix-org/markjh/trivial_renameMark Haines2015-12-013-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | rename the method in the tests as wellMark Haines2015-12-011-3/+3
| * | | | | | | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ...Mark Haines2015-12-012-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #402 from matrix-org/markjh/event_formattingMark Haines2015-12-011-9/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Only add the user_id if the sender is presentMark Haines2015-12-011-1/+3
| * | | | | | | | Copy rather than move the fields to shuffle between a v1 and a v2 event.Mark Haines2015-11-301-9/+5
* | | | | | | | | Merge pull request #403 from matrix-org/erikj/search-tsErik Johnston2015-12-014-84/+220
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Tidy up a bitErik Johnston2015-12-011-8/+9
| * | | | | | | Allow paginating search ordered by recentsErik Johnston2015-11-304-84/+219
* | | | | | | | Add options to definitions.py to fetch referrers and to output dotMark Haines2015-12-011-6/+39
* | | | | | | | Merge pull request #398 from matrix-org/markjh/jenkins_postgresMark Haines2015-12-011-1/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Write the tap results for each database to different files when running sytestMark Haines2015-12-011-2/+2
| * | | | | | | | Set the port when running sytest under postgresqlMark Haines2015-12-011-1/+1
| * | | | | | | | Use a PORT_BASE environment variable to configure the ports that sytest usesMark Haines2015-12-011-12/+4
| * | | | | | | | Run sytest against postgresql if appropriate databases exist for it to run ag...Mark Haines2015-11-261-0/+33
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #399 from matrix-org/erikj/searchErik Johnston2015-12-012-22/+120
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * / / / / / Return words to highlight in search resultsErik Johnston2015-11-272-22/+120
|/ / / / / /
* | | | | | Merge pull request #397 from matrix-org/erikj/redaction_inequalityErik Johnston2015-11-261-1/+1
|\ \ \ \ \ \
| * | | | | | Allow user to redact with an equal powerErik Johnston2015-11-261-1/+1
|/ / / / / /
* | | | | | Fix SQL for postgres againDaniel Wagner-Hall2015-11-231-1/+1
* | | | | | Fix SQL for postgresDaniel Wagner-Hall2015-11-231-1/+1
* | | | | | Remove size specifier for database columnDaniel Wagner-Hall2015-11-231-1/+3
* | | | | | Merge pull request #375 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-231-10/+15
|\ \ \ \ \ \
| * | | | | | Clean up room initialSync for guest usersDaniel Wagner-Hall2015-11-131-10/+15
* | | | | | | Merge pull request #396 from MadsRC/developMatthew Hodgson2015-11-212-0/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Added myself to AUTHORS.rstMads R. Christensen2015-11-201-0/+3
| * | | | | | Added prerequisite instructions for CentOS 7Mads R. Christensen2015-11-201-0/+8
|/ / / / / /
* | | | | | Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-206-5/+118
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into danie...Daniel Wagner-Hall2015-11-1918-87/+180
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-1918-87/+180
| | |\ \ \ \ \ \
| * | | | | | | | Ignore forgotten rooms in v2 syncDaniel Wagner-Hall2015-11-191-1/+1
| |/ / / / / / /
| * | | | | | | Simplify codeDaniel Wagner-Hall2015-11-192-8/+6
| * | | | | | | Apply forgetting properly to historical eventsDaniel Wagner-Hall2015-11-182-3/+41
| * | | | | | | Allow users to forget roomsDaniel Wagner-Hall2015-11-176-4/+81
* | | | | | | | Merge pull request #395 from matrix-org/erikj/perspective_limiterErik Johnston2015-11-202-22/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix typoErik Johnston2015-11-202-3/+3
| * | | | | | Don't limit connections to perspective serversErik Johnston2015-11-202-22/+21
|/ / / / / /
* | | | | | Merge pull request #394 from matrix-org/erikj/searchErik Johnston2015-11-201-1/+54
|\ \ \ \ \ \
| * | | | | | Add option to include the current room stateErik Johnston2015-11-201-0/+24
| * | | | | | Optionally include historic profile infoErik Johnston2015-11-201-1/+30
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #389 from matrix-org/rav/flatten_sync_responseRichard van der Hoff2015-11-202-27/+17
|\ \ \ \ \ \
| * | | | | | Merge branch 'develop' into rav/flatten_sync_responsePaul "LeoNerd" Evans2015-11-1917-86/+162
| |\| | | | |
| * | | | | | Put back the 'state.events' subobjectRichard van der Hoff2015-11-191-1/+1
| * | | | | | v2 /sync: Rename the keys of the 'rooms' object to match member statesRichard van der Hoff2015-11-191-3/+3
| * | | | | | Flatten the /sync response to remove the event_mapRichard van der Hoff2015-11-192-24/+14
* | | | | | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flowErik Johnston2015-11-201-1/+10
|\ \ \ \ \ \ \
| * | | | | | | CommentErik Johnston2015-11-201-0/+8
| * | | | | | | Remove m.login.token from advertised flows.Erik Johnston2015-11-191-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #393 from matrix-org/erikj/destination_retry_maxErik Johnston2015-11-201-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use min and not max to set an upper bound on retry intervalErik Johnston2015-11-201-2/+2
| |/ / / / /
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-11-192-1/+6
|\| | | | |
| * | | | | Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse v0.11.0-r2Erik Johnston2015-11-194-28/+78
| |\ \ \ \ \
| | * | | | | Bump changes and versionErik Johnston2015-11-192-1/+6
| | * | | | | Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2Erik Johnston2015-11-191-11/+44
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_dataMark Haines2015-11-1911-49/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename the database tableMark Haines2015-11-181-0/+17
| * | | | | | | | s/private_user_data/account_data/Mark Haines2015-11-1810-49/+49
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #382 from matrix-org/daniel/macarooncleanupDaniel Wagner-Hall2015-11-192-9/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Take a boolean not a list of lambdasDaniel Wagner-Hall2015-11-192-9/+18
|/ / / / / / / /
* | | | | | | | Merge pull request #388 from matrix-org/erikj/messagesErik Johnston2015-11-191-16/+28
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | CommentErik Johnston2015-11-191-0/+2
| * | | | | | | Split out text for missing config options.Erik Johnston2015-11-181-16/+26
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #387 from matrix-org/erikj/fix_port_scriptErik Johnston2015-11-191-11/+44
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | SpellingErik Johnston2015-11-191-1/+1
| * | | | | Fix database port script to work with new event_search tableErik Johnston2015-11-181-11/+44
* | | | | | Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cachedDaniel Wagner-Hall2015-11-181-2/+8
|\ \ \ \ \ \
| * | | | | | Share sytest clone across runsDaniel Wagner-Hall2015-11-181-2/+8
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-11-181-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Erik pointed out we should advise on the lack of included clientOddvar Lovaas2015-11-181-0/+3
| |/ / / /
* | / / / Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-11-183-1/+9
|\| | | | | |/ / / |/| | |
| * | | Merge branch 'hotfixes-v0.11.0-r1' v0.11.0-r1Erik Johnston2015-11-187-8/+49
| |\ \ \
| | * | | Change dateErik Johnston2015-11-181-1/+1
| | * | | Better change logErik Johnston2015-11-181-2/+2
| | * | | Bump changelog and versionErik Johnston2015-11-172-1/+7
| * | | | adding link to apt repoOddvar Lovaas2015-11-181-0/+2
* | | | | Merge pull request #384 from matrix-org/erikj/shorter_retriesErik Johnston2015-11-175-7/+39
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update testsErik Johnston2015-11-173-0/+17
| * | | | Add commentErik Johnston2015-11-171-0/+2
| * | | | Only retry federation requests for a long time for background requestsErik Johnston2015-11-172-7/+20
* | | | | Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into developErik Johnston2015-11-171-0/+3
|\| | | |
| * | | | Implement required method 'resumeProducing'Erik Johnston2015-11-171-0/+3
| |/ / /
| * | | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse v0.11.0Erik Johnston2015-11-17172-2810/+8255
| |\ \ \
* | \ \ \ Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into developErik Johnston2015-11-173-3/+17
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Slightly more aggressive retry timers at HTTP levelErik Johnston2015-11-171-2/+3
| * | | | Bump changelog and versionErik Johnston2015-11-172-1/+6
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-1710-45/+265
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserverErik Johnston2015-11-175-39/+199
|\ \ \ \ \
| * | | | | Always check guest = true in macaroonsSteven Hammerton2015-11-171-1/+2
| * | | | | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-1739-292/+1268
| |\ \ \ \ \
| * | | | | | Snakes not camelsSteven Hammerton2015-11-111-5/+5
| * | | | | | Minor review fixesSteven Hammerton2015-11-112-17/+14
| * | | | | | Share more code between macaroon validationSteven Hammerton2015-11-112-57/+17
| * | | | | | Updates to fallback CAS login to do new token loginSteven Hammerton2015-11-061-26/+12
| * | | | | | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-0545-324/+1117
| |\ \ \ \ \ \
| * | | | | | | Allow hs to do CAS login completely and issue the client with a login token t...Steven Hammerton2015-11-053-5/+218
| * | | | | | | Add service URL to CAS configSteven Hammerton2015-11-041-0/+3
* | | | | | | | Merge pull request #380 from matrix-org/daniel/jenkins-sytestDaniel Wagner-Hall2015-11-171-1/+22
|\ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-19 22:08:49 +0000