summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into dbkr/notifications_apiDavid Baker2016-08-1847-571/+1405
|\
| * Remove log linesErik Johnston2016-08-181-2/+0
| * Add appservice workerErik Johnston2016-08-187-123/+369
| * Make AppserviceHandler stream events from databaseErik Johnston2016-08-184-22/+107
| * Missed a s/federation reader/media repository/ in a log messageMark Haines2016-08-181-1/+1
| * Merge pull request #1024 from matrix-org/markjh/media_repositoryMark Haines2016-08-181-0/+212
| |\
| | * Add a media repository workerMark Haines2016-08-181-0/+212
| * | Merge pull request #1022 from matrix-org/erikj/as_notify_perfErik Johnston2016-08-182-62/+50
| |\ \
| | * | Make notify_interested_services fasterErik Johnston2016-08-172-62/+50
| * | | Fix push_display_name_rename schema updateErik Johnston2016-08-171-0/+3
| * | | Make push Measure finer grainedErik Johnston2016-08-171-4/+5
| * | | Merge pull request #1021 from matrix-org/erikj/mediasecurity_policyErik Johnston2016-08-171-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Set `Content-Security-Policy` on media repoErik Johnston2016-08-171-0/+1
| | |/
| * | Merge pull request #1011 from matrix-org/dbkr/contains_display_name_overrideDavid Baker2016-08-172-16/+37
| |\ \ | | |/ | |/|
| | * Add migration scriptDavid Baker2016-08-161-0/+17
| | * Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name...David Baker2016-08-169-211/+244
| | |\
| | * | s/underride/override/ in the rule_id tooDavid Baker2016-08-161-1/+1
| | * | Move display name ruleDavid Baker2016-08-151-16/+20
| * | | Add None check to _iterate_over_textErik Johnston2016-08-171-1/+1
| * | | Change name of metricMatrix2016-08-171-1/+1
| * | | Move Measure block inside loopErik Johnston2016-08-171-9/+9
| * | | Merge pull request #1019 from matrix-org/erikj/appservice_cleanErik Johnston2016-08-171-31/+30
| |\ \ \
| | * | | Clean up _ServiceQueuerErik Johnston2016-08-171-31/+30
| * | | | Remove dead appservice codeErik Johnston2016-08-171-39/+2
| |/ / /
| * | | Measure notify_interested_servicesErik Johnston2016-08-171-19/+22
| * | | Do it in storage functionErik Johnston2016-08-162-1/+4
| * | | Don't update caches replication stream if tokens haven't advancedErik Johnston2016-08-161-1/+1
| | |/ | |/|
| * | Flake8Erik Johnston2016-08-161-4/+1
| * | Fix up preview URL API. Add tests.Erik Johnston2016-08-161-157/+196
| * | Merge pull request #1012 from matrix-org/erikj/limit_backfill_uriErik Johnston2016-08-161-4/+5
| |\ \
| | * | Limit number of extremeties in backfill requestErik Johnston2016-08-161-4/+5
| * | | Merge pull request #1010 from matrix-org/erikj/refactor_deletionsErik Johnston2016-08-166-47/+42
| |\ \ \ | | |/ / | |/| |
| | * | Use cached get_user_by_access_token in slavesErik Johnston2016-08-163-2/+3
| | * | Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to sl...Erik Johnston2016-08-153-45/+39
| | |/
| * | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ...Erik Johnston2016-08-161-1/+2
| |\ \ | | |/ | |/|
| | * Add missing database corruption recovery caseBenjamin Saunders2016-08-141-1/+2
| * | Merge pull request #1009 from matrix-org/erikj/event_splitErik Johnston2016-08-1524-92/+367
| |\ \
| | * | Doc get_next() context manager usageErik Johnston2016-08-151-0/+4
| | * | Rename table. Add docs.Erik Johnston2016-08-154-6/+16
| | * | Remove broken cache stuffErik Johnston2016-08-152-21/+0
| | * | Use cached version of get_aliases_for_roomErik Johnston2016-08-151-1/+1
| | * | Implement cache replication streamErik Johnston2016-08-155-30/+92
| | * | Add some invalidations to a cache_streamErik Johnston2016-08-157-31/+117
| | * | Always run txn.after_callbacksErik Johnston2016-08-151-7/+8
| | * | Make synchrotron accept /eventsErik Johnston2016-08-125-18/+66
| | * | Dont invoke get_handlers fromClientV1RestServletErik Johnston2016-08-129-1/+86
| * | | Log the value which is observed in the first place.Daniel Ehlers2016-08-141-1/+1
| * | | Fix AttributeError when bind_dn is not defined.Daniel Ehlers2016-08-141-1/+1
| * | | Only process one local membership event per room at a timeErik Johnston2016-08-121-1/+1
| |/ /
| * | Merge pull request #997 from Half-Shot/developErik Johnston2016-08-113-5/+8
| |\ \
| | * | Synced up synchrotron set_state with PresenceHandler set_stateWill Hunt2016-08-111-1/+1
| | * | Don't change status_msg on /syncWill Hunt2016-08-102-4/+7
* | | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_apiDavid Baker2016-08-11152-3214/+8075
|\| | |
| * | | Include prev_content in redacted state eventsErik Johnston2016-08-111-0/+2
| * | | PEP8Erik Johnston2016-08-101-1/+3
| * | | Clean up TransactionQueueErik Johnston2016-08-104-221/+162
| * | | Merge pull request #999 from matrix-org/erikj/measure_moreErik Johnston2016-08-102-5/+21
| |\ \ \
| | * | | Measure federation send transaction resourcesErik Johnston2016-08-102-5/+21
| | |/ /
| * | | Don't stop on 4xx series errorsErik Johnston2016-08-101-11/+1
| * | | Also check if server is in the roomErik Johnston2016-08-101-2/+7
| * | | Also pull out rejected eventsErik Johnston2016-08-101-1/+1
| * | | Correctly auth /event/ requestsErik Johnston2016-08-101-5/+6
| * | | Only resign our own eventsErik Johnston2016-08-101-9/+10
| * | | Store if we fail to fetch an event from a destinationErik Johnston2016-08-101-1/+36
| |/ /
| * | Merge pull request #996 from matrix-org/erikj/tls_errorErik Johnston2016-08-102-13/+19
| |\ \
| | * | Don't print stack traces when failing to get remote keysErik Johnston2016-08-102-13/+19
| * | | /login: Respond with a 403 when we get an invalid m.login.tokenRichard van der Hoff2016-08-091-3/+3
| |/ /
| * | Merge pull request #995 from matrix-org/rav/clean_up_cas_loginDavid Baker2016-08-091-125/+33
| |\ \
| | * | Clean up CAS login codeRichard van der Hoff2016-08-081-125/+33
| | |/
| * | Merge pull request #994 from matrix-org/rav/fix_cas_loginDavid Baker2016-08-081-0/+1
| |\ \
| | * | Fix CAS loginRichard van der Hoff2016-08-081-0/+1
| | |/
| * | Merge pull request #993 from matrix-org/rav/fix_token_loginRichard van der Hoff2016-08-083-28/+38
| |\ \ | | |/ | |/|
| | * Fix login with m.login.tokenRichard van der Hoff2016-08-083-28/+38
| * | Bump changelog and versionErik Johnston2016-08-081-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-08-0812-68/+123
| |\|
| | * Make psutil optionalErik Johnston2016-08-083-6/+16
| | * Merge pull request #991 from matrix-org/erikj/retry_makeErik Johnston2016-08-051-11/+24
| | |\
| | | * Fix a couple of python bugsErik Johnston2016-08-051-6/+8
| | | * Retry joining via other servers if first one failedErik Johnston2016-08-051-5/+16
| | * | Merge pull request #990 from matrix-org/erikj/fed_versErik Johnston2016-08-056-49/+80
| | |\ \ | | | |/ | | |/|
| | | * Add federation /version APIErik Johnston2016-08-056-9/+25
| | | * Change the way we specify if we require auth or notErik Johnston2016-08-051-40/+55
| | * | Merge pull request #989 from matrix-org/erikj/raise_404Erik Johnston2016-08-051-1/+1
| | |\ \
| | | * | Raise 404 when couldn't find eventErik Johnston2016-08-051-1/+1
| | | |/
| | * / Don't include html comments in descriptionErik Johnston2016-08-051-1/+2
| | |/
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-08-051-21/+50
| |\|
| | * Fix backfill auth eventsErik Johnston2016-08-051-21/+50
| * | Bump version and changelogErik Johnston2016-08-051-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-08-0514-145/+573
| |\|
| | * Fix typoErik Johnston2016-08-051-1/+1
| | * Check if we already have the events returned by /state/Erik Johnston2016-08-051-2/+16
| | * Delete more tablesErik Johnston2016-08-051-0/+5
| | * Fallback to /state/ on both 400 and 404Erik Johnston2016-08-051-1/+1
| | * Tweak integrity error recovery to work as intendedBenjamin Saunders2016-08-042-1/+4
| | * Merge pull request #973 from matrix-org/erikj/xpath_fixErik Johnston2016-08-041-14/+72
| | |\
| | | * TypoErik Johnston2016-08-041-1/+1
| | | * Test summarizationErik Johnston2016-08-041-52/+54
| | | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fixErik Johnston2016-08-0413-125/+411
| | | |\
| | | * | 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
| | * | | Fix typos.Erik Johnston2016-08-041-3/+3
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_apiErik Johnston2016-08-0411-124/+260
| | |\| |
| | | * | keys/query: Omit device displayname if nullRichard van der Hoff2016-08-041-3/+4
| | | * | PEP8Richard van der Hoff2016-08-031-10/+10
| | | * | Include device name in /keys/query responseRichard van der Hoff2016-08-032-20/+51
| | | * | keys/query: return all users which were asked forRichard van der Hoff2016-08-031-3/+6
| | | * | 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-0315-64/+427
| | | | |\|
| | | | * | 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
| | | * | | 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
| | |/ /
| * | | Bump version and changelog v0.17.0-rc3Erik Johnston2016-08-021-1/+1
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0Erik Johnston2016-08-0218-110/+643
| |\| |
| | * | 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
| | * | | Merge pull request #967 from matrix-org/erikj/fed_readerErik Johnston2016-08-027-18/+342
| | |\ \ \
| | | * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-08-023-3/+23
| | | |\ \ \
| | | * \ \ \ 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-2937-295/+929
| | | |\ \ \ \ \
| | | * | | | | | 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 branch 'develop' into dbkr/fix_add_email_on_registerMark Haines2016-08-023-3/+23
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Ignore AlreadyCalled errors on timer cancelErik Johnston2016-07-312-3/+16
| | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | 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
| | * | | | | Fix SQL to supply arguments in the same orderMark Haines2016-07-291-1/+1
| | * | | | | Create separate methods for getting messages to pushMark Haines2016-07-284-51/+163
| | * | | | | Comment get_unread_push_actions_for_user_in_range functionKegan Dougal2016-07-281-2/+26
| | * | | | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into developErik Johnston2016-07-281-1/+1
| | |\| | | |
| | * | | | | 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
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Bump changeog and versionErik Johnston2016-08-021-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into rel...Erik 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
| | | |_|_|/ | | |/| | |
| * | | | | Bump version and changelogErik Johnston2016-07-281-1/+1
| * | | | | 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-271-1/+1
| |/ / / /
| * | | | 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
| * | | | Add `create_requester` functionRichard van der Hoff2016-07-267-49/+79
| |/ / /
| * | | Fix typoRichard van der Hoff2016-07-261-1/+1
| * | | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_deviceRichard van der Hoff2016-07-262-55/+113
| |\ \ \
| | * \ \ Merge pull request #951 from matrix-org/rav/flake8Richard van der Hoff2016-07-261-5/+3
| | |\ \ \
| | | * | | Fix flake8 violationRichard van der Hoff2016-07-261-5/+3
| | * | | | 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-262-15/+49
| |/ / / /
| * | | | Merge pull request #949 from matrix-org/rav/update_devicesDavid Baker2016-07-2610-22/+213
| |\ \ \ \
| | * | | | Implement updating devicesRichard van der Hoff2016-07-263-8/+67
| | * | | | Implement deleting devicesRichard van der Hoff2016-07-269-15/+146
| | * | | | Log when adding listenersRichard van der Hoff2016-07-251-0/+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
| * | | | Fix background_update testsRichard van der Hoff2016-07-251-7/+20
| * | | | PEP8Richard van der Hoff2016-07-221-1/+0
| * | | | Create index on user_ips in the backgroundRichard van der Hoff2016-07-223-12/+80
| |/ / /
| * | / make /devices return a listRichard van der Hoff2016-07-211-5/+5
| | |/ | |/|
| * | Merge pull request #943 from matrix-org/rav/get_device_apiDavid Baker2016-07-212-9/+62
| |\ \
| | * | Fix PEP8 errorsRichard van der Hoff2016-07-211-1/+1
| | * | Implement GET /device/{deviceId}Richard van der Hoff2016-07-212-9/+62
| * | | 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
| | |/
| * | storage/client_ips: remove some dead codeRichard van der Hoff2016-07-211-3/+0
| * | Merge branch 'develop' into rav/get_devices_apiRichard van der Hoff2016-07-204-22/+67
| |\|
| | * Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ipsRichard van der Hoff2016-07-202-7/+25
| | |\
| | | * Record device_id in client_ipsRichard van der Hoff2016-07-202-7/+25
| | * | 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-201-15/+39
| | |\ \ | | | |/ | | |/|
| | | * Register a device_id in the /v2/register flow.Richard van der Hoff2016-07-201-15/+39
| * | | GET /devices endpointRichard van der Hoff2016-07-207-5/+198
| |/ /
| * / More doc-commentsRichard van der Hoff2016-07-202-10/+14
| |/
| * Merge pull request #936 from matrix-org/erikj/log_rssErik Johnston2016-07-204-1/+50
| |\
| | * 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-206-0/+46
| |\ \
| | * | Type annotationsRichard van der Hoff2016-07-196-0/+46
| * | | Merge pull request #932 from matrix-org/rav/register_refactorDavid Baker2016-07-204-21/+52
| |\ \ \ | | |_|/ | |/| |
| | * | Further registration refactoringRichard van der Hoff2016-07-194-21/+52
| | |/
| * | Merge pull request #922 from matrix-org/erikj/file_api2Erik Johnston2016-07-206-9/+239
| |\ \ | | |/ | |/|
| | * CommentErik Johnston2016-07-201-0/+4
| | * Add filter param to /messages APIErik Johnston2016-07-142-5/+22
| | * 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-191-78/+102
| |\ \
| | * | 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-191-75/+102
| * | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_loginRichard van der Hoff2016-07-1910-24/+265
| |\ \ \ | | |/ / | |/| |
| | * | schema fixRichard van der Hoff2016-07-191-1/+1
| | * | Add device_id support to /loginRichard van der Hoff2016-07-1810-24/+265
| * | | Summary lineMark Haines2016-07-191-2/+1
| * | | Update docstring on Handlers.Mark Haines2016-07-191-3/+15
| |/ /