summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #919 from matrix-org/erikj/auth_fixErik Johnston2016-07-153-5/+35
|\ | | | | Various auth.py fixes.
| * CommentErik Johnston2016-07-152-0/+6
| |
| * Check sender signed eventErik Johnston2016-07-143-6/+12
| |
| * Check if alias event's state_key matches sender's domainErik Johnston2016-07-131-0/+11
| |
| * Check creation event's room_id domain matches sender'sErik Johnston2016-07-131-0/+7
| |
* | Merge pull request #921 from matrix-org/erikj/account_deactivateErik Johnston2016-07-141-0/+44
|\ \ | | | | | | Feature: Add an /account/deactivate endpoint
| * | Add hs objectErik Johnston2016-07-141-0/+1
| | |
| * | Only accept password authErik Johnston2016-07-141-12/+0
| | |
| * | Add an /account/deactivate endpointErik Johnston2016-07-141-0/+55
| | |
* | | Merge pull request #918 from negzi/bugfix_for_token_expiryErik Johnston2016-07-146-9/+42
|\ \ \ | |/ / |/| | Bug fix: expire invalid access tokens
| * | Bug fix: expire invalid access tokensNegar Fazeli2016-07-136-9/+42
| |/
* | Merge pull request #915 from matrix-org/dbkr/more_requesttokensDavid Baker2016-07-133-30/+103
|\ \ | |/ |/| Add requestToken endpoints
| * be more pythonicDavid Baker2016-07-121-1/+1
| |
| * on_OPTIONS isn't neccessaryDavid Baker2016-07-122-10/+1
| |
| * Remove other debug loggingDavid Baker2016-07-121-2/+0
| |
| * Separate out requestTokens to separate handlersDavid Baker2016-07-112-65/+93
| |
| * Oops, remove debug loggingDavid Baker2016-07-111-4/+0
| |
| * Implement https://github.com/matrix-org/matrix-doc/pull/346/filesDavid Baker2016-07-082-0/+60
| |
* | Merge pull request #914 from matrix-org/markjh/upgradeMark Haines2016-07-081-0/+15
|\ \ | |/ |/| Ensure that the guest user is in the database when upgrading accounts
| * Add a comment explaining allow_noneMark Haines2016-07-081-0/+2
| |
| * Ensure that the guest user is in the database when upgrading accountsMark Haines2016-07-081-0/+13
|/
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-07-086-9/+33
|\
| * Merge branch 'hotfixes-v0.16.1' v0.16.1-r1Erik Johnston2016-07-083-6/+19
| |\
| | * Bump version and changelogErik Johnston2016-07-072-1/+9
| | |
| | * Fix bug where we did not correctly explode when multiple user_ids were set ↵Erik Johnston2016-07-071-5/+10
| | | | | | | | | | | | in macaroon
| * | Merge pull request #886 from matrix-org/markjh/async_commitMark Haines2016-06-293-3/+14
| |\ \ | | | | | | | | Optionally make committing to postgres asynchronous.
| | * | Optionally make committing to postgres asynchronous.Mark Haines2016-06-203-3/+14
| | | | | | | | | | | | | | | | | | | | Useful when running tests when you don't care whether the server will lose data that it claims that it has committed.
* | | | Merge pull request #911 from matrix-org/erikj/purge_historyErik Johnston2016-07-077-34/+386
|\ \ \ \ | | | | | | | | | | Feature: Purge local room history.
| * | | | CommentErik Johnston2016-07-071-0/+3
| | | | |
| * | | | Return 400 rather than 500Erik Johnston2016-07-071-1/+4
| | | | |
| * | | | Add rest servlet. Fix SQL.Erik Johnston2016-07-062-5/+5
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2Erik Johnston2016-07-062-2/+18
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #909 from matrix-org/erikj/shared_secretErik Johnston2016-07-064-34/+74
|\ \ \ \ \ | | | | | | | | | | | | Add an admin option to shared secret registration (breaks backwards compat)
* \ \ \ \ \ Merge pull request #910 from KentShikama/hash_password_followupErik Johnston2016-07-062-2/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Follow up to adding password pepper
| * | | | | | Update password config commentKent Shikama2016-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
| * | | | | | Update hash_password scriptKent Shikama2016-07-061-1/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
| | * | | | Merge branch 'erikj/shared_secret' into erikj/test2Erik Johnston2016-07-0610-111/+213
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Check that there are no null bytes in user and passswordErik Johnston2016-07-061-0/+6
| | | | | |
| * | | | | Add null separator to hmacErik Johnston2016-07-062-0/+4
| | | | | |
| * | | | | Remove spurious txnErik Johnston2016-07-051-9/+0
| | | | | |
| * | | | | Fix for postgresErik Johnston2016-07-051-2/+2
| | | | | |
| * | | | | Add an admin option to shared secret registrationErik Johnston2016-07-054-27/+58
| | | | | |
| * | | | | Protect password when registering using shared secretErik Johnston2016-07-052-7/+15
|/ / / / /
* | | | | Merge pull request #904 from ↵David Baker2016-07-052-15/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/dbkr/register_email_no_untrusted_id_server requestToken update
| * | | | | requestToken updateDavid Baker2016-06-302-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send requestToken request to untrusted ID servers Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now.
* | | | | | Merge pull request #906 from matrix-org/markjh/faster_events_aroundMark Haines2016-07-052-60/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use a query that postgresql optimises better for get_events_around
| * | | | | | Fix typoMark Haines2016-07-051-1/+1
| | | | | | |
| * | | | | | Make get_events_around more efficient on sqlite3Mark Haines2016-07-051-13/+49
| | | | | | |
| * | | | | | Use true/false for boolean parameter inclusive to avoid potential for sqli, ↵Mark Haines2016-07-052-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and possibly make the code clearer
| * | | | | | Use different SQL for postgres and sqlite3 for when using multicolumn indexesMark Haines2016-07-042-59/+59
| | | | | | |
| * | | | | | Use a query that postgresql optimises better for get_events_aroundMark Haines2016-07-041-12/+16
| | | | | | |
* | | | | | | Merge pull request #907 from KentShikama/pepperErik Johnston2016-07-052-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add pepper to password hashing
| * | | | | | | Remove default password pepper stringKent Shikama2016-07-051-2/+1
| | | | | | | |
| * | | | | | | Fix password configKent Shikama2016-07-052-3/+3
| | | | | | | |
| * | | | | | | Fix pep8Kent Shikama2016-07-052-2/+3
| | | | | | | |
| * | | | | | | Add comment to prompt changing of pepperKent Shikama2016-07-051-0/+1
| | | | | | | |
| * | | | | | | Add pepper to password hashingKent Shikama2016-07-052-3/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
| | | * | | | Add ReadWriteLock for pagination and history pruneErik Johnston2016-07-052-36/+38
| | | | | | |
| | | * | | | Add ReadWriteLockErik Johnston2016-07-052-0/+167
| | | | | | |
| | | * | | | Add purge_history APIErik Johnston2016-07-054-1/+38
| | | | | | |
| | | * | | | Add storage function to purge history for a roomErik Johnston2016-07-041-0/+140
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #905 from KentShikama/add-password-hashErik Johnston2016-07-042-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Optionally include password hash in createUser endpoint
| * | | | | Fix style violationsKent Shikama2016-07-042-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
| * | | | | Use .get() instead of [] to access password_hashKent Shikama2016-07-041-1/+1
| | | | | |
| * | | | | Optionally include password hash in createUser endpointKent Shikama2016-07-032-3/+5
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* | | | | code_style.rst: add link to sphinx examplesRichard van der Hoff2016-07-011-1/+3
| | | | |
* | | | | code_style.rst: *fix* link to google styleRichard van der Hoff2016-07-011-1/+1
| | | | |
* | | | | code_style.rst: add link to google styleRichard van der Hoff2016-07-011-2/+3
|/ / / /
* | | | Merge pull request #903 from matrix-org/erikj/deactivate_userErik Johnston2016-06-303-0/+40
|\ \ \ \ | | | | | | | | | | Feature: Add deactivate account admin API
| * | | | Feature: Add deactivate account admin APIErik Johnston2016-06-303-0/+40
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows server admins to "deactivate" accounts, which: - Revokes all access tokens - Removes all threepids - Removes password The API is a POST to `/admin/deactivate/<user_id>`
* | | | Merge pull request #902 from matrix-org/erikj/expire_mediaErik Johnston2016-06-297-21/+190
|\ \ \ \ | | | | | | | | | | Feature: Implement purge_media_cache admin API
| * | | | Remove raceErik Johnston2016-06-291-11/+0
| | | | |
| * | | | Implement purge_media_cache admin APIErik Johnston2016-06-295-20/+130
| | | | |
| * | | | Track approximate last access time for remote mediaErik Johnston2016-06-294-1/+71
|/ / / /
* | | | Merge pull request #900 from RickCogley/RickCogley-coturn-readme-2David Baker2016-06-281-7/+12
|\ \ \ \ | | | | | | | | | | Rick cogley coturn readme 2
| * | | | Update turn-howto.rst to use git clone (2)Rick Cogley2016-06-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Not logical to use svn checkout against a github repo, so changed to git clone. Signed-off-by: Rick Cogley <rick.cogley@esolia.co.jp>
| * | | | Update turn-howto.rst to use git cloneRick Cogley2016-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn checkout is not logical for a checkout from github, so changed the checkout to "git clone". thanks @dbkr Signed-off-by: Rick Cogley <rick.cogley@esolia.co.jp>
| * | | | Remove double spacesRick Cogley2016-06-281-12/+11
| | | | | | | | | | | | | | | Reading the RST spec, I was trying to get breaks to appear by entering the double spaces after the lines in the code blocks. It does not work anyway, and, as pointed out, I've removed.
| * | | | Update to reflect new location at github. Rick Cogley2016-06-261-16/+18
| |/ / / | | | | | | | | Additionally it does not appear there is turnserver.conf.default, but rather, just /etc/turnserver.conf.
* | | | Merge pull request #894 from matrix-org/dbkr/push_room_namingDavid Baker2016-06-287-121/+26
|\ \ \ \ | | | | | | | | | | Use similar naming we use in email notifs for push
| * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/push_room_namingDavid Baker2016-06-243-4/+7
| |\ \ \ \
| * | | | | Remove room name & alias testDavid Baker2016-06-241-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | as get_room_name_and_alias is now gone
| * | | | | even more pep8David Baker2016-06-241-0/+1
| | | | | |
| * | | | | more pep8David Baker2016-06-241-1/+0
| | | | | |
| * | | | | pep8David Baker2016-06-241-1/+0
| | | | | |
| * | | | | Use similar naming we use in email notifs for pushDavid Baker2016-06-246-79/+26
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1654
* | | | | | remove vector.im from default secondary DS listMatthew Hodgson2016-06-271-1/+0
| |/ / / / |/| | | |
* | | | | Merge pull request #895 from matrix-org/markjh/jenkins_port_rangeMark Haines2016-06-243-4/+7
|\ \ \ \ \ | |/ / / / |/| | | | Fix the sytests to use a port-range rather than a port base
| * | | | Fix the sytests to use a port-range rather than a port baseMark Haines2016-06-243-4/+7
|/ / / /
* | | | Merge branch 'master' into developMark Haines2016-06-232-27/+152
|\| | |
| * | | Merge pull request #889 from matrix-org/markjh/synctl_workersMark Haines2016-06-211-27/+151
| |\ \ \ | | |_|/ | |/| | Optionally start or stop workers in synctl.
| | * | Optionally start or stop workers in synctl.Mark Haines2016-06-211-27/+151
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optionally start or stop an individual worker by passing -w with the path to the worker config. Optionally start or stop every worker and the main synapse by passing -a with a path to a directory containing worker configs. The "-w" is intended to be used to bounce individual workers proceses. THe "-a" is intended for when you want to restart all the workers simultaneuously, for example when performing database upgrades.
| * | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1Erik Johnston2016-06-2040-517/+617
| |\ \
| * | | point to the CAPTCHA docsMatthew Hodgson2016-06-121-0/+1
| | | |
* | | | Merge pull request #892 from matrix-org/dbkr/email_notif_most_recentDavid Baker2016-06-231-4/+15
|\ \ \ \ | | | | | | | | | | Put most recent 20 messages in notif
| * | | | Actually we need to order these properlyDavid Baker2016-06-221-2/+12
| | | | | | | | | | | | | | | | | | | | otherwise we'll end up returning the wrong 20
| * | | | StyleDavid Baker2016-06-221-1/+1
| | | | |
| * | | | Put most recent 20 messages in notifDavid Baker2016-06-221-3/+4
|/ / / / | | | | | | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1648
* | | | Merge pull request #843 from mweinelt/ldap3-rewriteErik Johnston2016-06-224-60/+249
|\ \ \ \ | | | | | | | | | | Rewrite LDAP Authentication against ldap3
| * | | | Rework ldap integration with ldap3Martin Weinelt2016-06-224-60/+249
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
* | | | Merge pull request #888 from matrix-org/markjh/content_repoMark Haines2016-06-213-132/+3
|\ \ \ \ | | | | | | | | | | Remove the legacy v0 content upload API.
| * | | | Remove the legacy v0 content upload API.Mark Haines2016-06-213-132/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | The existing content can still be downloaded. The last upload to the matrix.org server was in January 2015, so it is probably safe to remove the upload API.
* | | | Merge pull request #887 from matrix-org/dbkr/notif_template_subs_failDavid Baker2016-06-211-1/+1
|\ \ \ \ | | | | | | | | | | Fix substitution failure in mail template
| * | | | Fix substitution failure in mail templateDavid Baker2016-06-211-1/+1
|/ / / /
* | | | Merge pull request #879 from matrix-org/erikj/linearize_fed_serverErik Johnston2016-06-202-67/+78
|\ \ \ \ | |_|_|/ |/| | | Linearize some federation endpoints based on (origin, room_id)
| * | | Linearize some federation endpoints based on (origin, room_id)Erik Johnston2016-06-172-67/+78
| |/ /
* | | Bump version and changelogErik Johnston2016-06-202-1/+16
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1Erik Johnston2016-06-2018-355/+251
|\ \ \
| * \ \ Merge pull request #880 from matrix-org/markjh/registered_userMark Haines2016-06-174-27/+25
| |\ \ \ | | |/ / | |/| | Remove registered_users from the distributor.
| | * | Add the create_profile method back since the tests use itMark Haines2016-06-171-0/+6
| | | |
| | * | Add a comment on why we don't create a profile for upgrading usersMark Haines2016-06-171-0/+1
| | | |
| | * | Remove registered_users from the distributor.Mark Haines2016-06-175-33/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed.
| * | Merge pull request #878 from matrix-org/erikj/ujsonErik Johnston2016-06-171-1/+1
| |\ \ | | | | | | | | Disable responding with canonical json for federation
| | * | Disable responding with canonical json for federationErik Johnston2016-06-171-1/+1
| | | |
| * | | Merge pull request #877 from matrix-org/erikj/frozen_defaultErik Johnston2016-06-172-1/+2
| |\ \ \ | | | | | | | | | | Turn use_frozen_events off by default
| | * | | Enable use_frozen_events in testsErik Johnston2016-06-171-0/+1
| | | | |
| | * | | Turn use_frozen_events off by defaultErik Johnston2016-06-171-1/+1
| | |/ /
| * | | Merge pull request #876 from matrix-org/erikj/sign_ownErik Johnston2016-06-172-12/+18
| |\ \ \ | | | | | | | | | | Only re-sign our own events
| | * | | Only re-sign our own eventsErik Johnston2016-06-172-12/+18
| | |/ /
| * | | Merge pull request #875 from matrix-org/markjh/email_formattingMark Haines2016-06-171-14/+15
| |\ \ \ | | | | | | | | | | Fix ``KeyError: 'msgtype'``. Use ``.get``
| | * | | Fix ``KeyError: 'msgtype'``. Use ``.get``Mark Haines2016-06-171-14/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a key error where the mailer tried to get the ``msgtype`` of an event that was missing a ``msgtype``. ``` File "synapse/push/mailer.py", line 264, in get_notif_vars File "synapse/push/mailer.py", line 285, in get_message_vars File ".../frozendict/__init__.py", line 10, in __getitem__ return self.__dict[key] KeyError: 'msgtype' ```
| * / / Fix setting gc thresholds in the workersMark Haines2016-06-172-2/+4
| |/ /
| * | Merge pull request #874 from matrix-org/markjh/worker_configMark Haines2016-06-176-295/+181
| |\ \ | | | | | | | | Inline the synchrotron and pusher configs into the main config
| | * | Use worker_ prefixes for worker config, use existing support for multiple ↵Mark Haines2016-06-165-79/+33
| | | | | | | | | | | | | | | | config files
| | * | Access the event_cache_size directly from the server object.Mark Haines2016-06-165-21/+10
| | | | | | | | | | | | | | | | | | | | This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config.
| | * | Access replication_url from the worker config directlyMark Haines2016-06-163-8/+6
| | | |
| | * | Comment on what's going on in clobber_with_worker_configMark Haines2016-06-161-1/+12
| | | |
| | * | Merge remote-tracking branch 'origin/develop' into markjh/worker_configMark Haines2016-06-1612-62/+140
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encodeErik Johnston2016-06-161-1/+1
| |\ \ \ | | | | | | | | | | Fix TypeError in call to bcrypt.hashpw
| | * | | Fix TypeError in call to bcrypt.hashpwSalvatore LaMendola2016-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - At the very least, this TypeError caused logins to fail on my own running instance of Synapse, and the simple (explicit) UTF-8 conversion resolved login errors for me. Signed-off-by: Salvatore LaMendola <salvatore.lamendola@gmail.com>
| * | | | Merge pull request #872 from matrix-org/erikj/preview_url_fixesErik Johnston2016-06-161-5/+6
| |\ \ \ \ | | |/ / / | |/| | | Fix some `/preview_url` explosions
| | * | | Line lengthsErik Johnston2016-06-151-3/+3
| | | | |
| | * | | Handle floats as img widthsErik Johnston2016-06-151-1/+1
| | | | |
| | * | | Handle og props with not contentErik Johnston2016-06-151-1/+2
| |/ / /
| * | | Merge pull request #867 from matrix-org/markjh/enable_jenkins_synchrotronMark Haines2016-06-151-0/+1
| |\ \ \ | | | | | | | | | | Enable testing the synchrotron on jenkins
| | * | | Enable testing the synchrotron on jenkinsMark Haines2016-06-101-0/+1
| | | | |
| * | | | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse into developErik Johnston2016-06-152-2/+28
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Update change log v0.16.1-rc1Erik Johnston2016-06-151-1/+2
| | | | |
* | | | | Bump version and changelogErik Johnston2016-06-152-2/+27
|/ / / /
* | | | Merge pull request #871 from matrix-org/erikj/linearize_state_fetch_on_pduErik Johnston2016-06-154-37/+58
|\ \ \ \ | | | | | | | | | | Linearize fetching of gaps on incoming events
| * | | | Linearize fetching of gaps on incoming eventsErik Johnston2016-06-154-37/+58
|/ / / / | | | | | | | | | | | | | | | | This potentially stops the server from doing multiple requests for the same data.
* | | | Merge pull request #870 from matrix-org/rav/work_around_tls_bugRichard van der Hoff2016-06-151-2/+26
|\ \ \ \ | | | | | | | | | | Work around TLS bug in twisted
| * | | | Work around TLS bug in twistedRichard van der Hoff2016-06-151-2/+26
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Wrap up twisted's FileBodyProducer to work around https://twistedmatrix.com/trac/ticket/8473. Hopefully this fixes https://matrix.org/jira/browse/SYN-700.
* | | | Merge pull request #869 from matrix-org/erikj/backfill_fixErik Johnston2016-06-151-14/+16
|\ \ \ \ | | | | | | | | | | Correctly mark backfilled events as backfilled
| * | | | Correctly mark backfilled events as backfilledErik Johnston2016-06-151-14/+16
|/ / / /
* | | | Merge pull request #868 from matrix-org/erikj/invalid_idErik Johnston2016-06-141-1/+4
|\ \ \ \ | |_|/ / |/| | | Make get_domain_from_id throw SynapseError on invalid ID
| * | | Make get_domain_from_id throw SynapseError on invalid IDErik Johnston2016-06-141-1/+4
| | | |
| | | * Add worker config moduleMark Haines2016-06-161-0/+71
| | | |
| | | * Inline the synchrotron and pusher configs into the main configMark Haines2016-06-165-291/+154
| |_|/ |/| |
* | | Merge pull request #866 from bartekrutkowski/developErik Johnston2016-06-101-2/+2
|\ \ \ | | | | | | | | Change /bin/bash to /bin/sh in tox.ini
| * | | Change /bin/bash to /bin/sh in tox.iniBartek Rutkowski2016-06-101-2/+2
| |/ / | | | | | | No features of Bash are used here, so using /bin/sh makes it more portable to systems that don't have Bash natively (like BSD systems).
* | | Merge pull request #863 from matrix-org/markjh/load_configMark Haines2016-06-104-48/+126
|\ \ \ | |/ / |/| | Add function to load config without generating it
| * | Add function to load config without generating itMark Haines2016-06-094-48/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renames ``load_config`` to ``load_or_generate_config`` Adds a method called ``load_config`` that just loads the config. The main synapse.app.homeserver will continue to use ``load_or_generate_config`` to retain backwards compat. However new worker processes can use ``load_config`` to load the config avoiding some of the cruft needed to generate the config. As the new ``load_config`` method is expected to be used by new configs it removes support for the legacy commandline overrides that ``load_or_generate_config`` supports
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-06-094-8/+20
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse v0.16.0Erik Johnston2016-06-09218-5459/+13401
| |\
| | * Change CHANGELOGErik Johnston2016-06-091-1/+1
| | |
| | * Bump version and changelogErik Johnston2016-06-092-1/+11
| | |
| * | Merge pull request #801 from ruma/readme-history-storageMatthew Hodgson2016-05-291-6/+7
| |\ \ | | | | | | | | Alter phrasing to clarify where info is stored.
| | * | Alter phrasing to clarify where info is stored.Jimmy Cuadra2016-05-291-6/+7
| |/ / | | | | | | | | | | | | | | | | | | A user on #matrix:matrix.org was confused by the phrasing of the first sentence in the paragraph and couldn't tell whether it was saying that the homeserver stored the data or the clients did. This change splits it into two sentences to make the subject of each sentence clear.
| * | Merge pull request #766 from sbts/patch-1Erik Johnston2016-05-091-1/+1
| |\ \ | | | | | | | | Fix Typo in README.rst s/Halp/Help/
| | * | Fix Typo in README.rst s/Halp/Help/David2016-05-061-1/+1
| |/ /
| * | Merge pull request #728 from OlegGirko/systemd_env_fileErik Johnston2016-04-181-0/+1
| |\ \ | | | | | | | | Add environment file to systemd unit configuration.
| | * | Add environment file to systemd unit configuration.Oleg Girko2016-04-141-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Now there is at least one environment variable that controls synapse server's behaviour: SYNAPSE_CACHE_FACTOR. So, it makes sense to make systemd unit file to use environment configuration file that can set this variable's value. Signed-off-by: Oleg Girko <ol@infoserver.lv>
* | | Merge pull request #862 from matrix-org/erikj/media_remote_errorErik Johnston2016-06-091-4/+10
|\ \ \ | | | | | | | | 502 on /thumbnail when can't contact remote server
| * | | 502 on /thumbnail when can't contact remote serverErik Johnston2016-06-091-4/+10
| | | |
* | | | Merge pull request #860 from negzi/bug_fix_get_or_create_userErik Johnston2016-06-092-8/+5
|\ \ \ \ | |/ / / |/| | | Fix a bug caused by a change in auth_handler function
| * | | Fix a bug caused by a change in auth_handler functionNegar Fazeli2016-06-082-8/+5
| | | | | | | | | | | | | | | | Fix the relevant unit test cases
* | | | Merge pull request #861 from matrix-org/erikj/events_logErik Johnston2016-06-091-24/+21
|\ \ \ \ | |/ / / |/| | | Remove redundant exception log in /events
| * | | Remove redundant exception log in /eventsErik Johnston2016-06-091-24/+21
|/ / /
* | | Merge pull request #859 from matrix-org/erikj/public_room_performanceErik Johnston2016-06-081-16/+16
|\ \ \ | | | | | | | | Pull full state for each room all at once
| * | | Pull full state for each room all at onceErik Johnston2016-06-081-16/+16
| | | |
* | | | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into developErik Johnston2016-06-082-1/+28
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Update commit hash in changelog v0.16.0-rc2Erik Johnston2016-06-081-1/+1
| | |
| * | Bump version and changelog to v0.16.0-rc2Erik Johnston2016-06-082-1/+28
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.0Erik Johnston2016-06-0822-398/+997
| |\ \
* | \ \ Merge pull request #857 from matrix-org/erikj/default_visibilityErik Johnston2016-06-081-2/+0
|\ \ \ \ | | | | | | | | | | Don't make rooms visibile by default
| * | | | Don't make rooms visibile by defaultErik Johnston2016-06-081-2/+0
| | | | |
* | | | | Disable the synchrotron on jenkins until the sytest support lands (#855)Mark Haines2016-06-081-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Disable the synchrotron on jenkins until the sytest support lands * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins
* | | | Fix up federation PublicRoomListErik Johnston2016-06-081-1/+1
| | | |
* | | | Merge pull request #856 from matrix-org/erikj/fed_pub_roomsErik Johnston2016-06-082-5/+7
|\ \ \ \ | | | | | | | | | | Enable auth on /publicRoom endpoints
| * | | | Log user that is making /publicRooms callsErik Johnston2016-06-081-0/+7
| | | | |
| * | | | Enable auth on federation PublicRoomListErik Johnston2016-06-081-5/+0
| | | | |
* | | | | Merge pull request #854 from matrix-org/erikj/federation_loggingErik Johnston2016-06-081-0/+19
|\ \ \ \ \ | |/ / / / |/| | | | Add some logging for when servers ask for missing events
| * | | | Add some logging for when servers ask for missing eventsErik Johnston2016-06-081-0/+19
| | |/ / | |/| |
* | | | Merge pull request #853 from matrix-org/erikj/replication_noopErik Johnston2016-06-085-0/+15
|\ \ \ \ | |/ / / |/| | | Don't hit DB for noop replications queries
| * | | Don't hit DB for noop replications queriesErik Johnston2016-06-085-0/+15
|/ / /
* | | Merge pull request #850 from matrix-org/erikj/gc_thresholdErik Johnston2016-06-082-0/+28
|\ \ \ | | | | | | | | Add gc_threshold to pusher and synchrotron
| * | | Add gc_threshold to pusher and synchrotronErik Johnston2016-06-072-0/+28
| | | |
* | | | Merge pull request #852 from matrix-org/erikj/gc_metricsErik Johnston2016-06-081-0/+4
|\ \ \ \ | | | | | | | | | | Add GC counts to metrics
| * | | | Don't track total objects as its too expensive to calculateErik Johnston2016-06-071-1/+0
| | | | |
| * | | | Record some more GC metricsErik Johnston2016-06-071-0/+5
| | | | |
* | | | | Merge pull request #851 from matrix-org/markjh/jenkins_synchrotronMark Haines2016-06-071-0/+84
|\ \ \ \ \ | |/ / / / |/| | | | Add script for running sytest with dendron
| * | | | Add script for running sytest with dendronMark Haines2016-06-071-0/+84
| | | | |
* | | | | Merge pull request #849 from matrix-org/erikj/gc_thresholdErik Johnston2016-06-074-6/+38
|\ \ \ \ \ | | |/ / / | |/| | | Allow setting of gc.set_thresholds
| * | | | Allow setting of gc.set_thresholdsErik Johnston2016-06-074-6/+38
| |/ / /
* | | | Merge pull request #848 from matrix-org/markjh/unusedIVMark Haines2016-06-074-54/+0
|\ \ \ \ | |/ / / |/| | | Remove dead code.
| * | | Remove dead code.Mark Haines2016-06-074-54/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading push rules now happens in the datastore, so we can remove the methods that loaded them outside the datastore. The ``waiting_for_join_list`` in federation handler is populated by anything, so can be removed. The ``_get_members_events_txn`` method isn't called from anywhere so can be removed.
* | | Merge pull request #847 from matrix-org/erikj/gc_tickErik Johnston2016-06-071-8/+6
|\ \ \ | | | | | | | | Change the way we do stats for GC
| * | | Also record number of unreachable objectsErik Johnston2016-06-071-2/+4
| | | |
| * | | Change the way we do statsErik Johnston2016-06-071-7/+3
|/ / /
* | | Merge pull request #771 from matrix-org/erikj/gc_tickErik Johnston2016-06-071-0/+26
|\ \ \ | | | | | | | | Manually run GC on reactor tick.
| * | | Count number of GC collectsErik Johnston2016-05-161-5/+11
| | | |
| * | | Add a commentErik Johnston2016-05-131-0/+5
| | | |
| * | | Manually run GC on reactor tick.Erik Johnston2016-05-091-0/+15
| | | | | | | | | | | | | | | | This also adds a metric for amount of time spent in GC.
* | | | Merge pull request #846 from matrix-org/markjh/user_joined_notifierMark Haines2016-06-071-8/+6
|\ \ \ \ | | | | | | | | | | Notify users for events in rooms they join.
| * | | | Notify users for events in rooms they join.Mark Haines2016-06-071-8/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | Change how the notifier updates the map from room_id to user streams on receiving a join event. Make it update the map when it notifies for the join event, rather than using the "user_joined_room" distributor signal
* | | | Fix AS retries, but with correct orderingErik Johnston2016-06-072-6/+6
| | | |
* | | | Fix AS retriesErik Johnston2016-06-072-5/+5
| | | |
* | | | Merge pull request #845 from matrix-org/markjh/synchrotron_presenceMark Haines2016-06-061-1/+4
|\ \ \ \ | | | | | | | | | | Fix a KeyError in the synchrotron presence
| * | | | Fix a KeyError in the synchrotron presenceMark Haines2016-06-061-1/+4
| | | | |
* | | | | Merge pull request #844 from matrix-org/markjh/yield_on_sleepMark Haines2016-06-062-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Yield on the sleeps intended to backoff replication
| * | | | | Yield on the sleeps intended to backoff replicationMark Haines2016-06-062-2/+2
| |/ / / /
* | | | | .values() returns list of setsErik Johnston2016-06-061-1/+2
| | | | |
* | | | | Merge pull request #842 from matrix-org/erikj/presence_timerErik Johnston2016-06-061-33/+37
|\ \ \ \ \ | |/ / / / |/| | | | Fire after 30s not 8h
| * | | | Fix typosErik Johnston2016-06-061-32/+36
| | | | |
| * | | | Fire after 30s not 8hErik Johnston2016-06-061-1/+1
|/ / / /
* | | | Merge pull request #841 from matrix-org/erikj/event_counterErik Johnston2016-06-061-0/+9
|\ \ \ \ | | | | | | | | | | Add metric counter for number of persisted events
| * | | | Add metric counter for number of persisted eventsErik Johnston2016-06-061-0/+9
| | | | |
* | | | | Merge pull request #840 from matrix-org/erikj/event_write_throughErik Johnston2016-06-061-0/+41
|\ \ \ \ \ | |/ / / / |/| | | | Add events to cache when we persist them
| * | | | Add events to cache when we persist themErik Johnston2016-06-061-0/+41
|/ / / /
* | | | Merge pull request #836 from matrix-org/erikj/change_event_cacheErik Johnston2016-06-031-54/+59
|\ \ \ \ | | | | | | | | | | Change the way we cache events
| * | | | Don't rely on options when inserting event into cacheErik Johnston2016-06-031-40/+43
| | | | |
| * | | | Change the way we cache eventsErik Johnston2016-06-031-39/+41
| | | | |
* | | | | Merge pull request #837 from matrix-org/markjh/synchrotron_presence_listMark Haines2016-06-031-5/+10
|\ \ \ \ \ | |/ / / / |/| | | | Add get_presence_list_accepted to the broken caches in synchrotron
| * | | | Fix spellingMark Haines2016-06-031-1/+1
| | | | |
| * | | | Add get_presence_list_accepted to the broken caches in synchrotronMark Haines2016-06-031-4/+9
|/ / / /
* | | | Merge pull request #835 from matrix-org/erikj/get_event_txnErik Johnston2016-06-037-200/+75
|\ \ \ \ | | | | | | | | | | Remove event fetching from DB threads
| * | | | Remove event fetching from DB threadsErik Johnston2016-06-037-200/+75
| | | | |
* | | | | Merge pull request #834 from matrix-org/dbkr/fix_email_fromDavid Baker2016-06-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix email notif From
| * | | | 3rd time lucky: we'd already calculated it aboveDavid Baker2016-06-031-3/+1
| | | | |
| * | | | Oops, we're using the dict formDavid Baker2016-06-031-1/+3
| | | | |
| * | | | Add substitutions to email notif FromDavid Baker2016-06-031-1/+1
|/ / / /
* | | | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into developErik Johnston2016-06-032-5/+91
|\ \ \ \ | | |/ / | |/| |
| * | | Note that v0.15.x was never released v0.16.0-rc1Erik Johnston2016-06-031-0/+2
| | | |
| * | | Bump changelog and versionErik Johnston2016-06-032-1/+51
| | | |
| * | | Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into ↵Erik Johnston2016-06-032-5/+39
| |\ \ \ | | | | | | | | | | | | | | | release-v0.16.0
| | * | | Bump changelog and version v0.15.0-rc1Erik Johnston2016-04-262-5/+39
| | | | |
* | | | | Merge pull request #831 from matrix-org/markjh/synchrotronIIMark Haines2016-06-031-0/+510
|\ \ \ \ \ | | | | | | | | | | | | Add a separate process that can handle /sync requests
| * | | | | Clear the list of ongoing syncs on shutdownMark Haines2016-06-031-0/+9
| | | | | |
| * | | | | Appease flake8Mark Haines2016-06-031-1/+1
| | | | | |
| * | | | | Use ClientIpStore to record client ipsMark Haines2016-06-031-3/+4
| | | | | |
| * | | | | Merge branch 'develop' into markjh/synchrotronIIMark Haines2016-06-0314-128/+197
| |\ \ \ \ \
| * | | | | | Send updates to the syncing users every ten seconds or immediately if ↵Mark Haines2016-06-031-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | they've just come online
| * | | | | | Add a separate process that can handle /sync requestsMark Haines2016-06-031-0/+467
| | | | | | |
* | | | | | | Merge pull request #832 from matrix-org/erikj/presence_coountErik Johnston2016-06-031-5/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Change def of small delta in presence stream. Add metrics.
| * | | | | | Change metric styleErik Johnston2016-06-031-5/+4
| | | | | | |
| * | | | | | Presence metrics. Change def of small deltaErik Johnston2016-06-031-5/+10
| | | | | | |
* | | | | | | Merge pull request #833 from matrix-org/markjh/client_ipsMark Haines2016-06-032-45/+71
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Move insert_client_ip to a separate class
| * | | | | | Move insert_client_ip to a separate classMark Haines2016-06-032-45/+71
|/ / / / / /
* / / / / / Fix typoErik Johnston2016-06-031-1/+1
|/ / / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 07:07:29 +0000