summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-02update Oban packageMaksim Pechnikov
2020-04-01Add OpenAPIEgor Kislitsyn
2020-04-01error improvement for email_invite endpointAlexander Strizhakov
2020-04-01Merge branch 'update/adminfe-20200331' into 'develop'feld
Update AdminFE build in preparation for Pleroma 2.0.2 See merge request pleroma/pleroma!2343
2020-04-01Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses # Conflicts: # CHANGELOG.md
2020-04-01Merge branch 'gun' into 'develop'feld
Gun adapter Closes #945 See merge request pleroma/pleroma!1861
2020-04-01Ability to control the output of account/pleroma/relationship in statuses in ↵Ivan Tashkinov
order to improve the rendering performance. See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01Validators: Correct ObjectID filenamelain
2020-04-01Merge branch 'fix/1601-add-new-meta-tag' into 'develop'rinpatch
Restrict remote users from indexing Closes #1601 See merge request pleroma/pleroma!2341
2020-04-01restrict remote users from indexingAlexander Strizhakov
2020-04-01Merge branch 'ops/fix-ci' into 'develop'Haelwenn
Ops/fix ci See merge request pleroma/pleroma!2340
2020-03-31remove testing `only:` in docker buildjp
2020-03-31add imagemagick and update inherited container to alpine:3.11jp
2020-03-31Merge branch 'fix/docker-mogrify' into 'develop'feld
Remove problematic --cache-from argument See merge request pleroma/pleroma!2338
2020-03-31Remove problematic --cache-from argumentMark Felder
2020-03-31Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
Fix profile url for funkwhale channels, removes one source_data use Closes #1653 See merge request pleroma/pleroma!2333
2020-03-31Provide known-good user.uri, remove User.profile_url/1Haelwenn (lanodan) Monnier
2020-03-31User: Fix use of source_data in profile_url/1Haelwenn (lanodan) Monnier
2020-03-31Initial failing test statement against funkwhale channelsHaelwenn (lanodan) Monnier
2020-03-31Merge branch 'fix/docker-mogrify' into 'develop'feld
Fix/docker mogrify Closes #1644 See merge request pleroma/pleroma!2337
2020-03-31Add imagemagick to Docker image to fix broken mogrify pluginMark Felder
2020-03-31Update AdminFE build in preparation for Pleroma 2.0.2Mark Felder
2020-04-01Use `Pleroma.Formatter.linkify` instead of `AutoLinker.link`kPherox
2020-04-01split test for update profile fieldskPherox
2020-03-31Transmogrifier: Fix BAD code by RINPATCHlain
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-31Transmogrifier: Only add context if it really is onne.lain
2020-03-31Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-2
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-31CommonAPI: DRY up a bit.lain
2020-03-31Validator Test: Small refactor.lain
2020-03-31updating docsAlexander Strizhakov
2020-03-31test for default features and changelog entryAlexander Strizhakov
2020-03-31Validators: ObjectID is an http uri.lain
2020-03-31Remove no longer used functionkPherox
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-31[#2332] Misc. improvements per code change requests.Ivan Tashkinov
2020-03-30[#2332] Misc. fixes per code change requests.Ivan Tashkinov
2020-03-30Merge branch 'benchmark-improvements' into 'develop'lain
Benchmark improvements See merge request pleroma/pleroma!2308
2020-03-30Merge branch 'removing-grouped-reports' into 'develop'rinpatch
Removing grouped reports endpoint See merge request pleroma/pleroma!2335
2020-03-30removing grouped reports admin api endpointAlexander Strizhakov
2020-03-30updating gun with bug fixAlexander Strizhakov
https://github.com/ninenines/gun/issues/222
2020-03-30changelog fixAlexander Strizhakov
2020-03-30Merge branch 'develop' into gunAlexander Strizhakov
2020-03-30use in timelines benchmark new user generatorAlexander Strizhakov
2020-03-30fixAlexander Strizhakov
2020-03-30sync with developAlexander Strizhakov
2020-03-30activities generation tasksAlexander Strizhakov
2020-03-29Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287