summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | add registrations_require_3pidMatthew Hodgson2018-01-195-13/+110
| | | | | * | | | pep8Travis Ralston2018-01-311-9/+12
| | | | | * | | | Add admin api documentation for list media endpointTravis Ralston2018-01-311-0/+23
| | | | | * | | | Documentation and namingTravis Ralston2018-01-311-7/+26
| | | | | * | | | Appease the linterTravis Ralston2018-01-201-5/+5
| | | | | * | | | Add an admin route to get all the media in a roomTravis Ralston2018-01-202-56/+97
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbsRichard van der Hoff2018-01-191-0/+8
| | |\ \ \ \ \ \
| | | * | | | | | Use the right path for url_preview thumbnailsRichard van der Hoff2018-01-191-0/+8
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Fix storage provider bug introduced when renamed to store_localErik Johnston2018-01-181-1/+1
| | * | | | | | Merge pull request #2812 from matrix-org/erikj/media_storage_provider_configErik Johnston2018-01-183-33/+101
| | |\ \ \ \ \ \
| | | * | | | | | Fix passing wrong config to provider constructorErik Johnston2018-01-181-1/+1
| | | * | | | | | Remove duplicate directory testErik Johnston2018-01-181-4/+0
| | | * | | | | | Missing staticmethodErik Johnston2018-01-181-0/+1
| | | * | | | | | Fixup commentsErik Johnston2018-01-182-3/+7
| | | * | | | | | Make storage providers more configurableErik Johnston2018-01-183-31/+98
| | * | | | | | | Merge pull request #2804 from matrix-org/erikj/file_consumerErik Johnston2018-01-182-0/+315
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Do logcontexts correctlyErik Johnston2018-01-181-2/+2
| | | * | | | | | Move test stuff to testsErik Johnston2018-01-182-33/+47
| | | * | | | | | Make all fields privateErik Johnston2018-01-181-31/+31
| | | * | | | | | Ensure we registerProducer isn't called twiceErik Johnston2018-01-181-0/+3
| | | * | | | | | Fix _notify_empty typoErik Johnston2018-01-181-1/+1
| | | * | | | | | Move definition of paused_producer to __init__Erik Johnston2018-01-181-2/+4
| | | * | | | | | Fix commentsErik Johnston2018-01-181-3/+3
| | | * | | | | | Add decent impl of a FileConsumerErik Johnston2018-01-172-0/+296
| | | |/ / / / /
| | * | | | | | Fix typo in thumbnail resource causing access times to be incorrectErik Johnston2018-01-181-2/+2
| | * | | | | | Merge pull request #2810 from matrix-org/rav/metrics_fixesRichard van der Hoff2018-01-181-2/+4
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Fix bugs in block metricsRichard van der Hoff2018-01-181-2/+4
| | |/ / / / /
| | * | | | | Merge pull request #2809 from matrix-org/rav/metrics_errorsRichard van der Hoff2018-01-181-1/+8
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | better exception logging in callbackmetricsRichard van der Hoff2018-01-181-1/+8
| | * | | | | Merge pull request #2805 from matrix-org/rav/log_state_resRichard van der Hoff2018-01-171-0/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Log room when doing state resolutionRichard van der Hoff2018-01-171-0/+6
| | * | | | | Merge pull request #2783 from matrix-org/erikj/media_last_accessedErik Johnston2018-01-175-11/+64
| | |\ \ \ \ \
| | | * | | | | Remove lost commentErik Johnston2018-01-171-3/+0
| | | * | | | | Update last access time when thumbnails are viewedErik Johnston2018-01-171-0/+2
| | | * | | | | Keep track of last access time for local mediaErik Johnston2018-01-174-11/+65
| | | | |/ / / | | | |/| | |
| | * | | | | Merge pull request #2803 from matrix-org/matthew/fix-userdir-sqlMatthew Hodgson2018-01-171-2/+7
| | |\ \ \ \ \
| | | * | | | | fix SQL when searching all usersMatthew Hodgson2018-01-171-2/+7
| | * | | | | | Merge pull request #2802 from matrix-org/rav/clean_up_resolve_eventsRichard van der Hoff2018-01-172-20/+29
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Split resolve_events into two functionsRichard van der Hoff2018-01-172-20/+29
| | |/ / / / /
| | * | | | | Merge pull request #2795 from matrix-org/rav/track_db_schedulingRichard van der Hoff2018-01-175-4/+43
| | |\ \ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/track_db_schedulingRichard van der Hoff2018-01-175-34/+78
| | | |\ \ \ \ \
| | | * | | | | | Track DB scheduling delay per-requestRichard van der Hoff2018-01-165-4/+43
| | | * | | | | | Merge branch 'rav/db_txn_time_in_millis' into rav/track_db_schedulingRichard van der Hoff2018-01-166-31/+49
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge pull request #2797 from matrix-org/rav/user_id_checkingRichard van der Hoff2018-01-172-8/+19
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Sanity checking for user idsRichard van der Hoff2018-01-172-8/+19
| | * | | | | | | | Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millisRichard van der Hoff2018-01-174-10/+17
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Merge branch 'develop' into rav/db_txn_time_in_millisRichard van der Hoff2018-01-174-25/+69
| | | |\| | | | | | | | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Track db txn time in millisecsRichard van der Hoff2018-01-164-10/+17
| | * | | | | | | | Merge pull request #2796 from matrix-org/rav/fix_closed_connection_errorsRichard van der Hoff2018-01-171-9/+9
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'develop' into rav/fix_closed_connection_errorsRichard van der Hoff2018-01-177-47/+102
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Fix 'NoneType' object has no attribute 'writeHeaders'Richard van der Hoff2018-01-161-9/+9
| | * | | | | | | | | Merge pull request #2794 from matrix-org/rav/rework_run_interactionRichard van der Hoff2018-01-171-20/+31
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch 'develop' into rav/rework_run_interactionRichard van der Hoff2018-01-177-47/+102
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | / / / / / | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Merge pull request #2792 from matrix-org/rav/optimise_logging_contextRichard van der Hoff2018-01-173-22/+33
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/optimise_logging_contextRichard van der Hoff2018-01-174-25/+69
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | / / / / | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge pull request #2789 from matrix-org/erikj/fix_thumbnailsErik Johnston2018-01-173-24/+68
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add docstringErik Johnston2018-01-171-1/+1
| | | * | | | | | | Use local varsErik Johnston2018-01-161-6/+2
| | | * | | | | | | Change _generate_thumbnails to take media_typeErik Johnston2018-01-162-7/+10
| | | * | | | | | | Move setting of file_id up to callerErik Johnston2018-01-162-13/+14
| | | * | | | | | | Fix typoErik Johnston2018-01-161-7/+10
| | | * | | | | | | Fix up log linesErik Johnston2018-01-162-7/+10
| | | * | | | | | | Correctly use server_name/file_id when generating/fetching remote thumbnailsErik Johnston2018-01-162-5/+8
| | | * | | | | | | Log when we respond with 404Erik Johnston2018-01-162-1/+8
| | | * | | | | | | Fix thumbnailing remote filesErik Johnston2018-01-162-2/+30
| | * | | | | | | | fix typoMatthew Hodgson2018-01-161-1/+1
| | | |_|_|/ / / / | | |/| | | | | |
| | | | * | | | | Optimise LoggingContext creation and copyingRichard van der Hoff2018-01-163-22/+33
| | | |/ / / / / | | |/| | | | |
| | | | * | | | rework runInteraction in terms of runConnectionRichard van der Hoff2018-01-161-20/+31
| | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #2785 from matrix-org/rav/reorganise_metrics_againRichard van der Hoff2018-01-165-47/+209
| | |\ \ \ \ \
| | | * | | | | document metrics changesRichard van der Hoff2018-01-162-8/+58
| | | * | | | | Reorganise request and block metricsRichard van der Hoff2018-01-152-25/+84
| | | * | | | | mechanism to render metrics with alternative namesRichard van der Hoff2018-01-151-13/+40
| | | * | | | | Add some comments to metrics classesRichard van der Hoff2018-01-151-1/+27
| | * | | | | | Merge pull request #2790 from matrix-org/rav/preserve_event_logcontext_leakRichard van der Hoff2018-01-161-1/+8
| | |\ \ \ \ \ \
| | | * | | | | | Fix a logcontext leak in persist_eventsRichard van der Hoff2018-01-161-1/+8
| | | |/ / / / /
| | * | | | | | Merge pull request #2787 from matrix-org/rav/worker_event_countsRichard van der Hoff2018-01-162-0/+11
| | |\ \ \ \ \ \
| | | * | | | | | Metrics for events processed in appservice and fed senderRichard van der Hoff2018-01-152-0/+11
| | | |/ / / / /
| | * | | | | | Merge pull request #2786 from matrix-org/rav/rdata_metricsRichard van der Hoff2018-01-161-5/+14
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Metrics for number of RDATA commands receivedRichard van der Hoff2018-01-151-5/+14
| | | |/ / / /
| | * | | | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactorErik Johnston2018-01-167-346/+843
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix up commentsErik Johnston2018-01-122-7/+16
| | | * | | | Correctly reraise exceptionErik Johnston2018-01-121-2/+4
| | | * | | | Make Responder a context managerErik Johnston2018-01-122-9/+10
| | | * | | | Add missing class varErik Johnston2018-01-121-0/+3
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_stor...Erik Johnston2018-01-129-28/+116
| | | |\ \ \ \
| | | * | | | | Remove unnecessary conditionErik Johnston2018-01-121-4/+1
| | | * | | | | Remove unused variablesErik Johnston2018-01-121-3/+0
| | | * | | | | Make class var localErik Johnston2018-01-121-3/+3
| | | * | | | | CommentsErik Johnston2018-01-123-15/+65
| | | * | | | | Add StorageProvider conceptErik Johnston2018-01-093-9/+162
| | | * | | | | Make PreviewUrlResource use MediaStorageErik Johnston2018-01-092-8/+14
| | | * | | | | Make ThumbnailResource use MediaStorageErik Johnston2018-01-092-48/+68
| | | * | | | | Use MediaStorage for remote mediaErik Johnston2018-01-092-136/+156
| | | * | | | | Use MediaStorage for local filesErik Johnston2018-01-092-119/+73
| | | * | | | | Add MediaStorage classErik Johnston2018-01-091-0/+198
| | | * | | | | Add some helper classesErik Johnston2018-01-091-0/+73
| | | * | | | | Split out add_file_headersErik Johnston2018-01-091-28/+42
| | * | | | | | Merge pull request #2778 from matrix-org/rav/counters_should_be_floatsRichard van der Hoff2018-01-151-3/+10
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Make Counter render floatsRichard van der Hoff2018-01-121-3/+10
| | |/ / / / /
| | * | | | | Merge pull request #2777 from matrix-org/rav/fix_remote_thumbnailsRichard van der Hoff2018-01-121-0/+5
| | |\ \ \ \ \
| | | * | | | | Reinstate media download on thumbnail requestRichard van der Hoff2018-01-121-0/+5
| | |/ / / / /
| | * | | | | Merge pull request #2774 from matrix-org/erikj/synctlErik Johnston2018-01-123-5/+38
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Actually make it workErik Johnston2018-01-122-2/+15
| | | * | | | RefactorErik Johnston2018-01-121-9/+4
| | | * | | | When using synctl with workers, don't start the main synapse automaticallyErik Johnston2018-01-112-8/+33
| | * | | | | Merge pull request #2766 from matrix-org/rav/room_eventRichard van der Hoff2018-01-111-3/+26
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Add /room/{id}/event/{id} to synapseRichard van der Hoff2018-01-091-3/+26
| | * | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-01-113-1/+49
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #2773 from matrix-org/erikj/hash_bgErik Johnston2018-01-103-10/+18
| | |\ \ \ \ \ \
| | | * | | | | | Do bcrypt hashing in a background threadErik Johnston2018-01-103-10/+18
| | * | | | | | | Merge pull request #2772 from matrix-org/t3chguy/patch-1Erik Johnston2018-01-101-3/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | fix order of operations derp and also use `.get` to default to {}Michael Telatynski2018-01-101-2/+3
| | | * | | | | | | Fix publicised groups API (singular) over federationMichael Telatynski2018-01-101-4/+4
| | |/ / / / / / /
| | * | | | | | | Merge pull request #2770 from matrix-org/rav/fix_request_metricsRichard van der Hoff2018-01-101-11/+19
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Update http request metrics before calling servletRichard van der Hoff2018-01-091-11/+19
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge pull request #2764 from matrix-org/erikj/remove_dead_thumbnail_codeErik Johnston2018-01-092-78/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Remove dead TODOErik Johnston2018-01-091-2/+0
| | | * | | | | Remove dead code related to default thumbnailsErik Johnston2018-01-092-76/+3
| | |/ / / / /
| | * | | | | Merge pull request #2765 from matrix-org/rav/fix_room_utsRichard van der Hoff2018-01-093-4/+9
| | |\ \ \ \ \
| | | * | | | | enable twisted delayedcall debugging in UTsRichard van der Hoff2018-01-091-1/+5
| | | * | | | | Remove dead codeRichard van der Hoff2018-01-091-3/+0
| | | * | | | | Disable user_directory updates for UTsRichard van der Hoff2018-01-091-0/+4
| | * | | | | | Merge pull request #2763 from matrix-org/rav/fix_config_utsRichard van der Hoff2018-01-092-3/+18
| | |\ \ \ \ \ \
| | | * | | | | | Fix broken config UTsRichard van der Hoff2018-01-092-3/+18
| | | |/ / / / /
| | * | | | | | Merge pull request #2762 from matrix-org/rav/fix_logconfig_indentingRichard van der Hoff2018-01-091-17/+17
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Make indentation of generated log config consistentRichard van der Hoff2018-01-091-17/+17
| | |/ / / / /
| | * | | | | Merge pull request #2761 from turt2live/patch-1Erik Johnston2018-01-081-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix templating error with unban permission messageTravis Ralston2018-01-071-1/+1
| | |/ / / / /
| | * | | | | Merge pull request #2755 from matrix-org/richvdh-patch-1Richard van der Hoff2018-01-051-8/+4
| | |\ \ \ \ \
| | | * | | | | Remove 'verbosity'/'log_file' from generated cfgRichard van der Hoff2018-01-051-8/+4
| | |/ / / / /
| | * | | | | Merge pull request #2744 from matrix-org/rav/login_loggingRichard van der Hoff2018-01-051-4/+10
| | |\ \ \ \ \
| | | * | | | | Better logging when login can't find a 3pidRichard van der Hoff2017-12-201-4/+10
| | | | |_|_|/ | | | |/| | |
| | * | | | | Merge pull request #2745 from matrix-org/rav/assert_paramsRichard van der Hoff2018-01-053-60/+68
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Check missing fields in event_from_pdu_jsonRichard van der Hoff2017-12-301-0/+7
| | | * | | | Factor out `event_from_pdu_json`Richard van der Hoff2017-12-303-37/+44
| | | * | | | federation_server: clean up importsRichard van der Hoff2017-12-301-14/+11
| | | * | | | federation_client: clean up importsRichard van der Hoff2017-12-301-13/+10
| | |/ / / /
| | * | | | Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typoRichard van der Hoff2017-12-181-2/+2
| | |\ \ \ \
| | | * | | | synapse/config/password_auth_providers: Fixed bracket typoRichard von Seck2017-11-161-2/+2
| | * | | | | Merge pull request #2435 from silkeh/listen-ipv6-defaultRichard van der Hoff2017-12-1812-231/+247
| | |\ \ \ \ \
| | | * | | | | Implement listen_tcp method in remaining workersSilke2017-12-1810-192/+155
| | | * | | | | Remove logger argument and do not catch replication listenerSilke2017-12-182-24/+18
| | | * | | | | Add methods for listening on multiple addressesSilke Hofstra2017-12-172-51/+90
| | | * | | | | Allow binds to both :: and 0.0.0.0Silke Hofstra2017-12-172-42/+61
| | | * | | | | Adapt the default config to bind on IPv6.Willem Mulder2017-12-171-8/+9
| | |/ / / / /
* | | | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-03-1727-39/+46
|\| | | | | |
| * | | | | | Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1Erik Johnston2018-03-1627-39/+46
| |\ \ \ \ \ \
| | * | | | | | NewlineErik Johnston2018-03-161-0/+1
| | * | | | | | Remove wrong commentErik Johnston2018-03-161-1/+0
| | * | | | | | Bump version and changelogErik Johnston2018-03-152-1/+9
| | * | | | | | Replace ujson with simplejsonErik Johnston2018-03-1525-38/+37
| |/ / / / / /
* | | | | | | Disable logging to file and rely on the console when using Dockerkaiyou2018-02-101-8/+1
* | | | | | | Explicitely provide the postgres password to synapse in the Compose examplekaiyou2018-02-101-0/+1
* | | | | | | Remove an accidentally committed test configurationkaiyou2018-02-101-1/+1
* | | | | | | Generate macaroon and registration secrets, then store the results to the dat...kaiyou2018-02-102-6/+15
* | | | | | | Fix the path to the log config filekaiyou2018-02-092-2/+2
* | | | | | | Make SYNAPSE_MACAROON_SECRET_KEY a mandatory optionkaiyou2018-02-092-3/+4
* | | | | | | Specify the Docker registry for the postgres imagekaiyou2018-02-081-1/+1
* | | | | | | Specify the Docker registry in the build tagkaiyou2018-02-081-1/+1
* | | | | | | Make it clear that the image has two modes of operationkaiyou2018-02-081-5/+24
* | | | | | | Update to Alpine 3.7 and switch to libresslkaiyou2018-02-081-2/+2
* | | | | | | Enable email server configuration from environment variableskaiyou2018-02-082-16/+24
* | | | | | | Honor the SYNAPSE_REPORT_STATS parameter in the Docker imagekaiyou2018-02-081-0/+5
* | | | | | | Disable the Web client in the Docker imagekaiyou2018-02-082-4/+3
* | | | | | | Use 'synapse' as a default postgres user in Docker exampleskaiyou2018-02-082-3/+3
* | | | | | | Refactor the start script to better handle mandatory parameterskaiyou2018-02-083-24/+35
* | | | | | | Rename the permissions variable to avoid confusionkaiyou2018-02-081-3/+3
* | | | | | | Add some documentation about high performance storagekaiyou2018-02-081-2/+7
* | | | | | | Make it clear that two modes are avaiable in the documentation, improve the c...kaiyou2018-02-082-9/+20
* | | | | | | Support loading application service files from /data/appservices/kaiyou2018-02-053-2/+18
* | | | | | | Add the non-tls port to the expose listkaiyou2018-02-051-1/+1
* | | | | | | Only generate configuration files when necessarykaiyou2018-02-051-5/+7
* | | | | | | Do not copy documentation files to the Docker root folderkaiyou2018-02-051-1/+1
* | | | | | | Point to the 'latest' tag in the Docker documentationkaiyou2018-02-052-2/+2
* | | | | | | Fix a typo in the Docker READMEkaiyou2018-02-051-1/+1
* | | | | | | Document the cache factor environment variable for Dockerkaiyou2018-02-051-0/+1
* | | | | | | Add dynamic TURN configuration in the Docker imagekaiyou2018-02-052-2/+14
* | | | | | | Add dynamic recaptcha configuration in the Docker imagekaiyou2018-02-052-0/+11
* | | | | | | Remove docker related files from the python manifestkaiyou2018-02-051-0/+1
* | | | | | | Run the server as an unprivileged userkaiyou2018-02-042-5/+8
* | | | | | | Fix multiple typoskaiyou2018-02-043-10/+17
* | | | | | | Add the build cache/ folder to gitignorekaiyou2018-02-041-0/+1
* | | | | | | Update sumperdump Docker readme to match this image propertieskaiyou2018-02-041-38/+64
* | | | | | | Remove etc/service files from rob's branchkaiyou2018-02-043-131/+0
* | | | | | | Merge remote-tracking branch 'origin/rob/docker' into feat-dockerfilekaiyou2018-02-044-0/+201
|\ \ \ \ \ \ \
| * | | | | | | docker: s/matrix-org/matrixdotorg/gRobert Swain2017-09-292-5/+5
| * | | | | | | docker: Initial Dockerfile and docker-compose.yamlRobert Swain2017-09-285-0/+259
* | | | | | | | Reuse environment variables of the postgres containerkaiyou2018-02-042-9/+14
* | | | | | | | Provide an example docker compose filekaiyou2018-02-042-0/+34
* | | | | | | | Install the postgres dependencieskaiyou2018-02-041-2/+2
* | | | | | | | Support an external postgresql config in the Docker imagekaiyou2018-02-041-2/+11
* | | | | | | | Generate shared secrets if not defined in the environmentkaiyou2018-02-041-4/+11
* | | | | | | | Generate any missing keys before starting synapsekaiyou2018-02-041-12/+13
* | | | | | | | Allow for a wheel cache and include missing files in the buildkaiyou2018-02-043-6/+13
* | | | | | | | Add template config files for the Docker imagekaiyou2018-02-032-0/+217
* | | | | | | | Initial commit including a Dockerfile for synapsekaiyou2018-02-032-0/+45
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #2798 from jeremycline/fedora-repoErik Johnston2018-01-171-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Note that Synapse is available in FedoraJeremy Cline2018-01-161-0/+4
|/ / / / / / /
* | | | | | | Merge pull request #2674 from her001/readme-sytestRichard van der Hoff2018-01-161-0/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Mention SyTest in the README, after DevelopmentAndrew Conrad2017-11-141-0/+11
* | | | | | | Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse v0.26.0Erik Johnston2018-01-0577-826/+1829
|\ \ \ \ \ \ \
| * | | | | | | Bump version and changelog release-v0.26.0Erik Johnston2018-01-052-1/+7
| * | | | | | | Fix rc version number v0.26.0-rc1Erik Johnston2017-12-131-2/+2
| * | | | | | | Bump changelog and versionErik Johnston2017-12-132-1/+38
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #2717 from matrix-org/erikj/createroom_contentErik Johnston2017-12-072-5/+9
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom...Erik Johnston2017-12-0773-820/+1776
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #2723 from matrix-org/matthew/search-all-local-usersMatthew Hodgson2017-12-0511-37/+234
| |\ \ \ \ \ \ \
| | * | | | | | | fix StoreError syntaxMatthew Hodgson2017-12-051-1/+1
| | * | | | | | | speed up the rate of initial spam for usersMatthew Hodgson2017-12-041-11/+12
| | * | | | | | | better docMatthew Hodgson2017-12-041-1/+4
| | * | | | | | | try make tests work a bit more...Matthew Hodgson2017-12-041-0/+12
| | * | | | | | | erik told me toMatthew Hodgson2017-12-041-1/+1
| | * | | | | | | fix pep8 and testsMatthew Hodgson2017-12-043-8/+6
| | * | | | | | | switch to a simpler 'search_all_users' button as per review feedbackMatthew Hodgson2017-12-045-37/+30
| | * | | | | | | Merge branch 'develop' into matthew/search-all-local-usersMatthew Hodgson2017-11-3032-200/+633
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | specify default user_directory_include_patternMatthew Hodgson2017-11-301-0/+1
| | * | | | | | | remove null constraint on user_dir.room_idMatthew Hodgson2017-11-301-0/+35
| | * | | | | | | fix alternation operator for FTS4 - how did this ever work!?Matthew Hodgson2017-11-301-1/+1
| | * | | | | | | fix thinkos galoreMatthew Hodgson2017-11-303-20/+41
| | * | | | | | | kick the user_directory index when new users registerMatthew Hodgson2017-11-291-0/+8
| | * | | | | | | untested WIP but might actually workMatthew Hodgson2017-11-296-20/+96
| | * | | | | | | Add user_directory_include_pattern config param to expand search results to a...Matthew Hodgson2017-11-295-9/+58
| * | | | | | | | Fix error when deleting devicesRichard van der Hoff2017-12-051-1/+1
| * | | | | | | | Merge pull request #2729 from matrix-org/rav/custom_ui_authRichard van der Hoff2017-12-051-24/+57
| |\ \ \ \ \ \ \ \
| | * | | | | | | | support custom login types for validating usersRichard van der Hoff2017-12-051-24/+57
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_authRichard van der Hoff2017-12-053-74/+102
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Factor out a validate_user_via_ui_auth methodRichard van der Hoff2017-12-053-74/+102
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_returnRichard van der Hoff2017-12-057-48/+103
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Refactor UI auth implementationRichard van der Hoff2017-12-057-48/+103
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #2716 from matrix-org/rav/federation_client_postRichard van der Hoff2017-12-041-8/+34
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | federation_client script: Support for posting contentRichard van der Hoff2017-11-281-8/+34
| * | | | | | | | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_commentsRichard van der Hoff2017-11-291-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Improve comments on get_user_by_access_tokenRichard van der Hoff2017-11-291-1/+5
| | |/ / / / / / /
| * | | | | | | | Merge pull request #2722 from matrix-org/rav/delete_device_on_logoutRichard van der Hoff2017-11-2912-64/+226
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Delete devices in various logout situationsRichard van der Hoff2017-11-295-5/+75
| | * | | | | | | | Move set_password into its own handlerRichard van der Hoff2017-11-296-19/+58
| | * | | | | | | | Move deactivate_account into its own handlerRichard van der Hoff2017-11-296-22/+61
| | * | | | | | | | Remove pushers when deleting access tokensRichard van der Hoff2017-11-293-18/+32
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2718 from matrix-org/rav/notify_logcontextsRichard van der Hoff2017-11-292-9/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Clear logcontext before starting fed txn queue runnerRichard van der Hoff2017-11-282-9/+18
| | |/ / / / / / /
| * | | | | | | | Merge pull request #2719 from matrix-org/rav/handle_missing_hashesRichard van der Hoff2017-11-291-3/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix 500 when joining matrix-devRichard van der Hoff2017-11-291-3/+10
| | |/ / / / / / /
| * | | | | | | | Merge pull request #2715 from matrix-org/luke/group-guest-accessLuke Barnard2017-11-281-11/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Allow guest access to group APIs for readingLuke Barnard2017-11-281-11/+11
| |/ / / / / / /
| * | | | | | | Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_errorRichard van der Hoff2017-11-276-17/+89
| |\ \ \ \ \ \ \
| | * | | | | | | fix sql failsRichard van der Hoff2017-11-221-1/+1
| | * | | | | | | Check database in has_completed_background_updatesRichard van der Hoff2017-11-223-12/+33
| | * | | | | | | Fix error on sqlite 3.7Richard van der Hoff2017-11-215-8/+59
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #2713 from matrix-org/rav/no_upsert_foreverRichard van der Hoff2017-11-271-0/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid retrying forever on IntegrityErrorRichard van der Hoff2017-11-271-0/+7