summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-16user: remove blank?rinpatch
2020-04-11Remove User.upgrade_changeset in favor of remote_user_creationrinpatch
The two changesets had the same purpose, yet some changes were updated in one, but not the other (`uri`, for example). Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from `ActivityPub.make_user_from_ap_id` only when the user is actually not AP enabled yet. I did not bother rewriting tests that used `User.insert_or_update` to use the changeset instead because they seemed to just test the implementation, rather than behavior.
2020-04-10Merge branch 'fix/support-conversations-pagination' into 'develop'Haelwenn
Support pagination in conversations See merge request pleroma/pleroma!2329
2020-04-10Merge branch 'develop' into fix/support-conversations-paginationEgor Kislitsyn
2020-04-10Merge branch 'chore/fix-changelog' into 'develop'Haelwenn
Chore/fix changelog See merge request pleroma/pleroma!2364
2020-04-10Merge branch 'bugfix/apc2s_upload_activity' into 'develop'Haelwenn
bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316
2020-04-10Merge branch 'fix-otp-version-file-in-docker' into 'develop'Haelwenn
Create OTP_VERSION file by `mix release` See merge request pleroma/pleroma!2362
2020-04-09Rename functionkPherox
2020-04-09CHANGELOG.md: update 2.0.2 release daterinpatch
2020-04-09CHANGELOG.md: add 2.0.2 update notesrinpatch
2020-04-09CHANGELOG.md: add entries for funkwhale-related changesrinpatch
2020-04-09CHANGELOG.md: Add 2.0.2 entryrinpatch
2020-04-09CHANGELOG.md: Add upgrade notes for 2.0.1rinpatch
2020-04-09changelog.md: add 2.0.1 entryrinpatch
2020-04-09Merge branch 'update-changelog' into 'develop'rinpatch
Update CHANGELOG See merge request pleroma/pleroma!2363
2020-04-09Update CHANGELOGEgor Kislitsyn
2020-04-09Merge branch 'notifications-dismiss-api' into 'develop'feld
Add `/api/v1/notifications/:id/dismiss` endpoint Closes #1673 See merge request pleroma/pleroma!2360
2020-04-10Create OTP_VERSION file by `mix release`kPherox
2020-04-09Merge branch 'fix-otp-version-file-in-docker' into 'develop'lain
Add OTP_VERSION file to docker Closes #1662 See merge request pleroma/pleroma!2361
2020-04-09Add `/api/v1/notifications/:id/dismiss` endpointEgor Kislitsyn
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 14:13:59 +0000