aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user
AgeCommit message (Expand)Author
2019-06-05Fix conflictRoman Chvanikov
2019-06-04Merge branch 'develop' into issue/941Maksim Pechnikov
2019-06-04Merge branch 'generic-fe-settings' into 'develop'kaniini
2019-06-03Merge branch 'develop' into feature/digest-emailMark Felder
2019-06-03add option skip_thread_containmentMaksim Pechnikov
2019-06-02Merge branch 'feature/notification-control-part-2' into 'develop'kaniini
2019-06-01Remove now useless flavours switchingHaelwenn (lanodan) Monnier
2019-05-31MastodonAPI: Add extension to set and get pleroma_settings_store.lain
2019-05-31User: Add settings store to Info, AccountViewlain
2019-05-29Merge developRoman Chvanikov
2019-05-26notification: remove local/remote match rules (too complicated)William Pitcock
2019-05-25user info: allow formdata for notification settings like every other APIWilliam Pitcock
2019-05-25notification: add non_follows/non_followers notification control settingsWilliam Pitcock
2019-05-20Move default mascot configuration to `config/`Sadposter
2019-05-20Use string map for default mascotSadposter
2019-05-20Add API endpoints for a custom user mascotSadposter
2019-05-16Feature/896 toggling confirmationAlexander Strizhakov
2019-05-14Reuse query from User.restrict_deactivated/1Egor Kislitsyn
2019-05-14Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-13differences_in_mastoapi_responses.md: fullname & bio are optionnalAlexander Strizhakov
2019-05-11Merge developRoman Chvanikov
2019-05-08Merge developAlexander Strizhakov
2019-05-08Merge developRoman Chvanikov
2019-05-03formatter.ex: Add get_emoji_map/1Haelwenn (lanodan) Monnier
2019-04-30Merge developRoman Chvanikov
2019-04-24Fix leaking private configuration parameters in Mastodon and Twitter APIs, an...rinpatch
2019-04-23Extend Mastodon API with public endpoint for getting Favorites timeline of an...Sergey Suprunenko
2019-04-21Set digest emails to false by defaultRoman Chvanikov
2019-04-13Add User.Info.email_notificationsRoman Chvanikov
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
2019-04-05Change relationship direction of subscriptionsSadposter
2019-04-05Add notification checksSadposter
2019-04-05Add API endpoints and user column for subscriptionSadposter
2019-03-28Add PUT /api/pleroma/notification_settings endpointeugenijm
2019-03-28Notification controlseugenijm
2019-03-15formattingKaren Konou
2019-03-15Refactor to store user ap_id, add testsKaren Konou
2019-03-15Implement mastodon's reblog hiding featureKaren Konou
2019-03-13[Credo] Remove parentesis on argument-less functionsHaelwenn (lanodan) Monnier
2019-03-12Add "roles" to users admin APIMaxim Filippov
2019-03-03Remove follow_request_count as it's not needed for FE anymore.eugenijm
2019-02-19Update the mute implementation to the current codebaseEkaterina Vaartis
2019-02-18Merge branch 'features/flavour-switching' into 'develop'kaniini
2019-02-18Merge branch 'follow-request-count' into 'develop'kaniini
2019-02-16[MastoAPI] Add switching of frontend flavoursHaelwenn (lanodan) Monnier
2019-02-16WelcomeMessage: Get rid of Ecto reference.lain
2019-02-16Add optional welcome message.lain
2019-02-15Add logic for keeping follow_request_count up-to-date on the `follow`,eugenijm
2019-02-06hide_followings was renamed to hide_followers in the FE, but never synced up ...Mark Felder
2019-02-06Allow to configure visibility for admin and moderator badgeseugenijm