aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Expand)Author
2020-01-25[#1505] Background fetching of incoming activities' `replies` collections.Ivan Tashkinov
2020-01-25can be changed in runtimeAlexander Strizhakov
2020-01-24added atom feedMaksim Pechnikov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-24Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'rinpatch
2020-01-24Merge branch 'emoji-reaction-sanity-check' into 'develop'rinpatch
2020-01-24Emoji reactions: Change api format once morelain
2020-01-24fix for non existing atomAlexander Strizhakov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23parsing Swoosh modulesAlexander Strizhakov
2020-01-23fixed delete ScheduledActivityMaksim Pechnikov
2020-01-23Emoji reactions: Add sanity checks for the cachelain
2020-01-23Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-23removed try/rescueMaksim Pechnikov
2020-01-23Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.exMaksim
2020-01-23Merge branch 'emoji-notifications' into 'develop'Haelwenn
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-22Notifications: Add emoji reaction notificationslain
2020-01-22[#1505] Added Mastodon-compatible `replies` collection to Note federated repr...Ivan Tashkinov
2020-01-22Merge branch 'no-error-404' into 'develop'rinpatch
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
2020-01-22Fix credo warningsEgor Kislitsyn
2020-01-22Disable NewUsersDigestEmail by defaultEgor Kislitsyn
2020-01-22Add new users digest emailEgor Kislitsyn
2020-01-22Merge branch 'emoji-reaction-extensions-2' into 'develop'rinpatch
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-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
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
2020-01-21some refactor and testsAlexander Strizhakov
2020-01-21Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch
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' of git.pleroma.social:pleroma/pleroma into emoji-react...lain
2020-01-20Merge branch 'favoritng-responses' into 'develop'rinpatch
2020-01-20merge fixAlexander Strizhakov
2020-01-20StatusView: Add `emoji_reactions`lain
2020-01-20Merge branch 'credo/version-bump-1.1.5' into 'develop'lain
2020-01-20Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'lain
2020-01-20CommonAPI: Don't error out on double favs/repeatslain