aboutsummaryrefslogtreecommitdiff
path: root/docs
AgeCommit message (Collapse)Author
2019-05-07Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-07unused config paramaterAlex S
2019-05-06fix formatMaksim
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
BBS / SSH See merge request pleroma/pleroma!997
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Alexander Strizhakov
feature/845-improve-status-deletion
2019-05-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
2019-05-01Fix syntax highlighting + clarify :frontend_configurationxse
2019-04-30Merge developRoman Chvanikov
2019-04-27Add default_scope to /api/v1/update_credentialsrinpatch
2019-04-26Merge branch 'feature/mastoapi-new-config' into 'develop'kaniini
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093
2019-04-25Add mediaproxy whitelist capabilityMark Felder
2019-04-25Move settings to Source subentityrinpatch
2019-04-25Merge branch 'develop' into feature/disable-accountEgor Kislitsyn
2019-04-24Fix leaking private configuration parameters in Mastodon and Twitter APIs, ↵rinpatch
and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-23Extend Mastodon API with public endpoint for getting Favorites timeline of ↵Sergey Suprunenko
any user (#789)
2019-04-23Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'kaniini
Add `in_reply_to_account_acct` to MastoAPI status entity See merge request pleroma/pleroma!1086
2019-04-23Merge branch 'develop' into 'develop'kaniini
Add shortcode_globs setting to documentation See merge request pleroma/pleroma!1087
2019-04-22Add :emoji settings to config.mdilja
2019-04-22added healthcheck setting to instance configAlex S
2019-04-22Add shortcode_globs setting to documentationilja
2019-04-22Add `pleroma.in_reply_to_account_acct` to MastoAPI status entityrinpatch
2019-04-22Feature/826 healthcheck endpointAlexander Strizhakov
2019-04-22Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-22Merge branch 'rework-emoji-management' into 'develop'kaniini
Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073
2019-04-21Move comments for email_notifications config to docsRoman Chvanikov
2019-04-21differences_in_mastoapi_responses.md: `content_type` parameter of post ↵Haelwenn (lanodan) Monnier
submission
2019-04-20Remove most finmoji mentions where appropriateEkaterina Vaartis
2019-04-20Document the pleroma.emoji taskEkaterina Vaartis
2019-04-20Include explicit warning for emerge config line as it will vary more widely ↵witches.live
based on current version of postgres
2019-04-19typo fixAlexander Strizhakov
docs for RelMe provider
2019-04-18Do not require authentication for user search in MastoAPIMark Felder
2019-04-16Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini
Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040
2019-04-16add extra_cookie_attrs option to configHakurei Reimu
Allow instance admins to set their own SameSite cookie policy from the config. Default value in the config is `Lax`.
2019-04-15Custom Emoji docs: Make it clear that config.exs is not for lewd.lain
2019-04-15add `/api/pleroma/disable_account` to `docs/api/pleroma_api.md`Egor Kislitsyn
2019-04-13docs/installation/arch_linux_en.md: Remove useless ODBCHaelwenn (lanodan) Monnier
See [1] for confirmation. 1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
2019-04-13Merge develop to 788-separate-email-addressesAlex S
Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029
2019-04-10Merge branch 'develop' into feature/788-separate-email-addressesAlex S
2019-04-10adding notify_email setting for trigger emailsAlex S
2019-04-10Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda
Feature/767 multiple use invite token See merge request pleroma/pleroma!1032
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
2019-04-10Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda
Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-10Merge branch 'notification-pleroma-settings' into 'develop'kaniini
Notification controls Closes #738 See merge request pleroma/pleroma!988
2019-04-09Change response format of /api/pleroma/emoji to the one that actually makes ↵rinpatch
sense
2019-04-08renaming expire_at -> expires_atAlex S
keyword style change
2019-04-07added docs to docs/api/admin_api.mdAlex S
code style and little renamings
2019-04-06JSON need quotes!Sadposter
2019-04-06Document subscription endpoints, fix typosSadposter
Also adds a quick error case on the subscription endpoints to avoid 500s