summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-09Fix OTP_VERSION file in dockerkPherox
2020-04-09Merge branch 'fix/1658-invite-send' into 'develop'lain
Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344
2020-04-09typo fixAlexander Strizhakov
2020-04-09Apply suggestion to test/web/admin_api/admin_api_controller_test.exsAlexander Strizhakov
2020-04-09Apply suggestion to test/web/admin_api/admin_api_controller_test.exsAlexander Strizhakov
2020-04-09Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.exAlexander Strizhakov
2020-04-09Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.exAlexander Strizhakov
2020-04-09Apply suggestion to docs/API/admin_api.mdAlexander Strizhakov
2020-04-09Merge branch 'open-api' into 'develop'lain
Add OpenAPI Closes pleroma-meta#19 See merge request pleroma/pleroma!2345
2020-04-09Merge branch 'formatter-html-safe' into 'develop'lain
formatter.ex: Use Phoenix.HTML for mention/hashtag generation See merge request pleroma/pleroma!2357
2020-04-09Merge branch 'changelog-update' into 'develop'Haelwenn
No changelog entry - bug fixed only in develop See merge request pleroma/pleroma!2359
2020-04-09no changelog entry - bug fixed only in developAlexander Strizhakov
2020-04-09Merge branch 'bugfix/objectid_validator' into 'develop'Haelwenn
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""} See merge request pleroma/pleroma!2358
2020-04-09ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}Haelwenn (lanodan) Monnier
2020-04-08formatter.ex: Use Phoenix.HTML for mention/hashtag generationrinpatch
Unlike concatenating strings, this makes sure everything is escaped. Tests had to be changed because Phoenix.HTML runs attributes through Enum.sort before generation for whatever reason.
2020-04-08Merge branch 'gun-pool-fix' into 'develop'feld
Fix for gun connections pool Closes #1669 and #1664 See merge request pleroma/pleroma!2356
2020-04-08fix for gun connections poolAlexander Strizhakov
2020-04-07Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352
2020-04-07Apply suggestion to ↵kPherox
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
2020-04-06Add Pleroma.Web.ApiSpec.HelpersEgor Kislitsyn
2020-04-06Merge branch 'featureflag/emoji_reactions' into 'develop'lain
Add emoji reactions to features in nodeinfo See merge request pleroma/pleroma!2313
2020-04-06Merge branch 'improving-test-coverage' into 'develop'lain
Tests for emoji mix task See merge request pleroma/pleroma!2350
2020-04-06Merge branch 'remake-remodel-2' into 'develop'lain
Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315
2020-04-06ObjectID Validator: Refactor.lain
2020-04-06Transmogrifier: Refactoring / Renaming.lain
2020-04-06using another fn for file deletionAlexander Strizhakov
2020-04-06tests for emoji mix taskAlexander Strizhakov
2020-04-02Merge branch 'fix/docs-markdown' into 'develop'feld
Fix formatting in documentation See merge request pleroma/pleroma!2348
2020-04-02Fix formatting in documentationEgor Kislitsyn
2020-04-02Merge branch '2323-accounts-relationships-hotfix' into 'develop'feld
[#2323] Fixed /accounts/relationships Closes pleroma-fe#820 See merge request pleroma/pleroma!2347
2020-04-02[#2323] Fixed a typo causing /accounts/relationships to render default ↵Ivan Tashkinov
relationships. Improved the tests.
2020-04-02Add oAuthEgor Kislitsyn
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 branch 'gun' into 'develop'feld
Gun adapter Closes #945 See merge request pleroma/pleroma!1861
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 14:12:48 +0000