aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2020-04-09Update CHANGELOGEgor Kislitsyn
2020-04-09Merge branch 'notifications-dismiss-api' into 'develop'feld
2020-04-09Merge branch 'fix-otp-version-file-in-docker' into 'develop'lain
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
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
2020-04-09Merge branch 'formatter-html-safe' into 'develop'lain
2020-04-09Merge branch 'changelog-update' into 'develop'Haelwenn
2020-04-09no changelog entry - bug fixed only in developAlexander Strizhakov
2020-04-09Merge branch 'bugfix/objectid_validator' into 'develop'Haelwenn
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
2020-04-08Merge branch 'gun-pool-fix' into 'develop'feld
2020-04-08fix for gun connections poolAlexander Strizhakov
2020-04-07Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
2020-04-07Apply suggestion to test/web/mastodon_api/controllers/account_controller/upda...kPherox
2020-04-06Add Pleroma.Web.ApiSpec.HelpersEgor Kislitsyn
2020-04-06Merge branch 'featureflag/emoji_reactions' into 'develop'lain
2020-04-06Merge branch 'improving-test-coverage' into 'develop'lain
2020-04-06Merge branch 'remake-remodel-2' into 'develop'lain
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
2020-04-02Fix formatting in documentationEgor Kislitsyn
2020-04-02Merge branch '2323-accounts-relationships-hotfix' into 'develop'feld
2020-04-02[#2323] Fixed a typo causing /accounts/relationships to render default relati...Ivan Tashkinov
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
2020-04-01Merge branch 'gun' into 'develop'feld
2020-04-01Validators: Correct ObjectID filenamelain
2020-04-01Merge branch 'fix/1601-add-new-meta-tag' into 'develop'rinpatch
2020-04-01restrict remote users from indexingAlexander Strizhakov