summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-21Merge branch 'fix/rich-media-ttl-fallback' into 'develop'kaniini
Fix rich media parser failing when no TTL can be found by image TTL setters See merge request pleroma/pleroma!1460
2019-07-21Fix rich media parser failing when no TTL can be found by image TTLrinpatch
setters
2019-07-21Merge branch 'bugfix/sharedinbox-path-first' into 'develop'kaniini
router: ensure the AP sharedinbox path is registered first See merge request pleroma/pleroma!1458
2019-07-21router: ensure the AP sharedinbox path is registered firstAriadne Conill
2019-07-21Fix pleroma_job_queue versionRoman Chvanikov
2019-07-20Resolve merge conflictsrinpatch
2019-07-20Apply suggestion to lib/pleroma/object/fetcher.exrinpatch
2019-07-20Apply suggestion to lib/pleroma/user.exrinpatch
2019-07-20Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-07-20Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'kaniini
[#1112] Preserving `id` on user insert conflict Closes #1112 See merge request pleroma/pleroma!1456
2019-07-20Merge branch 'tests/mock-sha512-crypt' into 'develop'kaniini
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest Closes #1114 See merge request pleroma/pleroma!1455
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 ↵Ivan Tashkinov
conversation_partipations_user_id_fkey constraint.
2019-07-20Remove flavour from userinfoRoman Chvanikov
2019-07-20Merge developRoman Chvanikov
2019-07-19Merge branch 'feature/matstodon-statuses-by-name' into 'develop'feld
Feature/matstodon statuses by name See merge request pleroma/pleroma!1211
2019-07-19Merge branch 'develop' into feature/matstodon-statuses-by-nameMark Felder
2019-07-19Merge branch 'feature/richmedia-ttl' into 'develop'kaniini
add the rich media ttl based on image exp time See merge request pleroma/pleroma!1438
2019-07-19Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'kaniini
mix: add pleroma.user unsubscribe_all_from_instance See merge request pleroma/pleroma!1454
2019-07-19mix: add pleroma.user unsubscribe_all_from_instanceAriadne Conill
2019-07-19Merge branch 'refactor/http-signature-plug' into 'develop'kaniini
http signature plug: separation of concerns See merge request pleroma/pleroma!1449
2019-07-19Merge branch 'issue/1110' into 'develop'kaniini
#1110 fixed /api/pleroma/healthcheck Closes #1110 See merge request pleroma/pleroma!1453
2019-07-19#1110 fixed /api/pleroma/healthcheckMaksim
2019-07-19Merge branch 'patch-2' into 'develop'rinpatch
Update clients.md for Fedilab See merge request pleroma/pleroma!1452
2019-07-19Fix domain for the contact clients.mdtom79
2019-07-19Update clients.md for Fedilabtom79
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
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
tests for Plugs.AuthenticationPlug See merge request pleroma/pleroma!1450
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 ↵Ariadne Conill
actually not present (testsuite)
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
the redundant checks assumed a POST request, which will not work for signed GETs. this check was originally needed because the HTTPSignatures adapter assumed that the requests were also POST requests. but now, the adapter has been corrected.
2019-07-18Merge branch 'feature/signed-object-fetches' into 'develop'kaniini
signed object fetches See merge request pleroma/pleroma!1446
2019-07-18Merge branch 'tests/uploads' into 'develop'kaniini
tests for Uploader with webhook See merge request pleroma/pleroma!1447
2019-07-18tests for Uploader with webhookMaksim
2019-07-18Merge branch 'fix-howto_mediaproxy' into 'develop'kaniini
Fix media proxy doc redirect setting not working See merge request pleroma/pleroma!1448
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
Update clients.md - added Homepage for Fedilab Android app See merge request pleroma/pleroma!1444
2019-07-17Update clients.md - added Homepage for Fedilab Android apptallship
2019-07-17Merge branch 'patch-3' into 'develop'kaniini
Update otp_en.md - Added creation of initial admin user See merge request pleroma/pleroma!1445
2019-07-17fetcher: sign object fetches if configuredAriadne Conill
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 10:28:23 +0000