Commit graph

7160 commits

Author SHA1 Message Date
Maxim Filippov
ad42837244 Ability to toggle activation status and permission group for a group of users 2019-10-09 17:03:54 +03:00
lain
c1bae01376 Search: Add tests for unicode searches. 2019-10-09 16:03:45 +02: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
rinpatch
6355694309 Merge branch 'chore/format-migrations' into 'develop'
Enable `mix format` for migrations

See merge request pleroma/pleroma!1819
2019-10-08 12:28:10 +00:00
rinpatch
32808208be Enable mix format for migrations 2019-10-08 15:16:39 +03:00
rinpatch
44e0c5cabb Merge branch 'chore/bump-fe-122323f3' into 'develop'
Bump pleroma-fe bundle to 122323f35c

See merge request pleroma/pleroma!1817
2019-10-07 14:54:24 +00:00
rinpatch
a502155274 Bump pleroma-fe bundle to 122323f35c 2019-10-07 17:42:33 +03:00
kaniini
380c67e2c3 Merge branch 'bugfix/exclude-replies' into 'develop'
mastodon api: fix exclude_replies (closes #1287)

Closes #1287

See merge request pleroma/pleroma!1813
2019-10-07 12:43:21 +00:00
Ariadne Conill
9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287) 2019-10-07 12:29:33 +00:00
kaniini
0a99f1e8c5 Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'
Extract RSS Feed functionality from OStatus

Closes #1243

See merge request pleroma/pleroma!1644
2019-10-07 12:20:41 +00:00
Sergey Suprunenko
4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
kaniini
5c32e6ee91 Merge branch 'chore/context-cleanups' into 'develop'
clean up bundled litepub schema (closes #1303)

Closes #1303

See merge request pleroma/pleroma!1808
2019-10-07 11:34:50 +00:00
Ariadne Conill
19962d2022 clean up bundled litepub schema (closes #1303) 2019-10-07 11:33:58 +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
Haelwenn
15592f1abe Merge branch '1260-rate-limited-auth-actions' into 'develop'
[#1260] Rate-limiting for create authentication and related requests

Closes #1260

See merge request pleroma/pleroma!1681
2019-10-07 09:16:42 +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
kaniini
25cffffaf1 Merge branch 'fix/bad-migration' into 'develop'
Fix muted notification migration only working with a schema

See merge request pleroma/pleroma!1803
2019-10-06 15:15:00 +00:00
rinpatch
ee88afb2e2 Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
2019-10-06 18:06:04 +03:00
kaniini
2411d09215 Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
Move local keys out of `user.info`

See merge request pleroma/pleroma!1799
2019-10-06 14:32:56 +00:00
rinpatch
125f96e706 Fix the use of queries with a schema in a migration 2019-10-06 17:23:43 +03:00
09a3b993fe Merge branch 'fix/report-email' into 'develop'
Fix/report email

Closes #1300

See merge request pleroma/pleroma!1800
2019-10-06 14:13:04 +00:00
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
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
kaniini
0ee6100c8d Merge branch 'update-activity-fixes' into 'develop'
Update activity fixes

Closes #1298

See merge request pleroma/pleroma!1795
2019-10-05 15:51:19 +00: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
b1ff66dc5f Add test for handling Announces with inlined object from different origin 2019-10-05 13:56:40 +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
e51c20f28a Merge branch 'revert-5c04e817' into 'develop'
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"

See merge request pleroma/pleroma!1794
2019-10-05 10:00:44 +00: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
9c47d8571c Merge branch 'issue/1296' into 'develop'
[#1296] removed legacy api: "/objects/:uuid/likes"

See merge request pleroma/pleroma!1788
2019-10-04 20:07:47 +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
kaniini
75e415d5f4 Merge branch 'fix/extended-nickname-format-default-config' into 'develop'
Add missing extended_nickname_format setting to the default config

See merge request pleroma/pleroma!1776
2019-10-04 15:53:47 +00:00
kaniini
99b312cbab Merge branch 'undo-fixes' into 'develop'
ActivityPub: Change addressing of Undo.

See merge request pleroma/pleroma!1782
2019-10-04 15:52:41 +00:00
Ariadne Conill
dbf5fce67e update changelog 2019-10-04 15:45:06 +00:00
Ariadne Conill
d1d058bf85 streamer: worker: actually use should_send? consistently 2019-10-04 15:42:25 +00:00