aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
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
Emoji notifications See merge request pleroma/pleroma!2130
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 ↵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-22Disable NewUsersDigestEmail by defaultEgor Kislitsyn
2020-01-22Add new users digest emailEgor Kislitsyn
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: 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
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 '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 ↵lain
emoji-reaction-extensions
2020-01-20Merge branch 'favoritng-responses' into 'develop'rinpatch
Mastodon API: Align favoriting / repeating behavior with Mastodon See merge request pleroma/pleroma!2119
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
Bump credo to 1.1.5 See merge request pleroma/pleroma!2115
2020-01-20Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'lain
Pleroma API: `emoji_reactions_by` does not need authorization See merge request pleroma/pleroma!2117
2020-01-20CommonAPI: Don't error out on double favs/repeatslain
2020-01-20Merge branch 'fix-admin-api-scope' into 'develop'lain
fix oauth scopes for AdminApi#reports_update See merge request pleroma/pleroma!2087
2020-01-20Pleroma API: `emoji_reactions_by` does not need authorizationlain
2020-01-20Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn
Hashtag benchmarks See merge request pleroma/pleroma!2116
2020-01-20Bump credo to 1.1.5Haelwenn (lanodan) Monnier
2020-01-20Merge branch 'features/cleanup-incoming-actor' into 'develop'rinpatch
transmogrifier.ex: simplify handle_incoming of actors See merge request pleroma/pleroma!2114
2020-01-20Check for unapplied migrations on startuprinpatch
Closes #1328
2020-01-19Fix credo warningRoman Chvanikov
2020-01-19Delete attachments asynchronouslyRoman Chvanikov
2020-01-19transmogrifier.ex: simplify handle_incoming of actorsHaelwenn (lanodan) Monnier
2020-01-18releases supportAlexander Strizhakov
2020-01-18full update for some subkeysAlexander Strizhakov
2020-01-17Delete attachments after object and cache cleanupRoman Chvanikov