aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-12-05Add support for custom modulesEgor Kislitsyn
2019-12-05Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-05Merge branch 'develop' into issue/1411Maksim Pechnikov
2019-12-04fix ScheduledActivityMaksim Pechnikov
2019-12-04[#1335] Merge issue fix.Ivan Tashkinov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
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
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-12-02Fix `mix pleroma.user list` taskEgor Kislitsyn
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
Removed users.info field See merge request pleroma/pleroma!2006
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 ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28add mix task to set\unset privacy option of notificationMaksim Pechnikov
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 ↵lain
bugfix/1442-dont-return-nil-for-following-count
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 ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex
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
Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010
2019-11-26AdminAPI: Grouped reports old/new fixMaxim Filippov
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
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 ↵feld
'develop' Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981
2019-11-25Merge branch 'fix/update-reports-old-format' into 'develop'feld
Admin API: Fix error when trying to update reports in the "old" format See merge request pleroma/pleroma!1986
2019-11-25moved OAuth.Token.CleanWorker to Oban Periodic jobsMaksim Pechnikov