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
5 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
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
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
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
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
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
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
Mark Felder
88a76d0142
Update suggested path for location of your custom MRF
5 years ago
Mark Felder
2c95b0fab9
Make the sample code actually compile
5 years ago
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
5 years ago
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
lain
2f1c61255f
Merge branch 'doc/unlisted-search' into 'develop'
...
differences_in_mastoapi_responses.md: Add note about unlisted results
Closes #1164
See merge request pleroma/pleroma!2195
5 years ago
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago