aboutsummaryrefslogtreecommitdiff
path: root/docs
AgeCommit message (Collapse)Author
2019-05-22Merge branch 'feature/mrf-user-filter' into 'develop'kaniini
mrf: add support for filtering users See merge request pleroma/pleroma!1188
2019-05-22Merge branch 'ssh-fixes' into 'develop'kaniini
Ssh fixes Closes #869 and #925 See merge request pleroma/pleroma!1191
2019-05-22update documentation for the new MRF features [no-ci]William Pitcock
2019-05-22[#699] add worker to clean expired oauth tokensMaksim
2019-05-22Merge branch 'feature/object-pruning' into 'develop'lambda
Object pruning See merge request pleroma/pleroma!1181
2019-05-22Documentation: Specify PEM format for SSH keys.lain
Otherwise openssh-client 7.9 will generate a different format that can't be used by esshd.
2019-05-22Merge branch 'mongooseim-support' into 'develop'kaniini
MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172
2019-05-21add mix task to prune the object database using a configured retention periodWilliam Pitcock
2019-05-21MongooseIM: Add documentation.lain
2019-05-21Add poll limits to /api/v1/instance and initial staterinpatch
2019-05-20Merge branch 'feature/user-configurable-mascot' into 'develop'kaniini
Feature: user configurable mascot See merge request pleroma/pleroma!1177
2019-05-21Document MRF.Simple :report_removalAaron Tinio
2019-05-20Move default mascot configuration to `config/`Sadposter
2019-05-20Add API endpoints for a custom user mascotSadposter
2019-05-17Merge remote-tracking branch 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
2019-05-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-indexlain
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-16Merge remote-tracking branch 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
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-15Merge remote-tracking branch 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
2019-05-14Add documentationEgor 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
[ci skip]
2019-05-11make url uniform in admin apiSachin Joshi
2019-05-11Merge developRoman Chvanikov
2019-05-08Merge developAlexander Strizhakov
Merge conflict in lib/pleroma/activity.ex
2019-05-08Merge developRoman Chvanikov
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