summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-07-287-14/+85
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #961 from matrix-org/dbkr/fix_push_invite_nameErik Johnston2016-07-281-1/+4
| | |\ \ \ \
| | | * | | | Don't include name of room for invites in pushDavid Baker2016-07-281-1/+4
| | * | | | | Merge pull request #960 from matrix-org/rav/support_r0.2Richard van der Hoff2016-07-281-1/+5
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Add r0.1.0 to the "supported versions" listRichard van der Hoff2016-07-281-0/+1
| | | * | | | Add r0.2.0 to the "supported versions" listRichard van der Hoff2016-07-281-1/+4
| | * | | | | TypoDavid Baker2016-07-281-1/+1
| | |/ / / /
| | * | | | Merge pull request #956 from matrix-org/rav/check_device_id_on_key_uploadRichard van der Hoff2016-07-274-11/+75
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | key upload tweaksRichard van der Hoff2016-07-271-7/+5
| | | * | | SQL syntax fixRichard van der Hoff2016-07-271-1/+1
| | | * | | Delete e2e keys on device deleteRichard van der Hoff2016-07-273-4/+28
| | | * | | Make the device id on e2e key upload optionalRichard van der Hoff2016-07-262-12/+54
| * | | | | Bump CHANGES and versionErik Johnston2016-07-272-1/+57
| |/ / / /
| * | | | Merge pull request #957 from matrix-org/markjh/verifyMark Haines2016-07-271-74/+80
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into markjh/verifyMark Haines2016-07-272-3/+11
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #955 from matrix-org/markjh/only_from2Mark Haines2016-07-271-2/+9
| |\ \ \ \ \
| | * | | | | Add a couple more checks to the keyringMark Haines2016-07-261-2/+9
| * | | | | | Merge pull request #954 from matrix-org/markjh/even_more_fixesMark Haines2016-07-272-9/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix a couple of bugs in the transaction and keyring codeMark Haines2016-07-262-9/+11
| | | |/ / / | | |/| | |
| | | * | | Clean up verify_json_objects_for_serverMark Haines2016-07-271-68/+75
| | |/ / / | |/| | |
| * | | | Merge pull request #952 from matrix-org/markjh/more_fixesMark Haines2016-07-261-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Check if the user is banned when handling 3pid invitesMark Haines2016-07-261-0/+4
| * | | | Merge pull request #953 from matrix-org/rav/requesterRichard van der Hoff2016-07-2611-75/+101
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add `create_requester` functionRichard van der Hoff2016-07-2611-75/+101
| |/ / /
| * | | Fix typoRichard van der Hoff2016-07-261-1/+1
| * | | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_deviceRichard van der Hoff2016-07-263-59/+115
| |\ \ \
| | * \ \ Merge pull request #951 from matrix-org/rav/flake8Richard van der Hoff2016-07-262-9/+5
| | |\ \ \
| | | * | | Fix flake8 violationRichard van der Hoff2016-07-261-5/+3
| | | * | | Fix flake8 configurationRichard van der Hoff2016-07-261-4/+2
| | * | | | Merge pull request #948 from matrix-org/markjh/auth_fixesMark Haines2016-07-261-50/+110
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix how push_actions are redacted.Mark Haines2016-07-261-8/+10
| | | * | | Don't add rejected events if we've seen them befrore. Add some comments to ex...Mark Haines2016-07-261-5/+48
| | | * | | Only update the events and event_json tables for rejected eventsMark Haines2016-07-252-52/+63
| | | * | | Don't add the events to forward extremities if the event is rejectedMark Haines2016-07-251-3/+6
| | | * | | Don't add rejections to the state_group, persist all rejectionsMark Haines2016-07-252-5/+6
| * | | | | Delete refresh tokens when deleting devicesRichard van der Hoff2016-07-263-15/+83
| |/ / / /
| * | | | Merge pull request #949 from matrix-org/rav/update_devicesDavid Baker2016-07-2613-28/+295
| |\ \ \ \
| | * | | | Implement updating devicesRichard van der Hoff2016-07-265-8/+119
| | * | | | Implement deleting devicesRichard van der Hoff2016-07-2611-21/+176
| | * | | | Log when adding listenersRichard van der Hoff2016-07-251-0/+1
| * | | | | federation doesn't work over ipv6 yet thanks to twistedMatthew Hodgson2016-07-261-1/+1
| * | | | | typoMatthew Hodgson2016-07-261-1/+1
| |/ / / /
| * | | | Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostnameDavid Baker2016-07-251-2/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use get to avoid KeyErrorsDavid Baker2016-07-221-1/+1
| | * | | Log the hostname the reCAPTCHA was completed onDavid Baker2016-07-221-2/+11
| * | | | fix: defer.returnValue takes one argumentMark Haines2016-07-251-1/+1
| * | | | background updates: fix assert againRichard van der Hoff2016-07-251-1/+1
| * | | | background updates: Fix assertion to do somethingRichard van der Hoff2016-07-251-2/+2
| * | | | Merge pull request #945 from matrix-org/rav/background_reindexRichard van der Hoff2016-07-254-23/+113
| |\ \ \ \
| | * | | | PEP8Richard van der Hoff2016-07-251-1/+1
| | * | | | Fix background_update testsRichard van der Hoff2016-07-252-13/+36
| | * | | | PEP8Richard van der Hoff2016-07-221-1/+0
| | * | | | Create index on user_ips in the backgroundRichard van der Hoff2016-07-223-12/+80
| | |/ / /
| * | | | Merge pull request #947 from matrix-org/rav/unittest_loggingRichard van der Hoff2016-07-251-4/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Slightly saner logging for unittestsRichard van der Hoff2016-07-251-4/+7
| |/ / /
| * | | Merge pull request #944 from matrix-org/rav/devices_returns_listDavid Baker2016-07-212-9/+12
| |\ \ \ | | |_|/ | |/| |
| | * | make /devices return a listRichard van der Hoff2016-07-212-9/+12
| |/ /
| * | Merge pull request #943 from matrix-org/rav/get_device_apiDavid Baker2016-07-213-19/+90
| |\ \
| | * | Fix PEP8 errorsRichard van der Hoff2016-07-212-1/+2
| | * | Implement GET /device/{deviceId}Richard van der Hoff2016-07-213-19/+89
| * | | Merge pull request #942 from matrix-org/rav/fix_register_deviceidDavid Baker2016-07-211-11/+10
| |\ \ \ | | |/ / | |/| |
| | * | Preserve device_id from first call to /registerRichard van der Hoff2016-07-211-11/+10
| | |/
| * | Merge branch 'rav/get_devices_api' into developRichard van der Hoff2016-07-211-3/+0
| |\ \
| | * | storage/client_ips: remove some dead codeRichard van der Hoff2016-07-211-3/+0
| * | | Merge pull request #939 from matrix-org/rav/get_devices_apiDavid Baker2016-07-2110-17/+395
| |\| | | | |/ | |/|
| | * Fix PEP8 errorsRichard van der Hoff2016-07-202-3/+1
| | * Merge branch 'develop' into rav/get_devices_apiRichard van der Hoff2016-07-206-26/+86
| | |\ | | |/ | |/|
| * | Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ipsRichard van der Hoff2016-07-203-8/+34
| |\ \
| | * | Record device_id in client_ipsRichard van der Hoff2016-07-203-8/+34
| * | | Don't explode if we have no snapshots yetErik Johnston2016-07-201-0/+3
| * | | Merge pull request #937 from matrix-org/rav/register_device_on_registerDavid Baker2016-07-202-18/+49
| |\ \ \ | | |/ / | |/| |
| | * | Register a device_id in the /v2/register flow.Richard van der Hoff2016-07-202-18/+49
| | | * GET /devices endpointRichard van der Hoff2016-07-2010-17/+397
| | |/ | |/|
| * | More doc-commentsRichard van der Hoff2016-07-202-10/+14
| |/
| * Merge pull request #936 from matrix-org/erikj/log_rssErik Johnston2016-07-205-1/+54
| |\
| | * Make jenkins install deps on unit testsErik Johnston2016-07-201-0/+4
| | * Add metrics for psutil derived memory usageErik Johnston2016-07-204-1/+50
| * | Merge pull request #935 from matrix-org/erikj/backfill_notifsErik Johnston2016-07-201-5/+6
| |\ \
| | * | Don't notify pusher pool for backfilled eventsErik Johnston2016-07-201-5/+6
| | |/
| * | Merge pull request #933 from matrix-org/rav/type_annotationsRichard van der Hoff2016-07-207-0/+47
| |\ \
| | * | MANIFEST.in: Add *.pyiRichard van der Hoff2016-07-191-0/+1
| | * | Type annotationsRichard van der Hoff2016-07-196-0/+46
| * | | Merge pull request #932 from matrix-org/rav/register_refactorDavid Baker2016-07-205-22/+57
| |\ \ \ | | |_|/ | |/| |
| | * | Further registration refactoringRichard van der Hoff2016-07-195-22/+57
| | |/
| * | Merge pull request #922 from matrix-org/erikj/file_api2Erik Johnston2016-07-208-15/+246
| |\ \ | | |/ | |/|
| | * CommentErik Johnston2016-07-201-0/+4
| | * Add filter param to /messages APIErik Johnston2016-07-144-11/+29
| | * Add support for filters in paginate_room_eventsErik Johnston2016-07-141-1/+51
| | * Add 'contains_url' to filterErik Johnston2016-07-141-3/+20
| | * Add sender and contains_url field to events tableErik Johnston2016-07-142-0/+142
| * | Merge pull request #931 from matrix-org/rav/refactor_registerDavid Baker2016-07-192-79/+104
| |\ \
| | * | Don't bind email unless threepid contains expected fieldsRichard van der Hoff2016-07-191-28/+25
| | * | rest/client/v2_alpha/register.py: Refactor flow somewhat.Richard van der Hoff2016-07-192-76/+104
| * | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_loginRichard van der Hoff2016-07-1912-31/+354
| |\ \ \ | | |/ / | |/| |
| | * | schema fixRichard van der Hoff2016-07-191-1/+1
| | * | Add device_id support to /loginRichard van der Hoff2016-07-1812-31/+354
| * | | Merge pull request #930 from matrix-org/markjh/handlersMark Haines2016-07-191-3/+14
| |\ \ \ | | |/ / | |/| |
| | * | Summary lineMark Haines2016-07-191-2/+1
| | * | Update docstring on Handlers.Mark Haines2016-07-191-3/+15
| |/ /
| * | Merge pull request #928 from matrix-org/rav/refactor_loginRichard van der Hoff2016-07-182-65/+82
| |\ \
| | * | Refactor login flowRichard van der Hoff2016-07-182-65/+82
| * | | Merge pull request #924 from matrix-org/erikj/purge_historyErik Johnston2016-07-181-19/+15
| |\ \ \
| | * | | Fix /purge_history bugErik Johnston2016-07-151-19/+15
| * | | | Merge pull request #925 from matrix-org/markjh/auth_fixMark Haines2016-07-181-0/+5
| |\ \ \ \
| | * | | | Fix 500 ISE when sending alias event without a state_keyMark Haines2016-07-151-0/+5
| * | | | | Merge pull request #927 from Half-Shot/developErik Johnston2016-07-181-5/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Use body.get to check for 'user'Will Hunt2016-07-161-2/+1
| | * | | | Fall back to 'username' if 'user' is not given for appservice reg.Will Hunt2016-07-161-3/+5
| | |/ / /
| * / / / Fix a doc-commentRichard van der Hoff2016-07-181-1/+1
| |/ / /
| * | | Merge pull request #923 from matrix-org/erikj/purge_historyErik Johnston2016-07-152-2/+13
| |\| |
| | * | Pull out min stream_ordering from ex_outlier_streamErik Johnston2016-07-151-1/+2
| | * | event_backwards_extremeties may not be emptyErik Johnston2016-07-151-1/+11
| * | | Merge pull request #919 from matrix-org/erikj/auth_fixErik Johnston2016-07-153-5/+35
| |\ \ \ | | |/ / | |/| |
| | * | 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
| |\ \ \
| | * | | 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 tokensNegar Fazeli2016-07-136-9/+42
| | |/
| * | Merge pull request #915 from matrix-org/dbkr/more_requesttokensDavid Baker2016-07-133-30/+103
| |\ \ | | |/ | |/|
| | * 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
| |\ \ | | |/ | |/|
| | * 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 pull request #911 from matrix-org/erikj/purge_historyErik Johnston2016-07-077-34/+386
| |\ \
| | * | 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
| |\ \ \
| * \ \ \ Merge pull request #910 from KentShikama/hash_password_followupErik Johnston2016-07-062-2/+18
| |\ \ \ \
| | * | | | Update password config commentKent Shikama2016-07-061-1/+1
| | * | | | Update hash_password scriptKent Shikama2016-07-061-1/+17
| |/ / / /
| | | * | 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 matrix-org/dbkr/register_email_no_untrusted_id_s...David Baker2016-07-052-15/+29
| |\ \ \
| | * | | requestToken updateDavid Baker2016-06-302-15/+29
| * | | | Merge pull request #906 from matrix-org/markjh/faster_events_aroundMark Haines2016-07-052-60/+102
| |\ \ \ \
| | * | | | 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, a...Mark Haines2016-07-052-5/+7
| | * | | | 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
| |\ \ \ \ \
| | * | | | | 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
| |/ / / / /
| | | | * | 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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix style violationsKent Shikama2016-07-042-2/+4
| | * | | 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
| |/ / /
| * | | 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 APIErik Johnston2016-06-303-0/+40
| |/ /
| * | Merge pull request #902 from matrix-org/erikj/expire_mediaErik Johnston2016-06-297-21/+190
| |\ \
| | * | 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
| |\ \
| | * | Update turn-howto.rst to use git clone (2)Rick Cogley2016-06-281-1/+5
| | * | Update turn-howto.rst to use git cloneRick Cogley2016-06-281-1/+1
| | * | Remove double spacesRick Cogley2016-06-281-12/+11
| | * | Update to reflect new location at github. Rick Cogley2016-06-261-16/+18
| * | | Merge pull request #894 from matrix-org/dbkr/push_room_namingDavid Baker2016-06-287-121/+26
| |\ \ \
| | * \ \ 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
| | * | | | 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
| * | | | | 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 baseMark Haines2016-06-243-4/+7
| |/ / /
| * | | Merge branch 'master' into developMark Haines2016-06-232-27/+152
| |\| |
| * | | Merge pull request #892 from matrix-org/dbkr/email_notif_most_recentDavid Baker2016-06-231-4/+15
| |\ \ \
| | * | | Actually we need to order these properlyDavid Baker2016-06-221-2/+12
| | * | | StyleDavid Baker2016-06-221-1/+1
| | * | | Put most recent 20 messages in notifDavid Baker2016-06-221-3/+4
| |/ / /
| * | | Merge pull request #843 from mweinelt/ldap3-rewriteErik Johnston2016-06-224-60/+249
| |\ \ \
| | * | | Rework ldap integration with ldap3Martin Weinelt2016-06-224-60/+249
| |/ / /
| * | | Merge pull request #888 from matrix-org/markjh/content_repoMark Haines2016-06-213-132/+3
| |\ \ \
| | * | | Remove the legacy v0 content upload API.Mark Haines2016-06-213-132/+3
| * | | | Merge pull request #887 from matrix-org/dbkr/notif_template_subs_failDavid Baker2016-06-211-1/+1
| |\ \ \ \
| | * | | | 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)Erik Johnston2016-06-172-67/+78
| | |/ / /
* | | | | Merge pull request #959 from evelynmitchell/patch-1Matthew Hodgson2016-07-281-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 3PID defined on first mentionevelynmitchell2016-07-271-2/+2
|/ / / /
* | | | 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 in...Erik Johnston2016-07-071-5/+10
* | | | | Merge pull request #886 from matrix-org/markjh/async_commitMark Haines2016-06-293-3/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Optionally make committing to postgres asynchronous.Mark Haines2016-06-203-3/+14
| | |_|/ | |/| |
* | | | Merge pull request #889 from matrix-org/markjh/synctl_workersMark Haines2016-06-211-27/+151
|\ \ \ \ | |_|/ / |/| | |
| * | | Optionally start or stop workers in synctl.Mark Haines2016-06-211-27/+151
| |/ /
* | | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1Erik Johnston2016-06-2040-517/+617
|\ \ \ | | |/ | |/|
| * | 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
| | |\ \ | | | |/ | | |/|
| | | * 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
| | |/
| | * Merge pull request #878 from matrix-org/erikj/ujsonErik Johnston2016-06-171-1/+1
| | |\
| | | * 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
| | |\ \
| | | * | 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 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``Mark Haines2016-06-171-14/+15
| | |/ /
| | * / 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
| | |\
| | | * Use worker_ prefixes for worker config, use existing support for multiple con...Mark Haines2016-06-165-79/+33
| | | * Access the event_cache_size directly from the server object.Mark Haines2016-06-165-21/+10
| | | * 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.hashpwSalvatore LaMendola2016-06-161-1/+1
| | * | | Merge pull request #872 from matrix-org/erikj/preview_url_fixesErik Johnston2016-06-161-5/+6
| | |\ \ \ | | | |/ / | | |/| |
| | | * | 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 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
| | |\ \ \ | | |/ / / | |/| | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-04 18:16:41 +0000