summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #973 from matrix-org/erikj/xpath_fixErik Johnston2016-08-042-14/+211
|\
| * TypoErik Johnston2016-08-041-1/+1
| * Test summarizationErik Johnston2016-08-042-52/+193
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fixErik Johnston2016-08-0423-349/+769
| |\
| * | Don't infer paragrahs from newlinesErik Johnston2016-08-021-2/+1
| * | Comment on why we cloneErik Johnston2016-08-021-0/+1
| * | Spelling.Erik Johnston2016-08-021-3/+3
| * | Make it actually compileErik Johnston2016-08-021-1/+1
| * | Change the way we summarize URLsErik Johnston2016-08-021-11/+67
* | | Merge pull request #983 from matrix-org/erikj/retry_on_integrity_errorErik Johnston2016-08-041-4/+66
|\ \ \ | |_|/ |/| |
| * | Fix typoErik Johnston2016-08-041-3/+4
| * | Retry event persistence on IntegrityErrorErik Johnston2016-08-041-4/+65
* | | Merge pull request #979 from matrix-org/erikj/state_ids_apiErik Johnston2016-08-044-1/+151
|\ \ \ | |/ / |/| |
| * | Fix typos.Erik Johnston2016-08-041-3/+3
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_apiErik Johnston2016-08-0418-305/+572
| |\ \ | |/ / |/| |
* | | Merge pull request #982 from matrix-org/erikj/fix_port_scriptErik Johnston2016-08-041-43/+132
|\ \ \
| * | | Allow upgrading from old port_from_sqlite3 formatErik Johnston2016-08-041-0/+21
| * | | Handle the fact that some tables have negative rowid rowsErik Johnston2016-08-041-43/+111
* | | | Merge pull request #981 from matrix-org/rav/omit_device_displayname_if_nullRichard van der Hoff2016-08-041-3/+4
|\ \ \ \
| * | | | keys/query: Omit device displayname if nullRichard van der Hoff2016-08-041-3/+4
* | | | | Factor out more common code from the jenkins scripts (#980)Mark Haines2016-08-044-138/+44
|/ / / /
* | | | Merge pull request #978 from matrix-org/rav/device_name_in_e2e_devicesRichard van der Hoff2016-08-033-20/+141
|\ \ \ \
| * | | | PEP8Richard van der Hoff2016-08-032-12/+10
| * | | | Include device name in /keys/query responseRichard van der Hoff2016-08-033-20/+143
* | | | | Merge pull request #977 from matrix-org/rav/return_all_devicesRichard van der Hoff2016-08-032-3/+52
|\| | | | | |/ / / |/| | |
| * | | keys/query: return all users which were asked forRichard van der Hoff2016-08-032-3/+52
|/ / /
* | | Merge branch 'rav/null_default_device_displayname' into developRichard van der Hoff2016-08-034-5/+23
|\ \ \
| * | | PEP8Richard van der Hoff2016-08-031-1/+1
| * | | Default device_display_name to nullRichard van der Hoff2016-08-034-5/+23
* | | | Merge branch 'rav/refactor_device_query' into developRichard van der Hoff2016-08-036-82/+167
|\ \ \ \
| * | | | E2eKeysHandler: minor tweaksRichard van der Hoff2016-08-031-5/+3
| * | | | Merge branch 'develop' into rav/refactor_device_queryMark Haines2016-08-0322-139/+507
| |\| | |
| * | | | E2E keys: Make federation query share code with client queryRichard van der Hoff2016-08-023-47/+92
| * | | | Move e2e query logic into a handlerRichard van der Hoff2016-08-014-60/+102
* | | | | Merge pull request #975 from matrix-org/erikj/multi_event_persistErik Johnston2016-08-031-20/+18
|\ \ \ \ \
| * | | | | Remove other bit of deduplicationErik Johnston2016-08-031-19/+0
| * | | | | Ensure we only persist an event once at a timeErik Johnston2016-08-031-1/+18
| | |_|_|/ | |/| | |
| | | | * Tidy up get_eventsErik Johnston2016-08-041-12/+10
| | | | * Rename fields to _idsErik Johnston2016-08-032-4/+4
| | | | * Fix copy + paste failsErik Johnston2016-08-032-6/+11
| | | | * Actually call get_room_stateErik Johnston2016-08-031-0/+4
| | | | * Fix syntax errorErik Johnston2016-08-031-1/+8
| | | | * CommentErik Johnston2016-08-031-0/+14
| | | | * Add /state_ids federation APIErik Johnston2016-08-034-3/+125
| |_|_|/ |/| | |
* | | | Print status code in federation_client.pyErik Johnston2016-08-031-0/+1
| |_|/ |/| |
* | | Factor out some of the code shared between the sytest scripts (#974)Mark Haines2016-08-026-69/+71
|/ /
* | Merge pull request #971 from matrix-org/erikj/fed_stateErik Johnston2016-08-021-3/+3
|\ \
| * | Don't double wrap 200Erik Johnston2016-08-021-2/+2
| * | Fix response cacheErik Johnston2016-08-021-1/+1
|/ /
* | Merge pull request #940 from matrix-org/erikj/fed_state_cacheErik Johnston2016-08-025-32/+60
|\ \
| * | Cache federation state responsesErik Johnston2016-07-215-32/+60
* | | Print authorization header for federation_client.pyErik Johnston2016-08-021-5/+6
* | | Merge pull request #967 from matrix-org/erikj/fed_readerErik Johnston2016-08-0210-24/+350
|\ \ \
| * | | Change default jenkins port base and countErik Johnston2016-08-023-6/+7
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-08-024-4/+24
| |\ \ \
| * | | | Make jenkins dendron test federation read apisErik Johnston2016-07-291-0/+1
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-07-291-4/+31
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-07-2954-345/+1250
| |\ \ \ \ \
| * | | | | | Add destination retry to slave storeErik Johnston2016-07-282-0/+32
| * | | | | | Add slace storage functions for public room listErik Johnston2016-07-283-0/+48
| * | | | | | Add get_auth_chain to slave storeErik Johnston2016-07-281-0/+4
| * | | | | | Add more key storage funcs into slave storeErik Johnston2016-07-282-24/+26
| * | | | | | Split out a FederationReader processErik Johnston2016-07-214-0/+238
* | | | | | | Merge pull request #968 from matrix-org/dbkr/fix_add_email_on_registerDavid Baker2016-08-021-9/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'develop' into dbkr/fix_add_email_on_registerMark Haines2016-08-024-4/+24
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #970 from matrix-org/erikj/clockErik Johnston2016-08-022-3/+16
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Ignore AlreadyCalled errors on timer cancelErik Johnston2016-07-312-3/+16
* | | | | | | missing --upgradeMatthew Hodgson2016-08-011-1/+1
|/ / / / / /
* | | | | | Merge pull request #958 from matrix-org/paul/SYN-738Paul Evans2016-07-291-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Forbid non-ASes from registering users whose names begin with '_' (SYN-738)Paul "LeoNerd" Evans2016-07-271-0/+7
| | * | | | Fix adding emails on registrationDavid Baker2016-07-291-9/+7
| |/ / / / |/| | | |
* | | | | Merge pull request #964 from matrix-org/erikj/fed_join_fixErik Johnston2016-07-291-4/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Mention that func will fetch auth eventsErik Johnston2016-07-291-0/+2
| * | | | Update docstringErik Johnston2016-07-291-0/+6
| * | | | Handle the case of missing auth events when joining a roomErik Johnston2016-07-281-4/+23
* | | | | Merge pull request #966 from matrix-org/markjh/fix_pushMark Haines2016-07-295-52/+205
|\ \ \ \ \
| * | | | | Fix SQL to supply arguments in the same orderMark Haines2016-07-291-1/+1
| * | | | | Create separate methods for getting messages to pushMark Haines2016-07-285-51/+204
|/ / / / /
* | | | | Merge pull request #965 from matrix-org/kegan/comment-push-actions-fnKegsay2016-07-281-2/+26
|\ \ \ \ \
| * | | | | Comment get_unread_push_actions_for_user_in_range functionKegan Dougal2016-07-281-2/+26
|/ / / / /
* | | | | Merge pull request #963 from matrix-org/erikj/admin_docsErik Johnston2016-07-283-0/+46
|\ \ \ \ \
| * | | | | Use correct pathErik Johnston2016-07-281-1/+1
| * | | | | Add some basic admin API docsErik Johnston2016-07-283-0/+46
| |/ / / /
* | | | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into developErik Johnston2016-07-282-1/+65
|\| | | |
| * | | | Add authors to changelog v0.17.0-rc1Erik Johnston2016-07-281-4/+5
| * | | | Update changelogErik Johnston2016-07-281-0/+4
| * | | | Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into rel...Erik Johnston2016-07-281-3/+9
| |\ \ \ \
| * | | | | Bump version and changelogErik Johnston2016-07-282-3/+6
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-07-287-14/+85
| |\ \ \ \ \
| * | | | | | Bump CHANGES and versionErik Johnston2016-07-272-1/+57
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #962 from matrix-org/markjh/retryMark Haines2016-07-281-1/+1
|\ \ \ \ \ \
| * | | | | | Fix retry utils to check if the exception is a subclass of CMEMark Haines2016-07-281-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #941 from matrix-org/erikj/key_client_fixErik Johnston2016-07-281-3/+9
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Cache getPeerErik Johnston2016-07-211-2/+5
| * | | | Set host not pathErik Johnston2016-07-211-1/+1
| * | | | Send the correct host header when fetching keysErik Johnston2016-07-211-3/+6
| | |_|/ | |/| |
* | | | 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
* | | | 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 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 #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
|\ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-05 14:51:12 +0000