fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-26 18:54:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
7108 commits 27 branches 108 tags 316 MiB
Commit graph

3532 commits

Author SHA1 Message Date
lain c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing 2019-10-10 14:40:59 +02:00
Ariadne Conill 9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287) 2019-10-07 12:29:33 +00:00
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
kaniini 93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop' 
mrf/simple_policy: check actor against accept/reject

See merge request pleroma/pleroma!1806
 2019-10-07 10:19:24 +00:00
Ivan Tashkinov 28fb98d69e Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-10-07 11:06:30 +03:00
Haelwenn b4f3c16885 Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' 
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes

Closes #1234

See merge request pleroma/pleroma!1643
 2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier 58aeabd020
mrf/simple_policy: check actor against accept/reject 2019-10-07 03:49:57 +02:00
Ivan Tashkinov b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-06 17:12:17 +03:00
rinpatch fefbd31c6e Move local keys out of user.info 2019-10-06 16:56:36 +03:00
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-06 11:43:49 +03:00
Ivan Tashkinov f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-10-06 09:30:49 +03:00
Haelwenn 9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop' 
Fix custom fields of accounts update credentials

See merge request pleroma/pleroma!1597
 2019-10-06 04:41:06 +00:00
kaniini 7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop' 
[#1278] Move a few more actions from MastodonAPIController

See merge request pleroma/pleroma!1761
 2019-10-05 19:28:53 +00:00
kaniini 45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop' 
Import object from self-Announce whenever possible

See merge request pleroma/pleroma!1770
 2019-10-05 19:28:29 +00:00
kaniini 17ff4b43cb Merge branch 'unread-conversation-count' into 'develop' 
Add `pleroma.unread_conversation_count` to the Account entity

See merge request pleroma/pleroma!1796
 2019-10-05 19:28:07 +00:00
eugenijm 8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
lain 276a520163 CommonAPI: Create profile updates as public. 
This saves us lots of sending out because we can use sharedInbox.
 2019-10-05 14:53:50 +02:00
lain 4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id. 2019-10-05 14:49:45 +02:00
Thibaut Girka 791d93ff0e Make credo happy 2019-10-05 13:56:40 +02:00
Thibaut Girka 977e711e22 Import object from self-Announce whenever possible 2019-10-05 13:56:40 +02:00
kaniini e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" 
This reverts merge request !1737
 2019-10-05 10:00:05 +00:00
Maksim Pechnikov 83631752af removed legacy api: "/objects/:uuid/likes" 2019-10-04 22:35:26 +03:00
kaniini e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop' 
widen streaming API block effects

See merge request pleroma/pleroma!1784
 2019-10-04 17:39:06 +00:00
kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop' 
Add the `unread_conversation_count` field to the user info

See merge request pleroma/pleroma!1737
 2019-10-04 17:33:18 +00:00
Ariadne Conill d1d058bf85 streamer: worker: actually use should_send? consistently 2019-10-04 15:42:25 +00:00
Ariadne Conill 5a0c018d2a streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist 2019-10-04 15:41:55 +00:00
Ariadne Conill 2417b633ed streamer: add missing copyright headers 2019-10-04 15:21:45 +00:00
lain 568a995d64 ActivityPub: Change addressing of Undo. 2019-10-04 16:32:42 +02:00
lain 01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop' 
notification_view.ex: Make sure `account` isn’t empty

See merge request pleroma/pleroma!1779
 2019-10-04 11:28:20 +00:00
Egor Kislitsyn d3ac4e8083
Fix OAuthController 2019-10-04 13:30:46 +07:00
Haelwenn (lanodan) Monnier 5dc14c89ce
notification_view.ex: Make sure account isn’t empty 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
 2019-10-04 07:11:53 +02:00
eugenijm 06d9df79c5 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-04 00:53:23 +03:00
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-02 20:42:40 +03:00
Egor Kislitsyn e0c68eeb02
Move :favourites and :bookmarks actions to StatusController 2019-10-02 21:31:19 +07:00
Egor Kislitsyn 7f2bc57725
Move follows, mutes and blocks actions to AccountController 2019-10-02 21:22:21 +07:00
Egor Kislitsyn d3c404af12
Add MastoFEController 2019-10-02 20:36:08 +07:00
Egor Kislitsyn 1c6e1055c8
Add CustomEmojiController 2019-10-02 19:16:34 +07:00
kaniini 433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop' 
Extract instance actions from `MastodonAPIController` to `InstanceController`

See merge request pleroma/pleroma!1760
 2019-10-02 10:46:14 +00:00
kaniini debd0a3066 Merge branch 'accept-embedded-announce-object' into 'develop' 
Inline object when Announcing a self-owned private object

See merge request pleroma/pleroma!1769
 2019-10-02 10:45:55 +00:00
Thibaut Girka 86880b9821 Inline object when Announcing a self-owned private object 2019-10-02 12:15:06 +02:00
Thibaut Girka 3d61efa7c9 Rename misleading get_announce_visibility to public_announce? 2019-10-02 10:48:34 +02:00
Egor Kislitsyn c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController 2019-10-02 14:13:52 +07:00
kaniini 89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' 
Send an identifier alongside with error message in OAuthController

See merge request pleroma/pleroma!1765
 2019-10-02 07:04:33 +00:00
kaniini 8557176808 Merge branch 'split-masto-api/auth' into 'develop' 
Extract auth actions from `MastodonAPIController` to `AuthController`

See merge request pleroma/pleroma!1759
 2019-10-02 07:02:56 +00:00
kaniini 9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop' 
Allow receiving private self-announces over ActivityPub

See merge request pleroma/pleroma!1766
 2019-10-02 07:02:24 +00:00
feld 1255ec888d Revert "Add upload limits to /api/v1/instance" 
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
 2019-10-01 22:16:29 +00:00
Thibaut Girka 427d0c2a00 Store private announcements in object.data["announcements"], filter them on display 2019-10-01 22:39:25 +02:00
Thibaut Girka 43e3db0951 Fix returned visibility of announces in MastodonAPI 2019-10-01 20:38:29 +02:00
Thibaut Girka 4c1f158f5d Allow users to announce privately, including own private notes 2019-10-01 20:00:59 +02:00
Maxim Filippov b2273c695e Discard identifier, if empty 2019-10-01 19:43:22 +03:00