fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 23:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
10533 commits 26 branches 107 tags 316 MiB
Commit graph

977 commits

Author SHA1 Message Date
lain e297d8c649 Documentation: Add attachment docs 2020-05-10 12:34:12 +02:00
Roman Chvanikov 4c19702390 Add docs 2020-05-09 14:32:08 +03:00
lain 7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-08 13:13:37 +02:00
Maksim Pechnikov b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +03:00
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
lain 1748e26948 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 17:36:08 +02:00
Mark Felder d7537a37c7 Add :chat to cheatsheet 2020-05-06 08:55:09 -05:00
Maksim Pechnikov bd261309cc added unread_notifications_count for /api/v1/accounts/verify_credentials 2020-05-06 15:08:38 +03:00
lain 205313e541 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 11:44:30 +02:00
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2 2020-05-06 05:55:39 +03:00
lain 42a2acac46 Merge branch 'feature/1720-status-view' into 'develop' 
Admin API fetch status by id

Closes #1720

See merge request pleroma/pleroma!2475
 2020-05-05 13:40:12 +00:00
Alexander Strizhakov e7d8ab8303
admin_api fetch status by id 2020-05-05 16:18:56 +03:00
Egor Kislitsyn cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate 2020-05-05 15:01:33 +04:00
Egor Kislitsyn decaa64f75
Merge branch 'develop' into global-status-expiration 2020-05-05 14:28:54 +04:00
lain 7ff2a7dae2 Docs: Add Chat mark_as_read docs 2020-05-04 13:12:21 +02:00
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 10:43:20 +02:00
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2 2020-05-04 06:08:49 +03:00
lain 095635453a Replace deprecated Roma by Fedi. 2020-05-02 18:10:50 +00:00
rinpatch 3126f8a334 Merge branch 'feature/1710-consolidate-instance-info' into 'develop' 
Feature/1710 consolidate instance info

Closes #1710

See merge request pleroma/pleroma!2430
 2020-05-02 16:44:55 +00:00
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
 2020-05-01 11:47:58 +00:00
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03:00
Alexander Strizhakov 631e8c1feb
docs update 2020-04-30 16:09:23 +03:00
Alexander Strizhakov 1fd40532ae
docs fix 2020-04-30 16:09:23 +03:00
Alexander Strizhakov 1c1b7e22af
list of options for pack metadata 2020-04-30 16:09:22 +03:00
Alexander Strizhakov ddb757f743
emoji api packs changes in routes with docs update 2020-04-30 16:09:18 +03:00
Alexander Strizhakov 95759310ab
docs update 2020-04-30 15:45:56 +03:00
Alexander Strizhakov 5839e67eb8
return data only for updated emoji 2020-04-30 15:24:02 +03:00
lain 528ea779a6 Apply suggestion to docs/API/chats.md 2020-04-29 17:56:24 +00:00
Egor Kislitsyn 8148d76ec5
Document captcha_answer_data parameter 2020-04-29 21:26:07 +04:00
lain 0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-29 13:19:04 +02:00
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
 2020-04-28 19:56:20 +03:00
lain 30ea6bb167 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-28 17:48:05 +02:00
Mark Felder 4b3298133b Document DELETE /api/v1/notifications/destroy_multiple 2020-04-28 10:13:58 -05:00
lain b5dc59c8fa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-28 14:16:21 +02:00
Egor Kislitsyn 764b4f95a8
Merge branch 'develop' into global-status-expiration 2020-04-28 14:13:53 +04:00
Maksim Pechnikov 270c3fe446 fix markdown format 2020-04-28 06:45:59 +03:00
lain b550ef5611 Docs: Align chat api changes with docs. 2020-04-27 17:52:16 +02:00
lain 4cadaf7e96 Docs: Add /api/v1/instance information 2020-04-27 14:33:21 +02:00
lain e62f8542a1 Docs: Add chat motivation and api description. 2020-04-27 13:48:09 +02:00
Egor Kislitsyn f1ca917bb0
Merge branch 'develop' into openapi/account 2020-04-27 14:33:00 +04:00
lain c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-27 12:07:08 +02:00
Alex Gleason 1bd9749a8f
Let blob: pass CSP 2020-04-26 00:29:42 -05:00
Egor Kislitsyn c56c0a3d23
Merge branch 'develop' into global-status-expiration 2020-04-24 18:37:58 +04:00
lain 8480f84615
Update differences_in_mastoapi_responses.md 2020-04-24 15:43:54 +03:00
Alexander be34672d67
formatting 2020-04-24 15:43:54 +03:00
Alexander 6e625a427c
reply filtering 2020-04-24 15:43:49 +03:00
lain a51cdafc01 Docs: Add documentation about chatmessages 2020-04-23 16:55:50 +02:00
Egor Kislitsyn 1b06a27746
Update Flake ID description 2020-04-22 20:20:19 +04:00
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
 2020-04-22 18:51:59 +03:00
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. 2020-04-22 18:50:25 +03:00
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
Egor Kislitsyn 364eecc49f
Merge branch 'develop' into global-status-expiration 2020-04-20 20:37:56 +04: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
Egor Kislitsyn 7f692343c8
Merge branch 'develop' into global-status-expiration 2020-04-10 14:20:48 +04: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
Egor Kislitsyn 80e1571610
Merge branch 'develop' into global-status-expiration 2020-03-20 22:08:34 +04: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
Egor Kislitsyn 421e35b578
Merge branch 'develop' into global-status-expiration 2020-03-16 15:31:31 +04: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
Egor Kislitsyn d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-03-12 16:02:24 +04: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
Egor Kislitsyn 0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-03-03 00:32:34 +04: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
Egor Kislitsyn 011ede4536
Update documentation 2020-02-21 14:42:43 +04: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