44d14e8a9c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-14 07:07:19 +02:00
8ddea16b0d
DOCS: Add some small piece about setting up a Gitlab-runner
...
This is based on me setting one up, but I kept it general with mostly linking to other documentation.
The idea is that to just provide some Pleroma-specific info, maybe give some pointers, and point to the right (external) docs.
2022-07-13 20:54:24 +02:00
fdc71f6051
Merge branch 'short-description' into 'develop'
...
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
2022-07-13 04:42:24 +00:00
f88ed1df75
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-05 12:05:19 +02:00
4edc867b87
Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'
...
# Conflicts:
# lib/pleroma/constants.ex
2022-07-03 22:24:57 +00:00
de37583c49
Merge branch 'image_description_from_exif_data' into 'develop'
...
Use EXIF data of image for image description
See merge request pleroma/pleroma!3535
2022-07-03 21:14:25 +00:00
6b937d1473
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop'
...
Server announcements (1st pass)
See merge request pleroma/pleroma!3643
2022-07-03 20:58:20 +00:00
42d4bd3a5d
Rename pipelines and add forgotten tags
...
I renamed some tags before, but forgot to rename the pipelines
I also had some tags which I forgot to add to the config, description, etc.
These have now been done/added
2022-07-02 08:55:14 +02:00
15748fd301
Add better explanation in the Cheatsheet about what each tag does
2022-07-02 08:17:22 +02:00
51f87ba30c
Change order of privilege tags to make more sense
...
The tags were listed in different places
They were listed in a rather randomly order
I reordered them in a way I think makes more sense
2022-07-02 07:59:46 +02:00
c0e4b1b3e2
Fix typo's
...
priviledge |-> privilege
2022-07-02 07:52:39 +02:00
7d234d097c
Add option to docs about instance gen
2022-07-01 12:15:02 +02:00
8303af84ce
Rename the Exiftool module
...
No migrations or checks yet
2022-07-01 12:15:02 +02:00
551721e41a
Rename the new module
2022-07-01 12:13:46 +02:00
cd316d7269
Use EXIF data of image to prefill image description
...
During attachment upload Pleroma returns a "description" field. Pleroma-fe has an MR to use that to pre-fill the image description field, <https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1399 >
* This MR allows Pleroma to read the EXIF data during upload and return the description to the FE
* If a description is already present (e.g. because a previous module added it), it will use that
* Otherwise it will read from the EXIF data. First it will check -ImageDescription, if that's empty, it will check -iptc:Caption-Abstract
* If no description is found, it will simply return nil, just like before
* When people set up a new instance, they will be asked if they want to read metadata and this module will be activated if so
This was taken from an MR i did on Pleroma and isn't finished yet.
2022-07-01 12:13:46 +02:00
0d697bc15a
Add docs and CHANGELOG entries
2022-07-01 10:50:32 +02:00
fe2d4778ee
Expose content type of status sources
2022-06-04 12:57:30 -04:00
7977dd6ac7
Instruct users to run 'git pull' as the pleroma user
2022-05-12 16:02:58 +00:00
4605efe272
Merge branch 'improve_anti_followbot_policy' into 'develop'
...
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
Closes #2561
See merge request pleroma/pleroma!3498
2022-05-08 18:10:40 +00:00
a8093732bd
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
2022-05-08 18:10:40 +00:00
fbf9eced11
Add short_description field
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:04:27 +02:00
0e0a1758f7
Add doc for Admin Announcement APIs
2022-03-08 21:48:41 -05:00
5e38887080
Document API addition
2022-03-02 09:47:51 -05:00
7b56690af4
add nixos to supported distros
2022-01-22 09:39:02 +01:00
9faac1094f
Add glitch-lily to clients.md
2022-01-19 23:56:57 -05:00
a02cfd7f52
Add ForceMentionsInContentPolicy
...
Even though latest PleromaFE supports displaying these properly, mobile
apps still exist, so I think we should offer a workaround to those who
want it.
2022-01-19 21:04:57 +03:00
1dfb67f1e0
Docs: PleromaAPI oauth_tokens endpoints
2022-01-18 11:02:23 -06:00
72d5e29117
Merge branch 'hakabahitoyo-develop-patch-44025' into 'develop'
...
[Document] Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`.
See merge request pleroma/pleroma!3604
2022-01-18 13:18:36 +00:00
790081540d
Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`.
2022-01-15 12:26:33 +00:00
0f90fd5805
WIP account endorsements
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 18:15:10 +01:00
e8b340aaa7
Docs: fix various Pleroma API endpoints paths, fix MFA response
2022-01-07 12:51:54 -06:00
1d8abf2511
Document aliases endpoints
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
df90b3e66a
Document move_account API
...
Ref: emit-move
2021-12-28 01:10:39 -05:00
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-25 01:41:12 +00:00
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
2021-12-25 01:34:27 +00:00
2caade10df
Merge branch 'add-nodeinfo-doc' into 'develop'
...
Add initial Nodeinfo document
See merge request pleroma/pleroma!3546
2021-12-23 16:01:03 +00:00
87871ac857
Add initial Nodeinfo document
2021-12-23 16:01:02 +00:00
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
c96e52b88c
Add 'notifying' to relationship for compatibility with Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 21:24:12 +01:00
6c0484d571
AdminAPI: suggest a user through the API
2021-11-26 15:19:01 -06:00
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 16:56:26 +01:00
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
2021-11-15 14:27:59 +00:00
6e3df11693
Merge branch 'instance-deletion' into 'develop'
...
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
2021-11-15 14:24:13 +00:00
ad5da6ae68
fix a typo "Optionnal" -> "Optional"
2021-09-12 15:31:49 +00:00
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
cc4f20b130
mix pleroma.database set_text_search_config now runs concurrently and infinitely
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514
2021-08-28 18:29:43 +02:00
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
2021-08-28 16:11:52 +00:00
26abe96abf
Merge branch 'docs_add_yunohost_installation' into 'develop'
...
Add YunoHost to installation guides
See merge request pleroma/pleroma!3497
2021-08-28 16:09:55 +00:00
4b940e441a
mix pleroma.database set_text_search_config now runs concurrently and infinitely
2021-08-15 13:49:12 -04:00
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
2021-08-13 17:56:20 +02:00
6c0ebc65fd
Merge branch 'docs_make_otp_recommendation_clearer' into 'develop'
...
Make the OPT recomendation clearer
See merge request pleroma/pleroma!3485
2021-08-10 06:09:31 +00:00
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)
2021-08-10 06:09:31 +00:00
c29fc1aafb
Add YunoHost to installation guides
2021-08-07 12:49:28 +02:00
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
2021-08-06 07:59:53 +02:00
3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
2021-07-17 15:03:43 -05:00
54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
2021-07-17 14:55:05 -05:00
5d279a22b1
Merge develop branch upstream
2021-07-10 11:04:16 -06:00
822196f393
docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repo
2021-06-11 08:48:35 +02:00
17f980e9ab
docs: Remove Erlang Solutions repository
2021-06-11 08:48:35 +02:00
6b1f7f2f52
docs: Use one file to describe dependencies
2021-06-11 08:48:35 +02:00
fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
...
Speeds up recompilation by reducing compile-time deps
2021-06-07 14:22:08 -05:00
879c2db0bd
Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings
2021-06-07 11:18:14 -05:00
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
2021-06-03 15:52:16 +00:00
275af29302
Merge branch 'Snow-develop-patch-01683' into 'develop'
...
Update docs/description for allow_relay
See merge request pleroma/pleroma!3438
2021-06-02 16:53:37 +00:00
679d4c23e9
Update wording for relays in docs and config description
2021-06-02 11:30:09 -05:00
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
a0ba44904a
Merge branch 'docs/goto-libera' into 'develop'
...
Changing references of freenode to libera.chat
See merge request pleroma/pleroma!3415
2021-05-31 17:42:36 +00:00
03232a8223
Changing references of freenode to libera.chat
2021-05-31 17:08:20 +02:00
32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config
2021-05-16 12:27:29 -05:00
b540fff908
Docs: use `MIX_ENV=prod mix pleroma.instance gen`
2021-05-16 12:26:51 -05:00
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
2021-04-29 12:19:10 -05:00
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
7eded72189
Fix incorrect shell command
...
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
2021-04-20 12:31:14 -05:00
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
2021-04-16 09:53:47 +00:00
fa2e62078c
Remove MastoFE configuration stuff
2021-04-15 23:51:04 -06:00
f3b403fa98
Remove MastoFE stuff from docs and default panel
2021-04-15 23:37:18 -06:00
d9fce0133e
Fix Mastodon interface link
2021-04-14 14:01:33 -06:00
d29f6d6b6e
Add more details to the cheatsheat for FollowBot MRF
2021-03-30 11:10:44 -05:00
2689463c7e
Apply 1 suggestion(s) to 1 file(s)
2021-03-30 11:10:43 -05:00
840dc4b44b
Document :mrf_follow_bot
2021-03-30 11:10:34 -05:00
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
2021-03-25 13:03:40 +03:00
b6a69b5efd
Return token's primary key with POST /oauth/token
2021-03-24 12:50:05 -05:00
03843a5386
migrating config to tmp folder
2021-03-23 14:29:02 +03:00
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
6a71aa535b
Merge branch 'admin-api-versioning' into 'develop'
...
Pleroma APIs versioning
Closes #2509
See merge request pleroma/pleroma!3335
2021-02-28 16:22:22 +00:00
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
2021-02-27 21:26:17 +01:00
840686ecd5
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
...
expires_in in scheduled status params
Closes #2498
See merge request pleroma/pleroma!3315
2021-02-26 16:49:11 +00:00
a30126271f
Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.
2021-02-26 01:01:29 +00:00
870f9cb80c
Merge branch 'docfix/chat-token' into 'develop'
...
Update terminology in differences_in_mastoapi_responses.md
See merge request pleroma/pleroma!3344
2021-02-24 17:26:26 +00:00
f38056d2a1
Update terminology in differences_in_mastoapi_responses.md
2021-02-24 18:16:10 +01:00
6ff4ef12fd
Fix URL of Whalebird in docs
2021-02-23 21:31:06 +09:00
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
2021-02-23 13:52:28 +03:00
c140cc7bf3
Update the documentation to use make it use /api/v1/pleroma instead of /api/pleroma
2021-02-22 04:33:35 +03:00
b981edad8a
[ #3213 ] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
2021-02-18 20:40:10 +03:00
1e6c27181e
expires_in in scheduled status params
2021-02-18 14:59:22 +03:00
6d66fadea7
Remove `:auth, :enforce_oauth_admin_scope_usage`
...
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
2021-02-17 20:47:38 +03:00
349b8b0f4f
[ #3213 ] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).
2021-02-13 22:01:11 +03:00
6e68058b63
Merge branch 'feat/allow_alt_text_search_config' into 'develop'
...
allow user defined text search config in database
See merge request pleroma/pleroma!3275
2021-02-06 09:42:20 +00:00
8d4e0342e1
Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files
2021-02-06 09:42:17 +00:00
8d2ea95402
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
...
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
2021-02-03 14:21:57 +00:00
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
2021-02-02 18:35:08 +00:00
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
2021-02-02 17:57:58 +00:00
fdf1dfed56
only_remote -> remote renaming
2021-02-01 14:11:12 +03:00
ba512cbea4
`/api/v1/accounts/:id/statuses` docs update
2021-02-01 14:11:12 +03:00
77f0a0af7d
more tests and update for docs and changelog
2021-02-01 14:11:12 +03:00
e21af1cfe4
only_media & only_remote docs and changelog
2021-02-01 14:11:11 +03:00
239057155f
[ #3286 ] Documentation on configuring Pleroma as OAuth 2.0 provider.
2021-01-29 16:36:25 +03:00
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
2021-01-29 08:41:21 +03:00
d4158e8bf0
added total
...
to the instance adminAPI endpoint
2021-01-27 07:45:06 +03:00
6806c03e85
added total
...
to the user statuses adminAPI endpoint
2021-01-27 07:45:02 +03:00
0b19534475
Merge branch 'develop' into docs/apache-config
2021-01-25 17:00:26 -06:00
6e51d7264b
Document pleroma.user activate mix task
2021-01-25 10:38:08 -06:00
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-25 09:45:06 -06:00
55bf090492
add missing sudo prefix in install doc
2021-01-23 16:56:11 +00:00
003402df40
Add ability to invalidate cache entries for Apache
2021-01-21 14:20:13 -06:00
6d48144a9d
use proper naming
...
for MediaProxyWarmingPolicy in ConcurrentLimiter
2021-01-21 09:50:18 +03:00
dece31a031
Update docs
2021-01-21 09:47:22 +03:00
b4ff63d020
configurable limits for ConcurrentLimiter
...
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
2021-01-21 09:47:21 +03:00
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
2021-01-20 22:48:48 +00:00
e58f45abd6
Improve PostgreSQL optimization article
...
Move query plan mode setting from OTP installation guide and try
to explain what it does.
2021-01-19 14:26:17 +03:00
7516660753
Remove toggle_activation
2021-01-15 11:25:32 -06:00
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
2021-01-12 16:31:35 -06:00
6284e8f4b2
Add development section
...
* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
* index.md
* authentication_authorization.md
* mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md
2021-01-10 08:25:36 +00:00
1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-01-06 15:22:35 -06:00
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
2021-01-05 12:42:30 +01:00
0ec7e9b8e9
AdminAPI: return id for moderation log entries
2021-01-01 11:59:48 -06:00
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
2020-12-30 17:10:02 -06:00
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
d0c2479710
pleroma.database fill_old_hashtags: Add month_limit argument
2020-12-28 11:05:25 +01:00
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-12-17 09:05:36 -06:00
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
2020-12-14 11:02:32 -06:00
477c6c8e55
Merge branch 'auth-improvements' into 'develop'
...
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
2020-12-09 15:55:45 +00:00
1436a2fa2d
Merge branch 'stream-follow-updates' into 'develop'
...
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
2020-12-09 15:52:31 +00:00
c8e7ace812
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
...
# Conflicts:
# CHANGELOG.md
2020-12-07 21:45:04 +03:00
ed76323776
Merge branch 'feature/configdb-mix-tasks' into 'develop'
...
Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174
2020-12-07 18:06:06 +00:00
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-12-06 13:59:35 +03:00
49717f3dcd
Fix typo
2020-12-05 23:48:13 +04:00
9feb678ec8
Docs, Changelog: Add info about regional indicators
2020-12-03 16:18:35 +01:00
e379ab8277
Add --force flag for delete and reset commands
...
Bunch of reorganization and consolidation
2020-12-02 16:24:32 -06:00
6a97885ea3
Sync docs with mix commands
2020-12-02 10:43:22 -06:00
cc2fc2e423
The debug output is no longer there by default
2020-12-02 10:43:22 -06:00
570a923a3b
Update ConfigDB docs for new mix commands
2020-12-02 10:43:22 -06:00
2e87378051
Add the delete and reset instructions
2020-12-02 10:43:22 -06:00
ada073f251
Rename keys to groups
2020-12-02 10:43:22 -06:00
92c23bfdec
Spelling
2020-12-02 10:43:22 -06:00
Ilja