aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-22Merge branch 'develop' into feature/new-registrations-digestMark Felder
2020-01-22Merge branch 'develop' into features/remote-follow-userpage-redirectMark Felder
2020-01-22Update changeloglain
2020-01-22Document new EmojiReaction notificationslain
2020-01-22Notifications: Add emoji reaction notificationslain
2020-01-22Update CHANGELOGEgor Kislitsyn
2020-01-22Update documentationEgor Kislitsyn
2020-01-22[#1505] Added Mastodon-compatible `replies` collection to Note federated ↵Ivan Tashkinov
representation.
2020-01-22Merge branch 'no-error-404' into 'develop'rinpatch
Log at debug level for object deletion, not error. See merge request pleroma/pleroma!2066
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-22Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eexminibikini
2020-01-22Merge branch 'develop' into feature/new-registrations-digestEgor Kislitsyn
2020-01-22Merge branch 'admin-be' into 'develop'feld
Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976
2020-01-22Fix credo warningsEgor Kislitsyn
2020-01-22Apply suggestion to docs/configuration/cheatsheet.mdMaksim
2020-01-22Apply suggestion to docs/configuration/cheatsheet.mdMaksim
2020-01-22Disable NewUsersDigestEmail by defaultEgor Kislitsyn
2020-01-22Add new users digest emailEgor Kislitsyn
2020-01-22little fixesAlexander Strizhakov
2020-01-22docs updateAlexander Strizhakov
2020-01-22Merge branch 'mastofe/bundle-2020-01-22' into 'develop'rinpatch
Update MastoFE bundle to 2020-01-22 See merge request pleroma/pleroma!2127
2020-01-22Update MastoFE bundle to 2020-01-22Haelwenn (lanodan) Monnier
2020-01-22Merge branch 'emoji-reaction-extensions-2' into 'develop'rinpatch
Emoji Reactions: In the API, sort them by first emoji insertion date See merge request pleroma/pleroma!2126
2020-01-22Emoji reactions: Document changeslain
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-22support for updating env after settings deletionAlexander Strizhakov
2020-01-22Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-22Revert "Update AdminFE build"Alexander Strizhakov
This reverts commit 6395ad942c7087e97a8dcf2e9002005ed7b4c383
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21Merge branch 'fix/attachments-cleanup' into 'develop'feld
Delete attachments in queue with infinite timeout and ensure object.data.url is an array See merge request pleroma/pleroma!2103
2020-01-21Merge branch 'update/adminfe-20200121-part2' into 'develop'feld
AdminFE update, again See merge request pleroma/pleroma!2125
2020-01-21Last AdminFE update was accidentally built from master, not developMark Felder
2020-01-21Merge branch 'update/adminfe-20200121' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2124
2020-01-21Update AdminFE buildMark Felder
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-21Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma ↵Roman Chvanikov
into fix/attachments-cleanup
2020-01-21Add delete_attachments queue to configRoman Chvanikov
2020-01-21Merge branch 'develop' into fix/attachments-cleanupRoman Chvanikov
2020-01-21remote_follow_controller.ex: Redirect to the user page on successHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-21some refactor and testsAlexander Strizhakov
2020-01-21Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch
StatusView: Add `emoji_reactions` See merge request pleroma/pleroma!2120
2020-01-21Merge branch 'issue/1484' into 'develop'lain
[#1484] excludes posts of blocked users from search results Closes #1484 See merge request pleroma/pleroma!2122
2020-01-21Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-21fix for db keyAlexander Strizhakov
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-21exclude blocked user posts from search resultsMaksim Pechnikov
2020-01-20Merge branch 'develop' into fix/attachments-cleanupMark Felder
2020-01-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
emoji-reaction-extensions
2020-01-20Merge branch '1521-admin-report-test-fix' into 'develop'lain
[#1521] AdminApiControllerTest fix: fixed create report test (OAuth) Closes #1521 See merge request pleroma/pleroma!2121
2020-01-20[#1521] AdminApiControllerTest: fixed create report test (OAuth).Ivan Tashkinov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:12:59 +0000