cro/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
7159 commits 10 branches 78 tags 299 MiB
Commit graph

364 commits

Author SHA1 Message Date
Maxim Filippov
2473702be2 Merge branch 'develop' into feature/relay-list 2019-10-18 10:24:29 +02:00
eugenijm
359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message 2019-10-17 16:49:39 +03:00
Maxim Filippov
da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array 2019-10-15 17:33:29 +02:00
feld
3b1bc079af Merge branch 'exclude-visibilities-for-timelines' into 'develop' 
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints

See merge request pleroma/pleroma!1818
 2019-10-14 19:40:40 +00:00
rinpatch
d1e969842d Add a changelog entry for branch-moving 2019-10-14 18:42:30 +03:00
eugenijm
a97b642289 Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints 2019-10-14 02:57:21 +03:00
Maxim Filippov
cc6875b582 Add GET /api/pleroma/admin/relay endpoint - lists all followed relays 2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions 2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it 2019-10-11 15:58:45 +03:00
Maxim Filippov
f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it 2019-10-11 00:24:31 +03:00
lain
1357ec1a10 Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop' 
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`

See merge request pleroma/pleroma!1822
 2019-10-09 15:10:08 +00:00
Maxim Filippov
ad42837244 Ability to toggle activation status and permission group for a group of users 2019-10-09 17:03:54 +03:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users 2019-10-09 13:11:57 +07:00
eugenijm
580a67f5ca Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id) 2019-10-09 07:27:09 +03: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
feld
1d8e956c32 Use the user.id instead of nickname in report URLs 
Ensures links to profiles of remote users work.
 2019-10-06 14:13:04 +00: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
eugenijm
8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03: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
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
dbf5fce67e update changelog 2019-10-04 15:45:06 +00:00
feld
31e57cd1b3 Merge branch 'develop' into 'fix/extended-nickname-format-default-config' 
# Conflicts:
#   CHANGELOG.md
 2019-10-04 14:16:28 +00:00
lain
27110793a7 Merge branch 'featrue/job-monitor' into 'develop' 
Add Pleroma.JobQueueMonitor

Closes #1274

See merge request pleroma/pleroma!1721
 2019-10-04 12:52:11 +00:00
rinpatch
8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by 
nickname

Closes #1293
 2019-10-04 14:44:09 +03:00
eugenijm
06d9df79c5 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-04 00:53:23 +03:00
Mark Felder
b8b98ac40f Add missing extended_nickname_format setting to the default config 2019-10-03 10:40:49 -05: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
93f966ea4b
Update CHANGELOG and pleroma_api.md 2019-10-02 14:51:30 +07:00
feld
1255ec888d Revert "Add upload limits to /api/v1/instance" 
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
 2019-10-01 22:16:29 +00:00
Sergey Suprunenko
c541b83bef Track failed proxy urls and don't request them again 2019-10-01 20:00:27 +00:00
Ivan Tashkinov
6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-09-30 17:41:20 +03:00
Ariadne Conill
1d7cbdaf7b change new scrobble endpoint 2019-09-30 10:39:48 +00:00
Ariadne Conill
53506da414 update changelog 2019-09-30 10:39:48 +00:00
rinpatch
e9d1aa75d5 Revert subscription refactoring. 
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
 2019-09-29 18:43:27 +03:00
kaniini
6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop' 
Mastodon API: add follow_requests_count

See merge request pleroma/pleroma!1726
 2019-09-29 11:44:31 +00:00
Haelwenn (lanodan) Monnier
e46dfd9295
CHANGELOG.md: Sorting, colon after breaking 
[ci skip]
 2019-09-29 02:16:52 +02:00
Haelwenn (lanodan) Monnier
51a4a211a3
CHANGELOG.md: !1691 is a breaking change 
!1691: https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
 2019-09-29 02:13:17 +02:00
minibikini
f9380289eb Add remote_ip plug 2019-09-27 21:59:23 +00:00
Ariadne Conill
843c11d1f6 changelog 2019-09-27 04:24:20 +00:00
kaniini
eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop' 
Refactor subscription functionality

Closes #1130

See merge request pleroma/pleroma!1664
 2019-09-27 03:51:24 +00:00
rinpatch
3ec81b816f Sync changelogs between master and develop 2019-09-27 01:16:24 +03:00
Maxim Filippov
e7836adf21 Merge branch 'develop' into feature/moderation-log-filters 2019-09-26 19:01:54 +03:00
Roman Chvanikov
b736312123 Update CHANGELOG 2019-09-26 15:17:36 +03:00