summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Expand)Author
2020-03-26Merge remote-tracking branch 'remotes/origin/develop' into relations-preloadi...Ivan Tashkinov
2020-03-25Merge branch 'benchmark_timeline' into 'develop'rinpatch
2020-03-25Further preloading (more endpoints), refactoring, tests.Ivan Tashkinov
2020-03-25Applied relationships preloading to GET /api/v1/accounts/relationships. Refac...Ivan Tashkinov
2020-03-25[#1364] Minor improvements / comments.Ivan Tashkinov
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications...Ivan Tashkinov
2020-03-25Fixed incorrect usage of "relations" as a short form of "relationships".Ivan Tashkinov
2020-03-24Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactionsHaelwenn (lanodan) Monnier
2020-03-24Merge remote-tracking branch 'remotes/origin/develop' into relations-preloadi...Ivan Tashkinov
2020-03-24Implemented preloading of relationships with parent activities' actors for st...Ivan Tashkinov
2020-03-24Merge branch 'fix/activity-deletion' into 'develop'feld
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-23Merge remote-tracking branch 'remotes/origin/develop' into relations-preloadi...Ivan Tashkinov
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-23creating trusted app from adminFE & mix taskAlexander Strizhakov
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-22Mastodon API Account view: Remove an outdated hackrinpatch
2020-03-20Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-03-20Merge branch 'develop' into gunAlexander Strizhakov
2020-03-20Add embeddable postsEgor Kislitsyn
2020-03-20Merge branch 'fix-feed-pagination' into 'develop'lain
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
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-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-19Add emoji reactions to features in nodeinfoMark Felder
2020-03-19WIPHaelwenn (lanodan) Monnier
2020-03-18Merge branch 'develop' into gunAlexander Strizhakov
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-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`eugenijm
2020-03-16removing with_move parameterAlexander Strizhakov
2020-03-16Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications...Ivan Tashkinov
2020-03-16fixAlexander Strizhakov
2020-03-16temp fix for `:gun.info` MatchErrorAlexander Strizhakov
2020-03-16Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
2020-03-16fix for content-type header for tag feedAlexander Strizhakov