aboutsummaryrefslogtreecommitdiff
path: root/docs
AgeCommit message (Collapse)Author
2019-05-16Merge branch 'feature/890-add-report-uri' into 'develop'kaniini
Feature/890 add report uri Closes #890 See merge request pleroma/pleroma!1164
2019-05-16Add Reports to Admin APISergey Suprunenko
2019-05-16trailing spacesAlex S
2019-05-16Merge branch 'develop' into feature/890-add-report-uriAlex S
2019-05-16add report uri and report toAlex S
2019-05-16Merge branch 'docs/update_debian_instructions' into 'develop'kaniini
Added package to dependency list documentation See merge request pleroma/pleroma!1161
2019-05-16Note that nicknames is an arrayAngelina Filippova
2019-05-16Note that nicknames is an arrayAngelina Filippova
2019-05-16Update tag/untag docsAngelina Filippova
2019-05-15Added package to dependency listPolymerWitch
Added the erlang-ssh package to the dependency list and the installation command instructions. The project wouldn't build otherwise.
2019-05-15Search: Add optional rum indexing / searching.lain
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
[ci skip]
2019-05-11make url uniform in admin apiSachin Joshi
2019-05-08Merge developAlexander Strizhakov
Merge conflict in lib/pleroma/activity.ex
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-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-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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 21:02:26 +0000