summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3243 from NotAFile/py3-six-3Erik Johnston2018-05-241-3/+5
|\
| * Replace some more comparisons with sixAdrian Tschira2018-05-191-3/+5
* | Add a 'has_consented' template var to consent formsRichard van der Hoff2018-05-221-3/+14
* | Enable auto-escaping for the consent templatesRichard van der Hoff2018-05-221-1/+4
* | Stub out ServerNoticesSender on the workersRichard van der Hoff2018-05-221-0/+4
* | Move consent config parsing into ConsentConfigRichard van der Hoff2018-05-221-5/+3
* | Rename 'version' param on user consent configRichard van der Hoff2018-05-221-1/+1
* | Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-211-25/+21
* | Stop the transaction cache caching failuresRichard van der Hoff2018-05-211-9/+13
|/
* Merge pull request #3221 from matrix-org/erikj/purge_tokenErik Johnston2018-05-181-7/+10
|\
| * Make purge_history operate on tokensErik Johnston2018-05-151-7/+10
* | Move RoomCreationHandler out of synapse.handlers.HandlersRichard van der Hoff2018-05-172-5/+4
* | Merge pull request #3213 from matrix-org/rav/consent_handlerRichard van der Hoff2018-05-162-0/+210
|\ \ | |/ |/|
| * ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-152-0/+210
* | Set Server header in SynapseRequestRichard van der Hoff2018-05-109-14/+1
|/
* Remove redundant request_handler decoratorRichard van der Hoff2018-05-105-29/+38
* notifications: Convert next_token to string according to the specKonstantinos Sideris2018-05-051-1/+1
* Merge pull request #3161 from NotAFile/remove-v1authRichard van der Hoff2018-05-032-2/+6
|\
| * Burminate v1authAdrian Tschira2018-04-302-2/+6
* | Fix logcontext leak in media repoRichard van der Hoff2018-05-022-1/+4
|/
* add guard for None on purge_history apiKrombel2018-04-301-1/+14
* Merge pull request #3155 from NotAFile/py3-bytes-1Richard van der Hoff2018-04-301-3/+3
|\
| * more bytes stringsAdrian Tschira2018-04-291-3/+3
* | Merge pull request #3140 from matrix-org/rav/use_run_in_backgroundRichard van der Hoff2018-04-301-2/+3
|\ \
| * | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_backgroundRichard van der Hoff2018-04-271-2/+7
| |\|
| * | Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-271-2/+3
* | | Merge pull request #3156 from NotAFile/py3-hmac-bytesRichard van der Hoff2018-04-302-11/+15
|\ \ \
| * | | Construct HMAC as bytes on py3Adrian Tschira2018-04-292-11/+15
| | |/ | |/|
* | | Merge pull request #3108 from NotAFile/py3-six-urlparseRichard van der Hoff2018-04-304-7/+8
|\ \ \ | |/ / |/| |
| * | Use six.moves.urlparseAdrian Tschira2018-04-154-7/+8
| |/
* / Improve exception handling for background processesRichard van der Hoff2018-04-271-2/+7
|/
* Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sendsErik Johnston2018-04-101-6/+1
|\
| * Use create_and_send_nonmember_event everywhereErik Johnston2018-04-091-6/+1
* | Merge pull request #2996 from krombel/allow_auto_join_roomsRichard van der Hoff2018-04-101-32/+0
|\ \
| * \ Merge branch 'develop' of into allow_auto_join_roomsKrombel2018-03-283-3/+3
| |\ \
| * | | move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-141-32/+0
* | | | Merge pull request #3061 from NotAFile/add-some-byte-stringsRichard van der Hoff2018-04-091-2/+2
|\ \ \ \
| * | | | Add b prefixes to some strings that are bytes in py3Adrian Tschira2018-04-041-2/+2
| | |/ / | |/| |
* | | | Merge pull request #3073 from NotAFile/use-six-reraiseRichard van der Hoff2018-04-091-1/+3
|\ \ \ \
| * | | | Replace old-style raise with six.reraiseAdrian Tschira2018-04-061-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #2938 from dklug/developRichard van der Hoff2018-04-091-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Return 401 for invalid access_token on logoutdklug2018-03-021-1/+4
* | | | Merge pull request #2986 from jplatte/join_reponse_room_idRichard van der Hoff2018-04-051-1/+6
|\ \ \ \
| * | | | Add room_id to the response of `rooms/{roomId}/join`Jonas Platte2018-03-131-1/+6
| | |_|/ | |/| |
* | | | Use "/settings/" (plural)Luke Barnard2018-04-051-1/+1
* | | | Use join_policy API instead of joinableLuke Barnard2018-04-031-6/+6
* | | | This should probably be a PUTDavid Baker2018-03-281-1/+1
* | | | Add joinability for groupsDavid Baker2018-03-281-0/+28
| |_|/ |/| |
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-192-2/+2
|\ \ \
| * | | Replace ujson with simplejsonErik Johnston2018-03-153-3/+3
* | | | Replace some ujson with simplejson to make it workErik Johnston2018-03-161-1/+1
| |/ / |/| |
* | | RoomMembershipRestServlet doesn't handle /forgetErik Johnston2018-03-131-1/+1
* | | Add transactional API to history purgeRichard van der Hoff2018-03-121-3/+35
* | | Provide a means to pass a timestamp to purge_historyRichard van der Hoff2018-03-051-3/+55
| |/ |/|
* | Move RoomMemberHandler out of HandlersErik Johnston2018-03-013-13/+15
* | Make store_file use store_into_fileErik Johnston2018-02-141-26/+11
* | Merge pull request #2854 from matrix-org/erikj/event_create_workerErik Johnston2018-02-131-1/+0
|\ \
| * | Add event_creator workerErik Johnston2018-02-071-1/+0
* | | Fix typos in purge api & docRichard van der Hoff2018-02-131-3/+1
* | | Merge pull request #2857 from matrix-org/erikj/upload_storeErik Johnston2018-02-121-0/+6
|\ \ \
| * | | Tell storage providers about new file so they can uploadErik Johnston2018-02-071-0/+6
| |/ /
* | | Merge pull request #2858 from matrix-org/rav/purge_updatesRichard van der Hoff2018-02-091-1/+10
|\ \ \ | |/ / |/| |
| * | delete_local_events for purge_historyRichard van der Hoff2018-02-091-1/+10
* | | Update copyrightErik Johnston2018-02-062-0/+2
* | | Update places where we create eventsErik Johnston2018-02-052-9/+11
* | | Merge pull request #2791 from matrix-org/erikj/media_storage_refactorErik Johnston2018-02-053-12/+47
|\ \ \
| * | | Use better file consumerErik Johnston2018-01-181-5/+10
| * | | Ensure media is in local cache before thumbnailingErik Johnston2018-01-183-10/+40
* | | | Merge pull request #2845 from matrix-org/rav/urlcache_error_handlingRichard van der Hoff2018-02-021-21/+34
|\ \ \ \
| * | | | Handle url_previews with no content-typeRichard van der Hoff2018-02-021-21/+34
* | | | | Merge branch 'develop' into travis/admin-list-mediaTravis Ralston2018-02-016-30/+138
|\| | | |
| * | | | fix thinko on 3pid whitelistingMatthew Hodgson2018-01-241-2/+2
| * | | | add ?ts massaging for ASes (#2754)Matthew Hodgson2018-01-231-6/+11
| * | | | Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-222-2/+25
| * | | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pidMatthew Hodgson2018-01-223-22/+102
| |\ \ \ \
| | * | | | fix typo (thanks sytest)Matthew Hodgson2018-01-191-1/+1
| | * | | | oops, check all login typesMatthew Hodgson2018-01-191-14/+11
| | * | | | trailing commasMatthew Hodgson2018-01-192-7/+7
| | * | | | rewrite based on PR feedback:Matthew Hodgson2018-01-194-76/+43
| | * | | | fix up v1, and improve errorsMatthew Hodgson2018-01-193-19/+53
| | * | | | fix pep8Matthew Hodgson2018-01-191-2/+1
| | * | | | add registrations_require_3pidMatthew Hodgson2018-01-193-13/+96
| | | |/ / | | |/| |
* | / | | Add an admin route to get all the media in a roomTravis Ralston2018-01-201-0/+22
|/ / / /
* | | | Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbsRichard van der Hoff2018-01-191-0/+8
|\ \ \ \
| * | | | Use the right path for url_preview thumbnailsRichard van der Hoff2018-01-191-0/+8
| |/ / /
* | | | Fix storage provider bug introduced when renamed to store_localErik Johnston2018-01-181-1/+1
* | | | Merge pull request #2812 from matrix-org/erikj/media_storage_provider_configErik Johnston2018-01-182-20/+27
|\ \ \ \
| * | | | Missing staticmethodErik Johnston2018-01-181-0/+1
| * | | | Fixup commentsErik Johnston2018-01-181-2/+2
| * | | | Make storage providers more configurableErik Johnston2018-01-182-20/+26
| | |/ / | |/| |
* | | | Fix typo in thumbnail resource causing access times to be incorrectErik Johnston2018-01-181-2/+2
| |/ / |/| |
* | | Update last access time when thumbnails are viewedErik Johnston2018-01-171-0/+2
* | | Keep track of last access time for local mediaErik Johnston2018-01-171-7/+25
|/ /
* | Add docstringErik Johnston2018-01-171-1/+1
* | Use local varsErik Johnston2018-01-161-6/+2
* | Change _generate_thumbnails to take media_typeErik Johnston2018-01-162-7/+10
* | Move setting of file_id up to callerErik Johnston2018-01-162-13/+14
* | Fix typoErik Johnston2018-01-161-7/+10
* | Fix up log linesErik Johnston2018-01-162-7/+10
* | Correctly use server_name/file_id when generating/fetching remote thumbnailsErik Johnston2018-01-162-5/+8
* | Log when we respond with 404Erik Johnston2018-01-162-1/+8
* | Fix thumbnailing remote filesErik Johnston2018-01-162-2/+30
* | Merge pull request #2767 from matrix-org/erikj/media_storage_refactorErik Johnston2018-01-167-346/+843
|\ \
| * | Fix up commentsErik Johnston2018-01-122-7/+16
| * | Correctly reraise exceptionErik Johnston2018-01-121-2/+4
| * | Make Responder a context managerErik Johnston2018-01-122-9/+10
| * | Add missing class varErik Johnston2018-01-121-0/+3
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_stor...Erik Johnston2018-01-121-3/+26
| |\ \
| * | | Remove unnecessary conditionErik Johnston2018-01-121-4/+1
| * | | Remove unused variablesErik Johnston2018-01-121-3/+0
| * | | Make class var localErik Johnston2018-01-121-3/+3
| * | | CommentsErik Johnston2018-01-123-15/+65
| * | | Add StorageProvider conceptErik Johnston2018-01-093-9/+162
| * | | Make PreviewUrlResource use MediaStorageErik Johnston2018-01-092-8/+14
| * | | Make ThumbnailResource use MediaStorageErik Johnston2018-01-092-48/+68
| * | | Use MediaStorage for remote mediaErik Johnston2018-01-092-136/+156
| * | | Use MediaStorage for local filesErik Johnston2018-01-092-119/+73
| * | | Add MediaStorage classErik Johnston2018-01-091-0/+198
| * | | Add some helper classesErik Johnston2018-01-091-0/+73
| * | | Split out add_file_headersErik Johnston2018-01-091-28/+42
* | | | Reinstate media download on thumbnail requestRichard van der Hoff2018-01-121-0/+5
| |/ / |/| |
* | | Merge pull request #2766 from matrix-org/rav/room_eventRichard van der Hoff2018-01-111-3/+26
|\ \ \ | |/ / |/| |
| * | Add /room/{id}/event/{id} to synapseRichard van der Hoff2018-01-091-3/+26
* | | Remove dead TODOErik Johnston2018-01-091-2/+0
* | | Remove dead code related to default thumbnailsErik Johnston2018-01-091-73/+3
|/ /
* / Better logging when login can't find a 3pidRichard van der Hoff2017-12-201-4/+10
|/
* Fix error when deleting devicesRichard van der Hoff2017-12-051-1/+1
* Factor out a validate_user_via_ui_auth methodRichard van der Hoff2017-12-052-74/+59
* Refactor UI auth implementationRichard van der Hoff2017-12-054-27/+51
* Delete devices in various logout situationsRichard van der Hoff2017-11-291-2/+25
* Move set_password into its own handlerRichard van der Hoff2017-11-292-3/+4
* Move deactivate_account into its own handlerRichard van der Hoff2017-11-292-5/+6
* Allow guest access to group APIs for readingLuke Barnard2017-11-281-11/+11
* Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_errorRichard van der Hoff2017-11-271-3/+7
|\
| * Check database in has_completed_background_updatesRichard van der Hoff2017-11-221-1/+1
| * Fix error on sqlite 3.7Richard van der Hoff2017-11-211-3/+7
* | Fix OPTIONS on preview_urlRichard van der Hoff2017-11-231-1/+5
|/
* Declare support for r0.3.0Richard van der Hoff2017-11-151-0/+1
* Merge pull request #2668 from turt2live/travis/whoamiRichard van der Hoff2017-11-141-0/+15
|\
| * Remove redundent callTravis Ralston2017-11-131-2/+0
| * Add a route for determining who you areTravis Ralston2017-11-121-0/+17
* | Bit more loggingRichard van der Hoff2017-11-101-0/+2
* | Cache failures in url_preview handlerRichard van der Hoff2017-11-101-41/+45
|/
* Add some more comments appservice user registrationRichard van der Hoff2017-11-101-1/+4
* Downcase userids for shared-secret registrationRichard van der Hoff2017-11-102-3/+21
* Downcase userid on registrationRichard van der Hoff2017-11-091-1/+7
* Register group servletErik Johnston2017-11-091-0/+1
* Have an explicit API to update room configErik Johnston2017-11-081-0/+27
* Revert "Modify group room association API to allow modification of is_public"Erik Johnston2017-11-081-2/+2
* Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-previewMatthew Hodgson2017-11-071-1/+8
|\
| * Ignore noscript tags when generating URL previewsMaxime Vaillancourt2017-10-251-1/+8
* | support inhibit_login in /registerRichard van der Hoff2017-11-021-12/+16
* | Allow password_auth_providers to return a callbackRichard van der Hoff2017-11-011-1/+4
* | Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_d...David Baker2017-11-013-6/+12
|\ \
| * \ Merge pull request #2615 from matrix-org/rav/break_auth_device_depDavid Baker2017-11-012-4/+0
| |\ \
| | * | Break dependency of auth_handler on device_handlerRichard van der Hoff2017-11-012-4/+0
| * | | Apparently this is pythonDavid Baker2017-11-011-1/+1
| * | | Log login requestsDavid Baker2017-11-011-0/+10
| * | | Modify group room association API to allow modification of is_publicLuke Barnard2017-10-311-2/+2
| |/ /
* / / Move access token deletion into auth handlerRichard van der Hoff2017-11-013-22/+10
|/ /
* | Refactor some logic from LoginRestServlet into AuthHandlerRichard van der Hoff2017-10-311-29/+26
* | Merge pull request #2591 from matrix-org/rav/device_delete_authRichard van der Hoff2017-10-271-5/+8
|\ \
| * | Device deletion: check UI auth matches access tokenRichard van der Hoff2017-10-271-5/+8
* | | Merge pull request #2589 from matrix-org/rav/as_deactivate_accountRichard van der Hoff2017-10-271-16/+32
|\ \ \
| * | | Allow ASes to deactivate their own usersRichard van der Hoff2017-10-271-16/+32
| | |/ | |/|
* | | Merge pull request #2582 from matrix-org/luke/group-is-publicLuke Barnard2017-10-271-40/+53
|\ \ \ | |_|/ |/| |
| * | delintLuke Barnard2017-10-261-4/+17
| * | Add is_public to groups table to allow for private groupsLuke Barnard2017-10-261-40/+40
| |/
* | add release endpoints for /thirdpartyKrombel2017-10-261-7/+4
* | register some /unstable endpoints in /r0 as wellKrombel2017-10-264-20/+9
|/
* replace 'except:' with 'except Exception:'Richard van der Hoff2017-10-2311-16/+16
* Fix a logcontext leak in the media repoRichard van der Hoff2017-10-231-1/+4
* Remove pointless create() methodRichard van der Hoff2017-10-202-4/+4
* Fix typo in thumbnail generationErik Johnston2017-10-191-2/+5
* Merge pull request #2550 from krombel/fix_thumbnail_2548Erik Johnston2017-10-171-2/+2
|\
| * fix thumbnailing (#2548)Krombel2017-10-171-2/+2
* | Merge pull request #2545 from matrix-org/dbkr/auto_join_roomsDavid Baker2017-10-171-0/+34
|\ \ | |/ |/|
| * Add config option to auto-join new users to roomsDavid Baker2017-10-161-0/+34
* | DelintLuke Barnard2017-10-161-0/+1
* | Implement GET /groups/$groupId/invited_usersLuke Barnard2017-10-161-0/+21
|/
* Add try/finally block to close t_byte_sourceErik Johnston2017-10-131-24/+41
* Remove old commentErik Johnston2017-10-131-1/+0
* Don't reuse source but instead copy from primary media store to backupErik Johnston2017-10-132-22/+9
* PEP8Erik Johnston2017-10-131-1/+1
* Move type into keyErik Johnston2017-10-131-3/+3
* CommentErik Johnston2017-10-131-1/+1
* Remove spurious additionErik Johnston2017-10-131-4/+0
* Don't needlessly rename variableErik Johnston2017-10-131-13/+13
* Add paths back in...Erik Johnston2017-10-131-4/+4
* Remove unnecessary diffErik Johnston2017-10-131-3/+1
* Make things be absolute paths againErik Johnston2017-10-131-7/+7
* s/write_to_file/write_to_file_and_backup/Erik Johnston2017-10-131-5/+5
* Fix upErik Johnston2017-10-132-43/+32
* Fix up thumbnailing functionErik Johnston2017-10-133-75/+73
* Fix typoErik Johnston2017-10-131-1/+1
* Fix up commentsErik Johnston2017-10-131-2/+26
* Move makedirs to threadErik Johnston2017-10-131-2/+1
* Use make_deferred_yieldableErik Johnston2017-10-131-7/+7
* Fix commentsErik Johnston2017-10-122-1/+4
* Don't close prematurely..Erik Johnston2017-10-121-2/+5
* getvalue closes bufferErik Johnston2017-10-121-11/+10
* Get len before closeErik Johnston2017-10-121-6/+11
* Don't close file prematurelyErik Johnston2017-10-122-8/+18
* Copy everything to backupErik Johnston2017-10-124-76/+148
* TypoErik Johnston2017-10-121-1/+1
* Remove dead codeErik Johnston2017-10-121-3/+0
* Fix typosErik Johnston2017-10-121-20/+26
* Fix typoErik Johnston2017-10-121-1/+1
* Basic implementation of backup media storeErik Johnston2017-10-123-126/+113
* Merge branch 'develop' into erikj/groups_mergedDavid Baker2017-10-023-23/+196
|\
| * Only log if we've removed mediaErik Johnston2017-09-281-2/+4
| * Clear up expired url cache every 10sErik Johnston2017-09-281-1/+1
| * Actually assign result to variableErik Johnston2017-09-281-1/+1
| * Fix typo in url cache expiry timerErik Johnston2017-09-281-1/+1
| * Support new and old style media id formatsErik Johnston2017-09-281-31/+81
| * Change expires column to expires_tsErik Johnston2017-09-281-2/+2
| * Delete expired url cache dataErik Johnston2017-09-282-4/+129
| * Fix /joined_members to work with AS usersErik Johnston2017-09-281-2/+1
| * Fix bug where /joined_members didn't check user was in roomErik Johnston2017-09-271-10/+7
* | Add remove room APIErik Johnston2017-09-261-0/+11
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_mergedErik Johnston2017-09-193-14/+13
|\|
| * Add left section to /keys/changesErik Johnston2017-09-081-4/+2
| * Send down device list change notif when member leaves/rejoins roomErik Johnston2017-09-071-1/+2
| * fix englishhera2017-08-041-7/+7
| * typohera2017-08-041-1/+1
| * Reduce spammy log line in synchrotronsErik Johnston2017-08-021-1/+1
* | Split out profile handler to fix testsErik Johnston2017-08-251-9/+9
* | FixupErik Johnston2017-08-111-0/+1
* | Add bulk group publicised lookup APIErik Johnston2017-08-091-0/+54
* | Allow update group publicityErik Johnston2017-08-081-0/+28
* | Merge pull request #2378 from matrix-org/erikj/group_sync_supportErik Johnston2017-07-211-0/+5
|\ \
| * | Add groups to sync streamErik Johnston2017-07-201-0/+5
* | | Remove spurious content paramErik Johnston2017-07-201-1/+1
* | | Add update group profile APIErik Johnston2017-07-201-0/+12
|/ /
* | CommentsErik Johnston2017-07-181-1/+3
* | CommentsErik Johnston2017-07-181-103/+48
* | Add local group server supportErik Johnston2017-07-172-0/+644
|/
* split out reducing stuff; just make encode_* staticKrombel2017-07-111-35/+27
* fix testKrombel2017-07-101-1/+3
* encode sync-response statically; omit empty objects from sync-responseKrombel2017-07-101-33/+48
* Fix bug where pusherpool didn't start and broke some roomsErik Johnston2017-07-061-8/+6
* Store URL cache preview downloads seperatelyErik Johnston2017-06-235-18/+72
* Add API to quarantine mediaErik Johnston2017-06-194-3/+30
* Remove unused importErik Johnston2017-06-191-1/+1
* Change to create new room and join other usersErik Johnston2017-06-191-6/+53
* Forget roomErik Johnston2017-06-191-0/+2
* Add shutdown room APIErik Johnston2017-06-191-1/+66
* Include users who share room with requester in user directoryErik Johnston2017-06-151-2/+6
* Throw exception when not retrying when downloading mediaErik Johnston2017-06-131-0/+1
* Add commentsErik Johnston2017-05-311-0/+16