fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-10-31 22:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
10194 commits 26 branches 107 tags 316 MiB
Commit graph

943 commits

Author SHA1 Message Date
Maksim Pechnikov ed442a225a removed Quantum from docs 2020-05-19 06:15:42 +03:00
Maksim Pechnikov 5f0a3ac74d added tests 2020-05-19 06:05:09 +03:00
Egor Kislitsyn d4a7577cde
Fix API documentation 2020-05-18 22:01:38 +04:00
lain 0d417e005d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-18 18:38:32 +02:00
lain 15c7e3b4bf Merge branch 'docs/storing-remote-media' into 'develop' 
Document how to store remote media permanently

See merge request pleroma/pleroma!1871
 2020-05-18 11:59:07 +00:00
Maksim Pechnikov c33a4315fb updated docs 2020-05-18 06:48:19 +03:00
lain f012c3a202 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-15 13:33:04 +02:00
lain 1d18721a3c Chats: Add updated_at to Schema and docs. 2020-05-15 13:18:41 +02:00
Stephanie Wilde-Hobbs 80308c5c26
Add config migration disclaimer to config whitelist documentation 2020-05-14 15:56:14 +01:00
Stephanie Wilde-Hobbs 20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
lain 41db52729e Apply suggestion to docs/configuration/storing_remote_media.md 2020-05-14 09:14:59 +00:00
Haelwenn (lanodan) Monnier e688d4ee69
MRF.StealEmojiPolicy: New Policy 
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
 2020-05-14 09:59:56 +02:00
lain 0f0acc740d Chat: Allow posting without content if an attachment is present. 2020-05-13 15:31:28 +02:00
Stephanie Wilde-Hobbs 620247a015
Add database configuration whitelist 2020-05-12 17:12:27 +01:00
lain a61120f497 Documention: Add chat message deletion docs 2020-05-12 13:25:25 +02:00
lain 8cc8d960af Documentation: Add GET /chats/:id 2020-05-10 13:27:40 +02:00
lain 17be3ff669 Documentation: Add last_message to chat docs. 2020-05-10 13:01:20 +02:00
lain e297d8c649 Documentation: Add attachment docs 2020-05-10 12:34:12 +02: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