FloatingGhost
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf50
, reversing
changes made to 6b1282a829
.
3 years ago
Alex Gleason
e8b340aaa7
Docs: fix various Pleroma API endpoints paths, fix MFA response
3 years ago
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
3 years ago
Alex Gleason
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
3 years ago
Alex Gleason
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
3 years ago
Alex Gleason
2caade10df
Merge branch 'add-nodeinfo-doc' into 'develop'
...
Add initial Nodeinfo document
See merge request pleroma/pleroma!3546
3 years ago
Hakaba Hitoyo
87871ac857
Add initial Nodeinfo document
3 years ago
Alex Gleason
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
3 years ago
marcin mikołajczak
c96e52b88c
Add 'notifying' to relationship for compatibility with Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
Alex Gleason
6c0484d571
AdminAPI: suggest a user through the API
3 years ago
marcin mikołajczak
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
lain
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
3 years ago
lain
6e3df11693
Merge branch 'instance-deletion' into 'develop'
...
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
3 years ago
partev
ad5da6ae68
fix a typo "Optionnal" -> "Optional"
3 years ago
Haelwenn
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
3 years ago
someone
cc4f20b130
mix pleroma.database set_text_search_config now runs concurrently and infinitely
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514
3 years ago
Haelwenn
689a59f41f
Merge branch 'set_text_search_config_timeout' into 'develop'
...
mix pleroma.database set_text_search_config now runs concurrently and infinitely
See merge request pleroma/pleroma!3514
3 years ago
Haelwenn
26abe96abf
Merge branch 'docs_add_yunohost_installation' into 'develop'
...
Add YunoHost to installation guides
See merge request pleroma/pleroma!3497
3 years ago
someone
4b940e441a
mix pleroma.database set_text_search_config now runs concurrently and infinitely
3 years ago
Ilja
1cf89de89a
Make the OPT recomendation clearer
...
AFAIK OTP releases are the recomended way of installing, but
* People seem unaware of that and use from source installations because they use the guide with the name of their distro
* People don't know what OTP releases are or what it means
I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP)
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3485
3 years ago
Haelwenn
6c0ebc65fd
Merge branch 'docs_make_otp_recommendation_clearer' into 'develop'
...
Make the OPT recomendation clearer
See merge request pleroma/pleroma!3485
3 years ago
Ilja
438ad0d3f9
Make the OPT recomendation clearer
...
AFAIK OTP releases are the recomended way of installing, but
* People seem unaware of that and use from source installations because they use the guide with the name of their distro
* People don't know what OTP releases are or what it means
I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP)
3 years ago
Ilja
c29fc1aafb
Add YunoHost to installation guides
3 years ago
Ilja
506bf16363
Change docs
...
* ./configuration/mrf.md
* Change example
* ./configuration/cheatsheet.md
* Change descriptions to include that a reason is given
* CHANGELOG.md
* Add as breaking change
3 years ago
Alex Gleason
3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
3 years ago
Alex Gleason
54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
3 years ago
Sean King
5d279a22b1
Merge develop branch upstream
3 years ago
Haelwenn (lanodan) Monnier
822196f393
docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repo
3 years ago
Haelwenn (lanodan) Monnier
17f980e9ab
docs: Remove Erlang Solutions repository
3 years ago
Haelwenn (lanodan) Monnier
6b1f7f2f52
docs: Use one file to describe dependencies
3 years ago
Alex Gleason
fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
...
Speeds up recompilation by reducing compile-time deps
3 years ago
Alex Gleason
879c2db0bd
Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings
3 years ago
Sean King
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
Haelwenn
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
3 years ago
feld
275af29302
Merge branch 'Snow-develop-patch-01683' into 'develop'
...
Update docs/description for allow_relay
See merge request pleroma/pleroma!3438
3 years ago
Mark Felder
679d4c23e9
Update wording for relays in docs and config description
3 years ago
Mark Felder
d6432a65da
Move shout configuration from :instance, update docs and changelog
3 years ago
Haelwenn
a0ba44904a
Merge branch 'docs/goto-libera' into 'develop'
...
Changing references of freenode to libera.chat
See merge request pleroma/pleroma!3415
3 years ago
Haelwenn (lanodan) Monnier
03232a8223
Changing references of freenode to libera.chat
3 years ago
Alex Gleason
32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config
3 years ago
Alex Gleason
b540fff908
Docs: use `MIX_ENV=prod mix pleroma.instance gen`
3 years ago
Alex Gleason
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
3 years ago
Alex Gleason
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
3 years ago
Mark Felder
7eded72189
Fix incorrect shell command
...
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
3 years ago
rinpatch
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
3 years ago
Sean King
fa2e62078c
Remove MastoFE configuration stuff
3 years ago
Sean King
f3b403fa98
Remove MastoFE stuff from docs and default panel
3 years ago
Sean King
d9fce0133e
Fix Mastodon interface link
3 years ago
Mark Felder
d29f6d6b6e
Add more details to the cheatsheat for FollowBot MRF
4 years ago
feld
2689463c7e
Apply 1 suggestion(s) to 1 file(s)
4 years ago