aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-07-22Merge branch 'hide-blocked-from-interaction' into 'develop'kaniini
2019-07-22Hide blocked users from interactionsSadposter
2019-07-22activitypub: publisher: align sharedinbox usage with AP specification rulesAriadne Conill
2019-07-21Merge branch 'fix/rich-media-ttl-fallback' into 'develop'kaniini
2019-07-21Fix rich media parser failing when no TTL can be found by image TTLrinpatch
2019-07-21Merge branch 'bugfix/sharedinbox-path-first' into 'develop'kaniini
2019-07-21router: ensure the AP sharedinbox path is registered firstAriadne Conill
2019-07-21Fix pleroma_job_queue versionRoman Chvanikov
2019-07-20Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-07-20Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'kaniini
2019-07-20Merge branch 'tests/mock-sha512-crypt' into 'develop'kaniini
2019-07-20[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTestSergey Suprunenko
2019-07-20[#1112] Preserving `id` on user insert conflict on order not to violate conve...Ivan Tashkinov
2019-07-20Remove flavour from userinfoRoman Chvanikov
2019-07-20Merge developRoman Chvanikov
2019-07-19Merge branch 'feature/matstodon-statuses-by-name' into 'develop'feld
2019-07-19Merge branch 'develop' into feature/matstodon-statuses-by-nameMark Felder
2019-07-19Merge branch 'feature/richmedia-ttl' into 'develop'kaniini
2019-07-19Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'kaniini
2019-07-19mix: add pleroma.user unsubscribe_all_from_instanceAriadne Conill
2019-07-19Merge branch 'refactor/http-signature-plug' into 'develop'kaniini
2019-07-19Merge branch 'issue/1110' into 'develop'kaniini
2019-07-19#1110 fixed /api/pleroma/healthcheckMaksim
2019-07-19Merge branch 'patch-2' into 'develop'rinpatch
2019-07-19Fix domain for the contact clients.mdtom79
2019-07-19Update clients.md for Fedilabtom79
2019-07-19update the docsSachin Joshi
2019-07-19change the structure of image ttl parsarSachin Joshi
2019-07-18Merge branch 'develop' into feature/admin-api-user-statusesMaxim Filippov
2019-07-18mapped signature plug: use `user` assign like authentication plugAriadne Conill
2019-07-18Merge branch 'tests/authentication_plug' into 'develop'kaniini
2019-07-18tests for Plugs.AuthenticationPlugMaksim
2019-07-18tests: add tests for mapped signature plugAriadne Conill
2019-07-18mapped signature plug: fix user lookupAriadne Conill
2019-07-18mapped signature plug: don't invalidate in cases where a signature is actuall...Ariadne Conill
2019-07-18mix: update http signatures dependencyAriadne Conill
2019-07-18plugs: add MappedSignatureToIdentityPlugAriadne Conill
2019-07-18signature: make key_id_to_actor_id() publicAriadne Conill
2019-07-18http signature plug: remove redundant checks handled by HTTPSignatures libraryAriadne Conill
2019-07-18Merge branch 'feature/signed-object-fetches' into 'develop'kaniini
2019-07-18Merge branch 'tests/uploads' into 'develop'kaniini
2019-07-18tests for Uploader with webhookMaksim
2019-07-18Merge branch 'fix-howto_mediaproxy' into 'develop'kaniini
2019-07-18Fix redirect setting not workingaries
2019-07-17update changelogAriadne Conill
2019-07-17tests: add tests for signed object fetchesAriadne Conill
2019-07-17Merge branch 'patch-2' into 'develop'kaniini
2019-07-17Update clients.md - added Homepage for Fedilab Android apptallship
2019-07-17Merge branch 'patch-3' into 'develop'kaniini
2019-07-17fetcher: sign object fetches if configuredAriadne Conill