75e78d4e23
Merge branch 'feature/mrf-user-filter' into 'develop'
...
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
5 years ago
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
5 years ago
7d9b33b3ce
update documentation for the new MRF features [no-ci]
5 years ago
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
5 years ago
b22145cbc4
Documentation: Specify PEM format for SSH keys.
...
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
5 years ago
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
16b260fb19
add mix task to prune the object database using a configured retention period
5 years ago
d378b342ba
MongooseIM: Add documentation.
5 years ago
943d1b2f26
Merge branch 'feature/user-configurable-mascot' into 'develop'
...
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
5 years ago
5aa107d912
Document MRF.Simple :report_removal
5 years ago
daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
54e9cb5c2d
Add API endpoints for a custom user mascot
5 years ago
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
5 years ago
e2b3a27204
Add Reports to Admin API
5 years ago
8355d0607e
trailing spaces
5 years ago
9d14214eb9
Merge branch 'develop' into feature/890-add-report-uri
5 years ago
aa11fa4864
add report uri and report to
5 years ago
a2771869a3
Merge branch 'docs/update_debian_instructions' into 'develop'
...
Added package to dependency list documentation
See merge request pleroma/pleroma!1161
5 years ago
107c83ab2b
Note that nicknames is an array
5 years ago
0641e685c1
Note that nicknames is an array
5 years ago
1d2923e5d0
Update tag/untag docs
5 years ago
0ae15c2306
Added package to dependency list
...
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
5 years ago
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
f01f995816
make url uniform in admin api
5 years ago
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
f46295faa7
unused config paramater
5 years ago
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
2982061dfa
Fix syntax highlighting + clarify :frontend_configuration
5 years ago
ce3789e39a
Add default_scope to /api/v1/update_credentials
5 years ago
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
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
5 years ago
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
dfc8425659
Move settings to Source subentity
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
4baea6e6d9
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
5 years ago
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
5 years ago
7dcac0bac0
Merge branch 'develop' into 'develop'
...
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
5 years ago
74ef14b04e
Add :emoji settings to config.md
5 years ago
d35246c449
added healthcheck setting to instance config
5 years ago
c876b04aeb
Add shortcode_globs setting to documentation
5 years ago
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
88f0be9693
Feature/826 healthcheck endpoint
5 years ago
kaniini