Commit Graph

1400 Commits (pre-rebase)

Author SHA1 Message Date
FloatingGhost 0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'"
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'
3 years ago
Alex Gleason b96a58ff28 Merge branch 'account-subscriptions' into 'develop'
3 years ago
Alex Gleason 2caade10df Merge branch 'add-nodeinfo-doc' into 'develop'
3 years ago
Hakaba Hitoyo 87871ac857 Add initial Nodeinfo document
3 years ago
Alex Gleason bd853199d9 Merge branch 'v2-suggestions' into 'develop'
3 years ago
marcin mikołajczak c96e52b88c Add 'notifying' to relationship for compatibility with Mastodon
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
3 years ago
lain e2772d6bf1 Merge branch 'block-behavior' into 'develop'
3 years ago
lain 6e3df11693 Merge branch 'instance-deletion' into 'develop'
3 years ago
partev ad5da6ae68 fix a typo "Optionnal" -> "Optional"
3 years ago
Haelwenn 6b3842cf50 Merge branch 'remove/mastofe' into 'develop'
3 years ago
someone cc4f20b130
mix pleroma.database set_text_search_config now runs concurrently and infinitely
3 years ago
Haelwenn 689a59f41f Merge branch 'set_text_search_config_timeout' into 'develop'
3 years ago
Haelwenn 26abe96abf Merge branch 'docs_add_yunohost_installation' into 'develop'
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
3 years ago
Haelwenn 6c0ebc65fd Merge branch 'docs_make_otp_recommendation_clearer' into 'develop'
3 years ago
Ilja 438ad0d3f9 Make the OPT recomendation clearer
3 years ago
Ilja c29fc1aafb Add YunoHost to installation guides
3 years ago
Ilja 506bf16363
Change docs
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
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'
3 years ago
feld 275af29302 Merge branch 'Snow-develop-patch-01683' into 'develop'
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'
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
3 years ago
rinpatch 79376b4afb Merge branch 'feature/521-pinned-post-federation' into 'develop'
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