aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-01-30Merge branch 'emoji-api-errors' into 'develop'feld
2020-01-30Update emoji_api_controller.exfeld
2020-01-30Merge branch 'emoji-reactions-reacted' into 'develop'rinpatch
2020-01-29Merge branch 'fix-streaming-reblog' into 'develop'Haelwenn
2020-01-29emoji api error on not writable dirAlexander Strizhakov
2020-01-29Emoji Reactions: Correctly handle deleted userslain
2020-01-29Emoji Reactions: Add `reacted` field to emoji reactionslain
2020-01-29title parse improvementAlexander Strizhakov
2020-01-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/re...lain
2020-01-28Merge branch 'fix/1524-link_preview' into 'develop'lain
2020-01-28meta tag parser respect first title headerAlexander Strizhakov
2020-01-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag...lain
2020-01-28Streamer: Correctly handle reblog muteslain
2020-01-28Remove `whole_db` parameter everywhere, it's not used anymorelain
2020-01-28Apply suggestion to lib/pleroma/web/feed/tag_controller.exlain
2020-01-27Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-27Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-26Merge branch 'fix/runtime-config' into 'develop'feld
2020-01-26Merge branch 'develop' into issue/1280Mark Felder
2020-01-25restarting pleroma from outside applicationAlexander Strizhakov
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 'emoji-reaction-sanity-check' into 'develop'rinpatch
2020-01-24Emoji reactions: Change api format once morelain
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-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-22Add new users digest emailEgor Kislitsyn
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-21remote_follow_controller.ex: Redirect to the user page on successHaelwenn (lanodan) Monnier
2020-01-21some refactor and testsAlexander Strizhakov