aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Expand)Author
2019-12-04fix ScheduledActivityMaksim Pechnikov
2019-12-04[#1335] Merge issue fix.Ivan Tashkinov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-12-04ChatChannel: Ignore messages that are too long.lain
2019-12-04add @type to ScheduledActivityMaksim Pechnikov
2019-12-04Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-04updated ScheduledActivityMaksim Pechnikov
2019-12-03Fix Pleroma.FollowingRelationship.move_following/2Egor Kislitsyn
2019-12-04Add report notesMaxim Filippov
2019-12-03Add `with_move` query param to the notifications APIEgor Kislitsyn
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
2019-12-02Update Floki dependencyEgor Kislitsyn
2019-12-01Merge branch 'develop' into issue/1411Maksim Pechnikov
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
2019-11-30hide follower/following for friendicakPherox
2019-11-29[#1427] Initial support for OAuth admin scopes.Ivan Tashkinov
2019-11-29Fix Pleroma.HTML.extract_first_external_url/2Egor Kislitsyn
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-28added privacy option to push notificationsMaksim Pechnikov
2019-11-28added User.NotificationSetting structMaksim Pechnikov
2019-11-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-11-28obligatory format commitSadposter
2019-11-28make follows take precedence over domain blocksSadposter
2019-11-28Fetch account from report, not from status (it might be deleted)Maxim Filippov
2019-11-27Handle reopened reports with deleted statusesMaxim Filippov
2019-11-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442...lain
2019-11-27User: Never return nil for user follower counts.lain
2019-11-27moved DigestEmail to Oban Periodic jobsMaksim Pechnikov
2019-11-27Remove User.user_info/2Egor Kislitsyn
2019-11-27Add a view for the move notificationEgor Kislitsyn
2019-11-27moved ActivityExpiration to Oban Periodic jobsMaksim Pechnikov
2019-11-27moved ScheduledActivity to Oban Periodic jobsMaksim Pechnikov
2019-11-27Remove `account` field from web push payloadEgor Kislitsyn
2019-11-26Add `direct_conversation_id` to web push payloadEgor Kislitsyn
2019-11-26moved Pleroma.Stats to Oban Periodic jobsMaksim Pechnikov
2019-11-26Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-26Merge branch 'develop' into feature/admin-api-render-whole-statusMaxim Filippov
2019-11-25Merge branch 'fix/ap-disable-remote-render' into 'develop'lain
2019-11-26AdminAPI: Grouped reports old/new fixMaxim Filippov
2019-11-26AdminAPI: Fix grouped reports for closed/resolved reportsMaxim Filippov
2019-11-25OStatus controller: don't serve json at /notice/, redirect insteadrinpatch
2019-11-25ActivityPub controller: do not render remote usersrinpatch
2019-11-25Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'dev...feld
2019-11-25Merge branch 'fix/update-reports-old-format' into 'develop'feld
2019-11-25moved OAuth.Token.CleanWorker to Oban Periodic jobsMaksim Pechnikov
2019-11-25add ability to set a custom user-agent stringSadposter
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25TypoMaxim Filippov
2019-11-25Admin API: Render whole status in grouped reportsMaxim Filippov