lechindianer/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
9733 commits 9 branches 75 tags 308 MiB
Commit graph

868 commits

Author SHA1 Message Date
lain
c466e739b6 Merge branch 'docs/debian-packages' into 'develop' 
debian_based_*.md: Use erlang-nox metapackage

See merge request pleroma/pleroma!2268
 2020-04-22 12:10:27 +00:00
lain
568f48435e Apply suggestion to docs/installation/debian_based_en.md 2020-04-22 12:10:20 +00:00
Ivan Tashkinov
f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring. 2020-04-21 16:29:19 +03:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy 2020-04-20 10:11:06 -05:00
lain
617a9f6208 Merge branch 'mrf-docs-update' into 'develop' 
Expand MRF SimplePolicy docs

See merge request pleroma/pleroma!2370
 2020-04-20 12:57:45 +00:00
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
 2020-04-17 09:19:35 +00:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api 2020-04-16 16:03:26 +03:00
Maksim Pechnikov
4b3b1fec4e added an endpoint for getting unread notification count 2020-04-15 21:19:43 +03:00
Ilja
aa0a4a1e78 small fix in the rewrite_policy example 2020-04-15 19:03:27 +02:00
lain
4576520461 Revert "Merge branch 'issue/1276' into 'develop'" 
This reverts merge request !1877
 2020-04-14 16:32:22 +00:00
Maksim Pechnikov
a16b3dbcbf Merge branch 'develop' into issue/1276 2020-04-13 21:19:27 +03:00
Alex Gleason
ed894802d5
Expand MRF SimplePolicy docs 2020-04-12 18:46:47 -05:00
lain
b87b798ca1 Merge branch 'fix/1658-invite-send' into 'develop' 
Error improvement for email_invite endpoint

See merge request pleroma/pleroma!2344
 2020-04-09 10:42:43 +00:00
Alexander Strizhakov
c8bfbf511e Apply suggestion to docs/API/admin_api.md 2020-04-09 10:17:24 +00:00
Maksim Pechnikov
2b7d7bbd2d Merge branch 'develop' into issue/1276 2020-04-07 14:09:43 +03:00
lain
1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop' 
Add emoji reactions to features in nodeinfo

See merge request pleroma/pleroma!2313
 2020-04-06 12:51:35 +00:00
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task 2020-04-06 11:13:59 +03:00
Egor Kislitsyn
8a0ffaa9ea
Fix formatting in documentation 2020-04-02 23:10:13 +04:00
Maksim Pechnikov
dbcfac11b4 Merge branch 'develop' into issue/1276 2020-04-02 14:47:17 +03:00
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint 2020-04-01 20:26:33 +03:00
Alexander Strizhakov
7af0959a07
updating docs 2020-03-31 18:30:19 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
Maksim Pechnikov
dfd2c74184 Merge branch 'develop' into issue/1276 2020-03-29 06:57:34 +03:00
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
 2020-03-24 17:34:13 +00:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task 2020-03-23 10:44:47 +03:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun 2020-03-20 20:47:54 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications 2020-03-20 13:18:12 +03:00
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun 2020-03-18 14:08:21 +03:00
rinpatch
69341cbcba Merge branch 'feature/1530-removing-with_move' into 'develop' 
Feature/1530 removing with move

Closes #1530

See merge request pleroma/pleroma!2306
 2020-03-18 10:12:50 +00:00
eugenijm
13cce9c0de Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials. 2020-03-16 20:42:37 +03:00
eugenijm
d198e7fa2a Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password 2020-03-16 20:32:07 +03:00
Alexander Strizhakov
f3791add99
removing with_move parameter 2020-03-16 20:07:45 +03:00
Mark Felder
8dd01b24d2 Improve documentation of mrf_object_age 2020-03-16 11:44:53 -05:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
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
 2020-03-15 19:15:20 +00:00
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
 2020-03-15 15:59:17 +03:00
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
 2020-03-14 15:37:02 +03:00
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
 2020-03-13 18:58:22 +00:00
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun 2020-03-12 18:31:10 +03:00
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
 2020-03-12 12:07:07 +03:00
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
 2020-03-11 20:26:50 +00:00
Haelwenn (lanodan) Monnier
6316726a5f
CLI_tasks: Use manpage formatting conventions 
- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated

[ci skip]
 2020-03-11 08:48:50 +01:00
Haelwenn (lanodan) Monnier
a06104b9d5
CLI_tasks/user.md: Fix pleroma.user new documentation 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621

[ci skip]
 2020-03-11 08:36:25 +01:00
Ivan Tashkinov
972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-11 09:15:55 +03:00
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
 2020-03-10 11:49:23 +01:00
lain
841e4e4d83 Merge branch 'patch-1' into 'develop' 
Better advice for vacuuming after restoring.

See merge request pleroma/pleroma!2233
 2020-03-09 13:36:21 +00:00
Maksim Pechnikov
edb659dc57 Merge branch 'develop' into issue/1276 2020-03-08 14:10:59 +03:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun 2020-03-07 12:41:37 +03:00
Ivan Tashkinov
027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-06 11:48:30 +03:00
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
 2020-03-04 18:22:37 +00:00
