Mark Felder
69848d5c97
Rename notification "privacy_option" setting
4 years ago
Mark Felder
fd5e797379
Simplify notification filtering settings further
4 years ago
Mark Felder
b950fb01db
Merge branch 'develop' into refactor/notification_settings
4 years ago
Mark Felder
433c01b370
Merge branch 'develop' into refactor/notification_settings
4 years ago
Alex Gleason
28d4e60f66
MastoAPI differences: Document not implemented features
4 years ago
lain
637bae42b4
Docs: Document added parent_visible field.
4 years ago
Roman Chvanikov
1471b70ef1
Merge develop
4 years ago
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
4 years ago
lain
59e2a1018a
Merge branch 'fix_1586_provide_index_md' into 'develop'
...
Fix 1586 provide index md
See merge request pleroma/pleroma!2669
4 years ago
lain
31489bc864
Merge branch 'docs_use_include_for_install_further_reading' into 'develop'
...
Add include for the "Further reading" section
See merge request pleroma/pleroma!2667
4 years ago
lain
8b5bdd164e
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
...
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
4 years ago
Ilja
499324f7be
Removed a space that was too much
4 years ago
Ilja
1e089cdf29
I forgot to git add some files, oops (should be squashed with MR)
4 years ago
Ilja
a3b10a4f64
Fix 1586 Docs: provide a index.md
...
* I renamed the introduction.md to index.md
* I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it)
* While I was at it, I also fixed some broken links
4 years ago
Ilja
9f7ee5dfa2
Add include for the "Further reading" section
...
* I added an include and use this include for the installation guides that already had this section
* I added the "Further reading" section as well as te "Questions" section to the English guides that didn't have it yet
* I added a first point "How Federation Works/Why is my Federated Timeline empty?" to link to lains blogpost about this because we still get this question a lot in the #pleroma support channel
* I reordered the list a bit
4 years ago
lain
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
4 years ago
Alexander Strizhakov
c5863438ba
proper error codes for error in adminFE
4 years ago
Haelwenn (lanodan) Monnier
15ba539258
cheatsheet.md: no_attachment_links → attachment_links
4 years ago
Alexander Strizhakov
02ca8a363f
default page size for files
4 years ago
Alexander Strizhakov
3e3f9253e6
adding overall count for packs and files
4 years ago
Alexander Strizhakov
4975ed86bc
emoji pagination for pack show action
4 years ago
Maksim
abfb1c756b
Apply suggestion to docs/API/admin_api.md
4 years ago
Maksim
90613348ed
Apply suggestion to docs/API/admin_api.md
4 years ago
Alexander Strizhakov
b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
4 years ago
Maksim Pechnikov
579763126f
Merge branch 'develop' into issue/1855
4 years ago
Maksim Pechnikov
efdfc85c2d
update docs
4 years ago
Maksim Pechnikov
2e8a236cef
fix invalidates media url's
4 years ago
href
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
lain
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
4 years ago
Mark Felder
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
4 years ago
Haelwenn (lanodan) Monnier
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
4 years ago
Mark Felder
7c47f791a8
Add command to reload emoji packs from cli for OTP users
...
Not useful for source releases as we don't have a way to automate connecting to the running instance.
4 years ago
Roman Chvanikov
604a83ae3e
merge develop
4 years ago
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
lain
89b85f6529
ChatController: Remove nonsensical pagination.
4 years ago
lain
1a2acce7c5
Docs: Document new mandatory parameter.
4 years ago
lain
680fa5fa36
Docs: Update docs on mark as read.
4 years ago
lain
c5e3f2454c
Docs: Unify parameters in examples.
4 years ago
lain
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
6e103a18af
Docs: Document WebPush changes.
4 years ago
lain
286bd8eb83
Docs: Add `mark_message_as_read` to docs
4 years ago
Egor Kislitsyn
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
4 years ago
Alibek Omarov
030240ee8f
docs: clients.md: Add Husky
4 years ago
lain
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
4 years ago
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
lain
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
32ba2b7f9f
Merge branch 'media-docs' into 'develop'
...
Docs: Attachement limitations in MastoAPI differences
See merge request pleroma/pleroma!2607
4 years ago
feld
81db758e8e
Merge branch 'mix/database-vacuum-options' into 'develop'
...
Database vacuum mix task
See merge request pleroma/pleroma!2599
4 years ago
Mark Felder
1b586ff3ae
Document new database vacuum tasks
4 years ago
lain
32431ad1ee
Docs: Also add the streaming docs to the Chat api doc.
4 years ago
lain
b08baf905b
Docs: Document streaming differences
4 years ago
lain
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alex Gleason
394258d548
Docs: Attachement limitations in MastoAPI differences
4 years ago
lain
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
4 years ago
Egor Kislitsyn
800e624058
Update installation guides
4 years ago
Mark Felder
9eea800026
Refactor notification settings
4 years ago
Alexander Strizhakov
3249141588
validate actor type
4 years ago
lain
af3568a6d9
Docs: sql -> SQL
4 years ago
lain
f7cb3f4cfc
Apply suggestion to docs/installation/otp_en.md
4 years ago
lain
6a85fe1f9d
Docs: Document reasonable Postgres settings.
4 years ago
lain
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Roman Chvanikov
8eb1dfadca
Update CHANGELOG and docs
4 years ago
lain
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
4 years ago
lain
f166316f50
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
...
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
4 years ago
lain
283fb1e05b
Merge branch 'issue/749' into 'develop'
...
[#749 ] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
4 years ago
lain
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
4ae2f75c3e
Apply suggestion to docs/administration/CLI_tasks/user.md
4 years ago
Maksim Pechnikov
9bc5e18ade
rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
4 years ago
lain
265746b21f
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
...
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
4 years ago
Egor Kislitsyn
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
4 years ago
Haelwenn
94ba5a7802
Merge branch 'exposed-background-image' into 'develop'
...
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
4 years ago
lain
6dd1575c64
Merge branch 'issue/1509' into 'develop'
...
[#1509 ] purge media from cache after delete
See merge request pleroma/pleroma!2539
4 years ago
lain
5b8105928b
Docs: Add background_image in instance
4 years ago
Egor Kislitsyn
e4c720f14c
Fix typo
4 years ago
Haelwenn
58ccd2bbfd
Merge branch 'openapi/pleroma-api/mascot' into 'develop'
...
Add OpenAPI spec for MascotController
See merge request pleroma/pleroma!2553
4 years ago
Maksim Pechnikov
ed442a225a
removed Quantum from docs
4 years ago
Maksim Pechnikov
5f0a3ac74d
added tests
4 years ago
Egor Kislitsyn
d4a7577cde
Fix API documentation
4 years ago
lain
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
15c7e3b4bf
Merge branch 'docs/storing-remote-media' into 'develop'
...
Document how to store remote media permanently
See merge request pleroma/pleroma!1871
4 years ago
Roman Chvanikov
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Maksim Pechnikov
c33a4315fb
updated docs
4 years ago
lain
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
1d18721a3c
Chats: Add updated_at to Schema and docs.
4 years ago
Stephanie Wilde-Hobbs
80308c5c26
Add config migration disclaimer to config whitelist documentation
4 years ago
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups
4 years ago
lain
41db52729e
Apply suggestion to docs/configuration/storing_remote_media.md
4 years ago
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
4 years ago
lain
0f0acc740d
Chat: Allow posting without content if an attachment is present.
4 years ago
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist
4 years ago
lain
a61120f497
Documention: Add chat message deletion docs
4 years ago
lain
8cc8d960af
Documentation: Add GET /chats/:id
4 years ago
lain
17be3ff669
Documentation: Add last_message to chat docs.
4 years ago
lain
e297d8c649
Documentation: Add attachment docs
4 years ago
Roman Chvanikov
4c19702390
Add docs
4 years ago
lain
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
b078e0567d
Merge branch 'develop' into issue/1276-2
4 years ago
lain
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
lain
1748e26948
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Mark Felder
d7537a37c7
Add :chat to cheatsheet
4 years ago
Maksim Pechnikov
bd261309cc
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
4 years ago
lain
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
4 years ago
lain
42a2acac46
Merge branch 'feature/1720-status-view' into 'develop'
...
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
4 years ago
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
4 years ago
Egor Kislitsyn
cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate
4 years ago
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
lain
7ff2a7dae2
Docs: Add Chat mark_as_read docs
4 years ago
lain
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
4 years ago
lain
095635453a
Replace deprecated Roma by Fedi.
4 years ago
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
4 years ago
lain
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
4 years ago
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
Alexander Strizhakov
631e8c1feb
docs update
4 years ago
Alexander Strizhakov
1fd40532ae
docs fix
4 years ago
Alexander Strizhakov
1c1b7e22af
list of options for pack metadata
4 years ago
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update
4 years ago
Alexander Strizhakov
95759310ab
docs update
4 years ago
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
4 years ago
lain
528ea779a6
Apply suggestion to docs/API/chats.md
4 years ago
Egor Kislitsyn
8148d76ec5
Document `captcha_answer_data` parameter
4 years ago
lain
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
lain
30ea6bb167
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Mark Felder
4b3298133b
Document DELETE /api/v1/notifications/destroy_multiple
4 years ago
lain
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration
4 years ago
Maksim Pechnikov
270c3fe446
fix markdown format
4 years ago
lain
b550ef5611
Docs: Align chat api changes with docs.
4 years ago
lain
4cadaf7e96
Docs: Add `/api/v1/instance` information
4 years ago
lain
e62f8542a1
Docs: Add chat motivation and api description.
4 years ago
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
lain
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alex Gleason
1bd9749a8f
Let blob: pass CSP
4 years ago
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
4 years ago
lain
8480f84615
Update differences_in_mastoapi_responses.md
4 years ago
Alexander
be34672d67
formatting
4 years ago
Alexander
6e625a427c
reply filtering
4 years ago
lain
a51cdafc01
Docs: Add documentation about chatmessages
4 years ago
Egor Kislitsyn
1b06a27746
Update Flake ID description
4 years ago
Ivan Tashkinov
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Ivan Tashkinov
2958a7d246
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
4 years ago
lain
c466e739b6
Merge branch 'docs/debian-packages' into 'develop'
...
debian_based_*.md: Use erlang-nox metapackage
See merge request pleroma/pleroma!2268
4 years ago
lain
568f48435e
Apply suggestion to docs/installation/debian_based_en.md
4 years ago
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
4 years ago
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
lain
617a9f6208
Merge branch 'mrf-docs-update' into 'develop'
...
Expand MRF SimplePolicy docs
See merge request pleroma/pleroma!2370
4 years ago
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
5 years ago
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
5 years ago
Ilja
aa0a4a1e78
small fix in the rewrite_policy example
5 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
Alex Gleason
ed894802d5
Expand MRF SimplePolicy docs
5 years ago
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
5 years ago
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
5 years ago
Alexander Strizhakov
c8bfbf511e
Apply suggestion to docs/API/admin_api.md
5 years ago
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
5 years ago
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task
5 years ago
Egor Kislitsyn
8a0ffaa9ea
Fix formatting in documentation
5 years ago
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint
5 years ago
Alexander Strizhakov
7af0959a07
updating docs
5 years ago
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
lain
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
5 years ago
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
5 years ago
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun
5 years ago
rinpatch
69341cbcba
Merge branch 'feature/1530-removing-with_move' into 'develop'
...
Feature/1530 removing with move
Closes #1530
See merge request pleroma/pleroma!2306
5 years ago
eugenijm
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
eugenijm
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
5 years ago
Alexander Strizhakov
f3791add99
removing with_move parameter
5 years ago
Mark Felder
8dd01b24d2
Improve documentation of mrf_object_age
5 years ago
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
5 years ago
lain
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
5 years ago
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
5 years ago
Ivan Tashkinov
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
5 years ago
rinpatch
4db88242e5
Merge branch 'docs/direct_conversation_id' into 'develop'
...
pleroma_api.md: direct_conversation_id vs. conversation_id
See merge request pleroma/pleroma!2263
5 years ago
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
5 years ago
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Ivan Tashkinov
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
5 years ago
rinpatch
00d1752031
Merge branch 'docs/new_user' into 'develop'
...
CLI_tasks/user.md: Fix `pleroma.user new` documentation
Closes #1621
See merge request pleroma/pleroma!2286
5 years ago
Haelwenn (lanodan) Monnier
6316726a5f
CLI_tasks: Use manpage formatting conventions
...
- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated
[ci skip]
5 years ago
Haelwenn (lanodan) Monnier
a06104b9d5
CLI_tasks/user.md: Fix `pleroma.user new` documentation
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621
[ci skip]
5 years ago
Ivan Tashkinov
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Haelwenn (lanodan) Monnier
d9134d4430
installation/otp_en.md: Fix pleroma.nginx target [deb]
...
Needs to be backported to stable.
Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29
5 years ago
lain
841e4e4d83
Merge branch 'patch-1' into 'develop'
...
Better advice for vacuuming after restoring.
See merge request pleroma/pleroma!2233
5 years ago
Maksim Pechnikov
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
feld
9b740cfb23
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
...
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
5 years ago
Alexander Strizhakov
b34bc669b9
adding descriptions
5 years ago
Alexander Strizhakov
8d9dee1ba9
retry_timeout description change
5 years ago
Alexander Strizhakov
8854770fc4
retry and retry_timeout settings default change
5 years ago
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout
5 years ago
Alexander Strizhakov
df3c59d928
Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier
9b6c7843d6
debian_based_*.md: Use erlang-nox metapackage
5 years ago
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Mark Felder
f987d83885
Clarify in docs how to control connections_pool for Gun.
...
It could easily be confused with the Hackney settings.
5 years ago
Ivan Tashkinov
b4367125e9
[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
5 years ago
lain
4c02e04935
Merge branch 'prepared-statements-settings' into 'develop'
...
Prepared statements settings
See merge request pleroma/pleroma!2238
5 years ago
eugenijm
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
ilja
036e8a40a2
fix for :fetch_initial_posts
...
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
5 years ago
Haelwenn (lanodan) Monnier
deb5f5c40e
pleroma_api.md: direct_conversation_id vs. conversation_id
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
5 years ago
Ilja
53ef8c11b9
Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)
...
I also made a more explicit distinction between OTP and from source installs in the general explanation
5 years ago
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
rinpatch
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
rinpatch
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
5 years ago
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
eugenijm
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
Alexander Strizhakov
6b012ddd69
some docs
5 years ago
lain
e4804137b3
Document database default changes
5 years ago
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
eugenijm
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Ilja
c0146f4859
DOCS Theming your instance
...
I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance
5 years ago
lain
c05cbc47f9
Better advice for vacuuming after restoring.
5 years ago
Ivan Tashkinov
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
5 years ago
Igeljäger
1ed485ec1d
added why doing a vacuum after restoring a backup is so important
5 years ago
Egor Kislitsyn
011ede4536
Update documentation
5 years ago
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun
5 years ago
Haelwenn
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
5 years ago
lain
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
5 years ago
lain
d536a00d42
Merge branch 'docs_updating' into 'develop'
...
DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108
5 years ago
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
lain
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
lain
3af6d3f8e2
Emoji Reactions: Add documentation
5 years ago
feld
53a7680c16
Merge branch 'develop' into 'fix/mrf-sample-doc'
...
# Conflicts:
# docs/configuration/mrf.md
5 years ago
feld
3416948cdf
Merge branch 'fix/mrf-docs' into 'develop'
...
Fix MRF documentation
See merge request pleroma/pleroma!2187
5 years ago
Mark Felder
cf94349287
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
5 years ago
Alexander Strizhakov
514c899275
adding gun adapter
5 years ago
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
Mark Felder
589bffa57d
Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc
5 years ago
Mark Felder
31749559e1
Fix MRF docs further. I don't think anyone has actually tested with the old docs.
5 years ago
feld
6caf6a86c5
Apply suggestion to docs/configuration/mrf.md
5 years ago