aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.exrinpatch
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/pipeline.exlain
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_val...lain
2020-03-24Merge branch 'admin-api-change-password' into 'develop'lain
2020-03-24Support pagination in conversationsEgor Kislitsyn
2020-03-24Fix activity deletionEgor Kislitsyn
2020-03-23Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
2020-03-23Benchmarks: Add timeline benchmarklain
2020-03-23Home timeline tests: Add failing test for relationshipslain
2020-03-23Merge remote-tracking branch 'remotes/origin/develop' into relations-preloadi...Ivan Tashkinov
2020-03-23Merge branch 'support-emoji-staticfe' into 'develop'rinpatch
2020-03-23Add emoji support in statuses in staticfeEgor Kislitsyn
2020-03-23Preloading of follow relations for timeline/statuses rendering (performance i...Ivan Tashkinov
2020-03-22WIP: preloading of user relations for timeline/statuses rendering (performanc...Ivan Tashkinov
2020-03-22AccountView: fix for other forms of <br> in bioHaelwenn (lanodan) Monnier
2020-03-22Merge branch 'fix/ecto_ssl_option' into 'develop'rinpatch
2020-03-22Merge branch 'relationship-remove-outdated-hack' into 'develop'Haelwenn
2020-03-22Mastodon API Account view: Remove an outdated hackrinpatch
2020-03-20updating clear_configAlexander Strizhakov
2020-03-20Merge branch 'develop' into gunAlexander Strizhakov
2020-03-20Merge branch 'fix-feed-pagination' into 'develop'lain
2020-03-20Merge branch 'clear-config-test-improvements' into 'develop'lain
2020-03-20Improved in-test `clear_config/n` applicability (setup / setup_all / in-test ...Ivan Tashkinov
2020-03-20Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-...Ivan Tashkinov
2020-03-20Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'lain
2020-03-20NotificationController: Fix test.lain
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-20Merge branch 'feature/1635-notifications-include-types' into 'develop'lain
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-19Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activityHaelwenn (lanodan) Monnier
2020-03-19Merge branch 'fix-testing' into 'develop'lain
2020-03-19transmogrifier.ex: rework fix_attachment for better IRHaelwenn (lanodan) Monnier
2020-03-19Fix linting.lain
2020-03-19Merge branch 'remake-remodel' into developlain
2020-03-19remove federated testingstwf
2020-03-19Add emoji reactions to features in nodeinfoMark Felder
2020-03-19WIPHaelwenn (lanodan) Monnier
2020-03-18Improved in-test config management functions.Ivan Tashkinov
2020-03-18Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gunAlexander Strizhakov
2020-03-18Merge branch 'develop' into gunAlexander Strizhakov
2020-03-18Merge branch 'feature/1530-removing-with_move' into 'develop'rinpatch
2020-03-17activity_pub_controller_test.exs: test posting with AP C2S uploaded mediaHaelwenn (lanodan) Monnier
2020-03-16Fix ssl option on Ecto config breaking releaseCevado
2020-03-16Enable Gun adapter by defaultMark Felder
2020-03-16[#1364] Improved notification-related tests.Ivan Tashkinov
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/...eugenijm
2020-03-16Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`eugenijm
2020-03-16removing with_move parameterAlexander Strizhakov