Alexander Strizhakov
b34bc669b9
adding descriptions 2020-03-04 20:09:18 +03:00
Alexander Strizhakov
8d9dee1ba9
retry_timeout description change 2020-03-04 08:56:36 +03:00
Alexander Strizhakov
8854770fc4
retry and retry_timeout settings default change 2020-03-03 18:01:35 +03:00
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout 2020-03-03 13:05:28 +03:00
Alexander Strizhakov
df3c59d928 Apply suggestion to docs/configuration/cheatsheet.md 2020-03-03 09:45:18 +00:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun 2020-03-03 10:08:07 +03:00
Haelwenn (lanodan) Monnier
9b6c7843d6
debian_based_*.md: Use erlang-nox metapackage 2020-03-03 05:00:25 +01:00
Mark Felder
f987d83885 Clarify in docs how to control connections_pool for Gun. 
It could easily be confused with the Hackney settings.
 2020-03-02 13:00:05 -06:00
Ivan Tashkinov
b4367125e9 [#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest. 2020-03-02 21:43:18 +03:00
lain
4c02e04935 Merge branch 'prepared-statements-settings' into 'develop' 
Prepared statements settings

See merge request pleroma/pleroma!2238
 2020-03-02 17:00:04 +00:00
eugenijm
7af431c150 Exclude reblogs from GET /api/pleroma/admin/statuses by default 2020-03-02 16:47:31 +03:00
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
 2020-03-02 10:29:24 +01:00
Haelwenn (lanodan) Monnier
deb5f5c40e
pleroma_api.md: direct_conversation_id vs. conversation_id 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
 2020-03-02 04:01:37 +01:00
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
 2020-03-01 19:16:54 +00:00
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
rinpatch
ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user 2020-03-01 01:13:08 +03:00
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
 2020-02-29 21:52:33 +00:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
Ivan Tashkinov
6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests. 2020-02-27 18:46:05 +03:00
eugenijm
4ab07cf0d5 Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses 2020-02-26 22:35:57 +03:00
Alexander Strizhakov
6b012ddd69
some docs 2020-02-25 19:01:29 +03:00
lain
e4804137b3 Document database default changes 2020-02-25 11:53:51 +01:00
Maksim Pechnikov
10f452ad1f Merge branch 'develop' into issue/1276 2020-02-25 07:22:56 +03:00
eugenijm
7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
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
 2020-02-24 17:48:18 +00:00
lain
c05cbc47f9 Better advice for vacuuming after restoring. 2020-02-22 13:14:30 +00:00
Ivan Tashkinov
8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	CHANGELOG.md
#	config/config.exs
 2020-02-22 09:31:43 +03:00
Igeljäger
1ed485ec1d added why doing a vacuum after restoring a backup is so important 2020-02-21 15:30:52 +00:00
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun 2020-02-21 10:02:37 +03:00
Haelwenn
c5570e0493 Merge branch 'single_emoji_reaction' into 'develop' 
Single emoji reaction

Closes #1578

See merge request pleroma/pleroma!2226
 2020-02-20 23:50:40 +00:00
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
 2020-02-20 12:13:21 +00:00
lain
d536a00d42 Merge branch 'docs_updating' into 'develop' 
DOCS Add OTP to updating.md

See merge request pleroma/pleroma!2108
 2020-02-20 12:03:21 +00:00
Ivan Tashkinov
0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	config/config.exs
 2020-02-20 15:00:48 +03:00
lain
e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop' 
New users digest email

Closes #1514

See merge request pleroma/pleroma!2128
 2020-02-20 11:58:37 +00:00
lain
3af6d3f8e2 Emoji Reactions: Add documentation 2020-02-19 17:17:05 +01:00
feld
53a7680c16 Merge branch 'develop' into 'fix/mrf-sample-doc' 
# Conflicts:
#   docs/configuration/mrf.md
 2020-02-18 20:58:15 +00:00
feld
3416948cdf Merge branch 'fix/mrf-docs' into 'develop' 
Fix MRF documentation

See merge request pleroma/pleroma!2187
 2020-02-18 20:57:23 +00:00
Mark Felder
cf94349287 Merge branch 'develop' into gun 2020-02-18 09:06:27 -06:00
Ivan Tashkinov
61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-18 17:46:09 +03:00
lain
c07efd5b42 Merge branch 'need-reboot-flag' into 'develop' 
need_reboot flag for adminFE

See merge request pleroma/pleroma!2188
 2020-02-18 14:32:03 +00:00
Alexander Strizhakov
514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
Ivan Tashkinov
269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). 2020-02-15 20:41:38 +03:00
Mark Felder
589bffa57d Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc 2020-02-14 11:06:04 -06:00
Mark Felder
31749559e1 Fix MRF docs further. I don't think anyone has actually tested with the old docs. 2020-02-14 11:04:27 -06:00
feld
6caf6a86c5 Apply suggestion to docs/configuration/mrf.md 2020-02-14 16:55:52 +00:00
Mark Felder
88a76d0142 Update suggested path for location of your custom MRF 2020-02-14 10:55:18 -06:00
Mark Felder
2c95b0fab9 Make the sample code actually compile 2020-02-13 15:19:01 -06:00
Maksim Pechnikov
da44ee5b0f Merge branch 'develop' into issue/1276 2020-02-13 09:20:34 +03:00