moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,025 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

1532 Commits

Author SHA1 Message Date
someone 4b940e441a mix pleroma.database set_text_search_config now runs concurrently and infinitely 2021-08-15 13:49:12 -04:00
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
 2021-08-13 17:56:20 +02:00
Haelwenn 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
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)
 2021-08-10 06:09:31 +00:00
Ilja c29fc1aafb Add YunoHost to installation guides 2021-08-07 12:49:28 +02:00
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
 2021-08-06 07:59:53 +02:00
Alex Gleason 3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion 2021-07-17 15:03:43 -05:00
Alex Gleason 54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance 2021-07-17 14:55:05 -05:00
Sean King 5d279a22b1 Merge develop branch upstream 2021-07-10 11:04:16 -06:00
Haelwenn (lanodan) Monnier 822196f393
docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repo 2021-06-11 08:48:35 +02:00
Haelwenn (lanodan) Monnier 17f980e9ab
docs: Remove Erlang Solutions repository 2021-06-11 08:48:35 +02:00
Haelwenn (lanodan) Monnier 6b1f7f2f52
docs: Use one file to describe dependencies 2021-06-11 08:48:35 +02:00
Alex Gleason 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
Alex Gleason 879c2db0bd
Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings 2021-06-07 11:18:14 -05:00
Sean King dc4814f0cd
Fix merge conflicts with upstream 2021-06-04 14:42:44 -06:00
Haelwenn 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
feld 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
Mark Felder 679d4c23e9 Update wording for relays in docs and config description 2021-06-02 11:30:09 -05:00
Mark Felder d6432a65da Move shout configuration from :instance, update docs and changelog 2021-06-01 11:49:46 -05:00
Haelwenn 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
Haelwenn (lanodan) Monnier 03232a8223
Changing references of freenode to libera.chat 2021-05-31 17:08:20 +02:00
Alex Gleason 32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config 2021-05-16 12:27:29 -05:00
Alex Gleason b540fff908
Docs: use `MIX_ENV=prod mix pleroma.instance gen` 2021-05-16 12:26:51 -05:00
Alex Gleason e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id 2021-04-29 12:19:10 -05:00
Alex Gleason 762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior 2021-04-29 11:14:32 -05:00
Mark Felder 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
rinpatch 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
Sean King fa2e62078c
Remove MastoFE configuration stuff 2021-04-15 23:51:04 -06:00
Sean King f3b403fa98
Remove MastoFE stuff from docs and default panel 2021-04-15 23:37:18 -06:00
Sean King d9fce0133e
Fix Mastodon interface link 2021-04-14 14:01:33 -06:00
Mark Felder d29f6d6b6e Add more details to the cheatsheat for FollowBot MRF 2021-03-30 11:10:44 -05:00
feld 2689463c7e Apply 1 suggestion(s) to 1 file(s) 2021-03-30 11:10:43 -05:00
Mark Felder 840dc4b44b Document :mrf_follow_bot 2021-03-30 11:10:34 -05:00
Alexander Strizhakov 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
Alex Gleason b6a69b5efd
Return token's primary key with POST /oauth/token 2021-03-24 12:50:05 -05:00
Alexander Strizhakov 03843a5386
migrating config to tmp folder 2021-03-23 14:29:02 +03:00
rinpatch 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
Ivan Tashkinov 882dd46843 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-03-02 08:26:30 +03:00
lain 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
Haelwenn (lanodan) Monnier 3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy 2021-02-27 21:26:17 +01:00
feld 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
PestToast 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
Haelwenn 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
zonk f38056d2a1
Update terminology in differences_in_mastoapi_responses.md 2021-02-24 18:16:10 +01:00
AkiraFukushima 6ff4ef12fd Fix URL of Whalebird in docs 2021-02-23 21:31:06 +09:00
Ivan Tashkinov 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
Ivan Tashkinov 77f3da0358 [#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management. 2021-02-23 13:52:28 +03:00
eugenijm c140cc7bf3 Update the documentation to use make it use /api/v1/pleroma instead of /api/pleroma 2021-02-22 04:33:35 +03:00
Ivan Tashkinov 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
Alexander Strizhakov 1e6c27181e
expires_in in scheduled status params 2021-02-18 14:59:22 +03:00
rinpatch 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
Ivan Tashkinov 349b8b0f4f [#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.). 2021-02-13 22:01:11 +03:00
rinpatch 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
hyperion 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
feld 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
feld 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
feld 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
Alexander Strizhakov fdf1dfed56
only_remote -> remote renaming 2021-02-01 14:11:12 +03:00
Alexander Strizhakov ba512cbea4
`/api/v1/accounts/:id/statuses` docs update 2021-02-01 14:11:12 +03:00
Alexander Strizhakov 77f0a0af7d
more tests and update for docs and changelog 2021-02-01 14:11:12 +03:00
Alexander Strizhakov e21af1cfe4
only_media & only_remote docs and changelog 2021-02-01 14:11:11 +03:00
Ivan Tashkinov 239057155f [#3286] Documentation on configuring Pleroma as OAuth 2.0 provider. 2021-01-29 16:36:25 +03:00
Alexander Strizhakov c369d2b930
support for with_relationships parameter 
in /api/v1/mutes and /api/v1/accounts/:id endpoints
 2021-01-29 08:41:21 +03:00
Alexander Strizhakov d4158e8bf0
added total 
to the instance adminAPI endpoint
 2021-01-27 07:45:06 +03:00
Alexander Strizhakov 6806c03e85
added total 
to the user statuses adminAPI endpoint
 2021-01-27 07:45:02 +03:00
Mark Felder 0b19534475 Merge branch 'develop' into docs/apache-config 2021-01-25 17:00:26 -06:00
Mark Felder 6e51d7264b Document pleroma.user activate mix task 2021-01-25 10:38:08 -06:00
Mark Felder 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
Mark Felder 003402df40 Add ability to invalidate cache entries for Apache 2021-01-21 14:20:13 -06:00
Alexander Strizhakov 6d48144a9d
use proper naming 
for MediaProxyWarmingPolicy in ConcurrentLimiter
 2021-01-21 09:50:18 +03:00
Mark Felder dece31a031
Update docs 2021-01-21 09:47:22 +03:00
Alexander Strizhakov b4ff63d020
configurable limits for ConcurrentLimiter 
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
 2021-01-21 09:47:21 +03:00
feld 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
rinpatch 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
Mark Felder 7516660753 Remove toggle_activation 2021-01-15 11:25:32 -06:00
Mark Felder 8b28dce82a Deprecate Pleroma.Uploaders.S3, :public_endpoint 2021-01-12 16:31:35 -06:00
Ilja 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
Alex Gleason 1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior 2021-01-06 15:22:35 -06:00
lain f0e6cff583 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases 2021-01-05 12:42:30 +01:00
Alex Gleason 0ec7e9b8e9
AdminAPI: return id for moderation log entries 2021-01-01 11:59:48 -06:00
Alex Gleason cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases 2020-12-30 17:10:02 -06:00
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'" 
This reverts merge request !2824
 2020-12-28 12:02:16 +00:00
Haelwenn (lanodan) Monnier d0c2479710
pleroma.database fill_old_hashtags: Add month_limit argument 2020-12-28 11:05:25 +01:00
Haelwenn (lanodan) Monnier 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
Alex Gleason 80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow 2020-12-17 09:05:36 -06:00
Alexander Strizhakov 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
lain 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
lain 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
Ivan Tashkinov c8e7ace812 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 
# Conflicts:
#	CHANGELOG.md
 2020-12-07 21:45:04 +03:00
lain 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
Ivan Tashkinov a010c5b16a Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 2020-12-06 13:59:35 +03:00
Egor Kislitsyn 49717f3dcd
Fix typo 2020-12-05 23:48:13 +04:00
lain 9feb678ec8 Docs, Changelog: Add info about regional indicators 2020-12-03 16:18:35 +01:00
Mark Felder e379ab8277 Add --force flag for delete and reset commands 
Bunch of reorganization and consolidation
 2020-12-02 16:24:32 -06:00
Mark Felder 6a97885ea3 Sync docs with mix commands 2020-12-02 10:43:22 -06:00
Mark Felder cc2fc2e423 The debug output is no longer there by default 2020-12-02 10:43:22 -06:00
Mark Felder 570a923a3b Update ConfigDB docs for new mix commands 2020-12-02 10:43:22 -06:00
Mark Felder 2e87378051 Add the delete and reset instructions 2020-12-02 10:43:22 -06:00
Mark Felder ada073f251 Rename keys to groups 2020-12-02 10:43:22 -06:00
Mark Felder 92c23bfdec Spelling 2020-12-02 10:43:22 -06:00
Mark Felder e8a4062d9d Document how to delete individual configuration groups and completely reset the config without SQL 2020-12-02 10:43:22 -06:00
lain ab2610b703 Docs: Add info about RGI emoji 2020-12-02 16:49:38 +01:00
Egor Kislitsyn c9afb350e7
Document follow relationship updates and cleanup 2020-12-02 19:16:36 +04:00
Ivan Tashkinov f1b07a2b2b OAuth form user remembering feature. Local MastoFE login / logout fixes. 2020-11-28 21:51:06 +03:00
Ivan Tashkinov 489b12cde4 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 2020-11-21 19:47:46 +03:00
Alex Gleason 30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow 2020-11-21 10:23:53 -06:00
Ivan Tashkinov b27d8f7437 Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix 
# Conflicts:
#	CHANGELOG.md
 2020-11-19 19:35:44 +03:00
Ivan Tashkinov e164c37139 [#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots. 2020-11-19 19:30:02 +03:00
lain f6c22f4d08 Cheatsheet: Add docs about reset token expiration 2020-11-19 12:28:39 +01:00
lain aae669d05e Merge branch 'fix/webpush-and-emojireact' into 'develop' 
Push notifications: add pleroma:emoji_reaction, improve tests

Closes #2185

See merge request pleroma/pleroma!3141
 2020-11-18 18:33:48 +00:00
lain 6b32e1de23 Merge branch 'frontend-admin-api' into 'develop' 
Add an API to manage frontends

Closes #2238

See merge request pleroma/pleroma!3108
 2020-11-18 17:51:57 +00:00
Mark Felder 80e21903d4 Spelling 2020-11-17 20:20:00 +00:00
Mark Felder 1433d3c59c Document the API extensions for push subscriptions 2020-11-17 20:20:00 +00:00
lain e6d4d62f85 Docs: Add info about frontend install error response 2020-11-17 16:44:20 +01:00
feld d33b9e7b33 Merge branch 'remove/fedsockets' into 'develop' 
Remove FedSockets

See merge request pleroma/pleroma!3155
 2020-11-17 14:58:33 +00:00
Egor Kislitsyn f69fe36ebf
Merge branch 'develop' into frontend-admin-api 2020-11-17 18:34:04 +04:00
rinpatch 2c55f7d7cb Remove FedSockets 
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
 ets table until the value changes, or double JSON encoding).

Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
 are just too overkill for what they were trying to accomplish, which is
 reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
 logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.

From discussions I had with other Pleroma developers it seems like they
 would approve the descision to remove them as well,
therefore I am submitting this patch.
 2020-11-17 17:28:30 +03:00
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope 2020-11-17 15:01:38 +01:00
rinpatch f711a41933 Debian installation guide: fix libmagic header package name 
It's libmagic-dev in both Ubuntu and Debian.

Reported in private by NaiJi.
 2020-11-17 16:11:37 +03:00
Alex Gleason 9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow 2020-11-14 19:48:47 -06:00
lain 0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' 
fixes 2034 Make notifs view work for reports

Closes #2034

See merge request pleroma/pleroma!2912
 2020-11-13 13:35:47 +00:00
Ilja 70e4b86250 Make notifs view work for reports 
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
 2020-11-13 13:35:46 +00:00
lain 0597571fca Merge branch 'docs/otp-tuning' into 'develop' 
First draft of tips for optimizing BEAM

See merge request pleroma/pleroma!3123
 2020-11-13 13:31:46 +00:00
Egor Kislitsyn 81145ecdf5
Fix markdown 2020-11-11 20:42:05 +04:00
Egor Kislitsyn d26a449396
Change endpoint path 2020-11-11 20:39:57 +04:00
Egor Kislitsyn 08cbd655d1
Merge branch 'develop' into frontend-admin-api 2020-11-11 19:53:40 +04:00
Alexander Strizhakov 8da9f919f8
little changes for MRF config descriptions 
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
 2020-11-11 18:49:15 +03:00
Egor Kislitsyn 0118ccb53c
Add `local` visibility 2020-11-11 18:54:01 +04:00
feld 7681b4c5cd Apply 1 suggestion(s) to 1 file(s) 2020-11-10 16:44:23 +00:00
feld 776067a9a3 Apply 1 suggestion(s) to 1 file(s) 2020-11-10 16:44:17 +00:00
feld 952a8c213e Apply 1 suggestion(s) to 1 file(s) 2020-11-10 16:44:08 +00:00
feld 2933658446 Apply 1 suggestion(s) to 1 file(s) 2020-11-10 16:44:00 +00:00
lain abf2ec2bbe Update optimizing_beam.md 2020-11-08 09:45:35 +00:00
rinpatch cc45c69fff Remove release_env 
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
 docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
 though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
 2020-11-08 11:56:09 +03:00
Mark Felder a9c1f83fd8 Markdown, you're drunk 2020-11-06 13:16:22 -06:00
Mark Felder 4999549191 Make it clearer the settings go into the vm.args file 2020-11-06 13:15:21 -06:00
Mark Felder 620f1d7237 More grammar fixes 2020-11-06 13:12:13 -06:00
Mark Felder da1862e1d3 Less confusing I hope 2020-11-06 13:04:13 -06:00
Mark Felder 9e90e49ad2 Grammar 2020-11-06 13:02:07 -06:00
Mark Felder 60fe4a8393 First draft of tips for optimizing BEAM 2020-11-06 13:00:31 -06:00
lain 9b2ed14277 Docs: Add info about expiring mutes. 2020-11-05 13:23:58 +01:00
lain 78cea44553 Merge branch 'ejabberd-pleroma-auth' into 'develop' 
Add ejabberd auth document

See merge request pleroma/pleroma!3074
 2020-11-04 15:42:48 +00:00
lain 2aeb229de3 Cheatsheet: Add info about :blockers_visible 2020-11-04 16:23:24 +01:00
Ivan Tashkinov 73e66fd31f Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 2020-11-04 17:48:10 +03:00
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain 2020-11-04 15:05:01 +01:00
Egor Kislitsyn ca95cbe0b4
Add `with_muted` param to ChatController.index/2 2020-11-04 16:40:12 +04:00
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope 2020-11-04 11:47:41 +01:00
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api' 
# Conflicts:
#   lib/pleroma/web/router.ex
 2020-11-02 10:43:45 +00:00
feld 38b481d112 Merge branch 'feature/account-export' into 'develop' 
Add account export

Closes #847

See merge request pleroma/pleroma!2918
 2020-10-31 17:03:40 +00:00
Ivan Tashkinov 04f6b48ac1 Auth subsystem refactoring and tweaks. 
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
 2020-10-31 13:38:35 +03:00
eugenijm 8e41baff40 Add idempotency_key to the chat_message entity. 2020-10-31 05:50:59 +03:00
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export 2020-10-30 19:34:02 +04:00
minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope' 
# Conflicts:
#   CHANGELOG.md
 2020-10-30 11:18:55 +00:00
feld a326a56371 Merge branch 'fix/frontend-cli-docs' into 'develop' 
Fix formatting and typos in "Managing frontends" guide

See merge request pleroma/pleroma!3098
 2020-10-29 21:06:42 +00:00
feld 1cce1bd729 Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' 
[#2137] admin/users filters

See merge request pleroma/pleroma!3016
 2020-10-29 21:06:15 +00:00
Egor Kislitsyn 75d131ba18 Add documentation and update CHANGELOG 2020-10-29 16:37:51 +04:00
Egor Kislitsyn 8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope 2020-10-29 14:51:23 +04:00
Egor Kislitsyn 4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export 2020-10-28 15:33:36 +04:00
feld 03a318af9a Merge branch 'develop' into 'feature/autofollowing' 
# Conflicts:
#   CHANGELOG.md
 2020-10-27 22:13:50 +00:00
minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope' 
# Conflicts:
#   CHANGELOG.md
 2020-10-27 18:59:19 +00:00
Mark Felder 291189357b Merge branch 'develop' into feature/account-export 2020-10-27 12:54:33 -05:00
Mark Felder 9e54ef086b Merge branch 'develop' into feature/account-export 2020-10-27 12:51:31 -05:00
feld 5aff479951 Merge branch '1668-prometheus-access-restrictions' into 'develop' 
[#1668] App metrics endpoint (Prometheus) access restrictions

Closes #1668

See merge request pleroma/pleroma!3093
 2020-10-27 17:47:56 +00:00
feld e062329a17 Merge branch 'develop' into 'feature/autofollowing' 
# Conflicts:
#   CHANGELOG.md
 2020-10-27 17:42:24 +00:00
lain 2f7401806b Merge branch 'docs/clients-apc2s' into 'develop' 
clients.md: Add AndStatus, note supported protocols

See merge request pleroma/pleroma!3104
 2020-10-26 15:59:10 +00:00
rinpatch e6dab6513d Merge branch 'patch-1' into 'develop' 
Fix link reference

See merge request pleroma/pleroma!3103
 2020-10-26 11:33:16 +00:00
Haelwenn (lanodan) Monnier 1de4ff8b4d
clients.md: Add AndStatus, note supported protocols 2020-10-26 03:23:47 +01:00
Haelwenn 073ad7e6d9 Merge branch 'docs/ap_c2s' into 'develop' 
AP C2S: Document our additional endpoints

See merge request pleroma/pleroma!3056
 2020-10-26 02:09:20 +00:00
Kana ac692ff3e9 Fix link reference 2020-10-25 08:28:17 +00:00
Maksim Pechnikov 51189ad365 update docs 2020-10-22 11:53:28 +03:00
Egor Kislitsyn b18b93bbed
Fix formatting and typos in "Managing frontends" guide 2020-10-21 21:42:21 +04:00
Egor Kislitsyn e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export 2020-10-20 17:27:29 +04:00
Egor Kislitsyn ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup` 2020-10-20 17:16:58 +04:00
Egor Kislitsyn 18a91d85e5
Merge branch 'develop' into feature/local-only-scope 2020-10-19 15:31:56 +04:00
Ivan Tashkinov 524fb0e4c2 [#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint. 
Added tests and documentation.
 2020-10-18 21:22:21 +03:00
Mark Felder 1b8fd7e65a Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts 2020-10-16 17:36:02 +00:00
Maksim Pechnikov 2030ffd490 fix test 2020-10-15 22:31:52 +03:00
Maksim Pechnikov cf53e300f8 added generate the release env to `pleroma.instance gen` 2020-10-15 22:31:00 +03:00
Maksim Pechnikov 595da6080d fixed install docs 2020-10-15 22:30:03 +03:00
Maksim Pechnikov 2f6bbd53b5 fix docs 2020-10-15 22:29:37 +03:00
Maksim Pechnikov 20e68b30f0 added generated `pleroma.env` 2020-10-15 22:28:26 +03:00
Egor Kislitsyn 4f79bbbc31
Add local-only statuses 2020-10-15 18:37:44 +04:00
Mark Felder 1fb9452131 Merge branch 'develop' into feature/account-export 2020-10-14 15:27:15 -05:00
swentel 42112b842c Change handle and url of contact person for Indigenous client 2020-10-14 21:32:18 +02:00
Alex Gleason 83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases 2020-10-14 12:33:24 -05:00
Alex Gleason dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235 2020-10-13 22:01:27 -05:00
Alex Gleason 755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain 2020-10-13 19:26:04 -05:00
Alex Gleason 7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases 2020-10-13 19:25:18 -05:00
Ali Riza Keles 943f65c739
Include python script and description 2020-10-13 19:58:38 +01:00
Mark Felder b738f70953 Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
Alexander Strizhakov 4c4ea9a348
changes after rebase 2020-10-13 17:10:34 +03:00
Alexander Strizhakov c497558d43
AuthenticationPlug module name 2020-10-13 16:43:58 +03:00
Alexander Strizhakov e2332d92ce
LegacyAuthenticationPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov a6d8cef33e
OAuthScopesPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov 3be8ab5103
RemoteIp module name 2020-10-13 16:43:50 +03:00
Ali Riza Keles 06934b820e
Add ejabberd auth document 2020-10-12 23:20:10 +01:00
feld 42b4b95467 Merge branch 'docs/improve-backup-restore' into 'develop' 
Further improvements to backup/restore docs

See merge request pleroma/pleroma!3072
 2020-10-12 17:46:25 +00:00
Mark Felder 6ec1b1615b Further improvements 2020-10-12 12:23:20 -05:00
Mark Felder 6c61ef14c3 Support enabling upload filters during instance gen 2020-10-12 11:19:48 -05:00