summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-09Fix OTP_VERSION file in dockerkPherox
2020-04-09[#1559] Addressed code review requests.Ivan Tashkinov
2020-04-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-09CommonAPI: Basic ChatMessage support.lain
2020-04-09SideEffects: Extend ChatMessage test.lain
2020-04-09SideEffects: Handle ChatMessage creation.lain
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-08[#1559] Minor change (analysis).Ivan Tashkinov
2020-04-08[#1559] Added / fixed tests for follow / follow_request notifications.Ivan Tashkinov
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-08Merge branch 'release/2.0.2' into 'stable'rinpatch
2.0.2 Release See merge request pleroma/pleroma!2336
2020-04-08fix for gun connections poolAlexander Strizhakov
2020-04-08ChatMessage: Basic incoming handling.lain
2020-04-08pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360frinpatch
2020-04-08CHANGELOG.md: update 2.0.2 release daterinpatch
2020-04-08CHANGELOG.md: add 2.0.2 update notesrinpatch
2020-04-08Update AdminFE build in preparation for Pleroma 2.0.2Mark Felder
2020-04-08Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352
2020-04-08CHANGELOG.md: add entries for funkwhale-related changesrinpatch
2020-04-07[#1559] Support for "follow_request" notifications (configurable).Ivan Tashkinov
(Not currently supported by PleromaFE, thus disabled by default).
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-07Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-07Apply suggestion to ↵kPherox
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
2020-04-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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-06Enforcement of OAuth scopes check for authenticated API endpoints, ↵Ivan Tashkinov
:skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-02Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex See merge request pleroma/pleroma!2300
2020-04-02Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287
2020-04-02Merge 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-04-02Merge branch 'fix/docs-markdown' into 'develop'feld
Fix formatting in documentation See merge request pleroma/pleroma!2348
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 18:13:46 +0000