Commit graph

3296 commits

Author SHA1 Message Date
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
Haelwenn
28f8fcf8b0 Merge branch 'fix/follow-and-blocks-import' into 'develop'
Fix follower/blocks import when nicknames starts with @

Closes #1698

See merge request pleroma/pleroma!2416
2020-04-22 15:46:04 +00:00
Haelwenn
468cc977be Merge branch 'bugfix/following-fix-status-code' into 'develop'
AccountController: Use code 400 for self-follow.

Closes #1674

See merge request pleroma/pleroma!2413
2020-04-22 15:33:04 +00:00
Haelwenn
238058ecae Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
Streamer: Stream boosts to the boosting user.

Closes #1543

See merge request pleroma/pleroma!2415
2020-04-22 15:31:51 +00:00
Egor Kislitsyn
6db52c3b36 Fix Oban warning
Warning example:

     [warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received:  [error: "not found @user@server.party", error: "not found "]  The job will be considered a success.
2020-04-22 19:27:28 +04:00
Egor Kislitsyn
e7771424a8 Fix blocks import 2020-04-22 19:27:28 +04:00
Egor Kislitsyn
88b82e5c3e Fix follow import 2020-04-22 19:27:28 +04:00
lain
7a3a88a13e Streamer: Stream boosts to the boosting user. 2020-04-22 17:21:13 +02:00
Haelwenn
1855c597c2 Merge branch 'feature/voters-count' into 'develop'
Polls: Persist and show voters' count

Closes #1702

See merge request pleroma/pleroma!2411
2020-04-22 15:12:19 +00:00
Haelwenn
2e73c19edc Merge branch 'worker-messages' into 'develop'
Worker messages

Closes #1705

See merge request pleroma/pleroma!2410
2020-04-22 15:09:10 +00:00
lain
5b39526198 AccountController: Use code 400 for self-follow. 2020-04-22 15:04:26 +02:00
lain
69ecc39038 Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
Fix migrate to db config

Closes #1689

See merge request pleroma/pleroma!2394
2020-04-22 12:41:31 +00:00
lain
5102468d0f Polls: Persist and show voters' count 2020-04-22 14:06:39 +02:00
lain
923513b641 Federator: Return proper values for jobs 2020-04-22 13:28:52 +02:00
lain
f719a5b23a WebPush: Return proper values for jobs. 2020-04-22 13:28:34 +02: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
lain
3c828016d9 Merge branch 'openapi/custom-emojis' into 'develop'
Add OpenAPI spec for CustomEmojiController

See merge request pleroma/pleroma!2375
2020-04-21 10:13:50 +00: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
28165dad3a Merge branch 'cleanup-subscription-controller' into 'develop'
Cleanup SubscriptionController

See merge request pleroma/pleroma!2393
2020-04-20 13:01:17 +00:00
Ilja
8b4de61d64 Fix ObjectAgePolicyTest
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
2020-04-20 12:59:16 +00:00
rinpatch
918a8094fc Merge branch '1559-follow-request-notifications' into 'develop'
[#1559] Support for "follow_request" notifications

Closes #1559

See merge request pleroma/pleroma!2354
2020-04-19 21:45:20 +00:00
Ivan Tashkinov
66f55106bd [#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality. 2020-04-17 21:21:10 +03:00
lain
26d9c83316 SideEffects: Test for notification creation. 2020-04-17 15:50:15 +02:00
Ivan Tashkinov
6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
#	CHANGELOG.md
2020-04-17 16:23:58 +03:00
Alexander Strizhakov
6cda360fea
don't restart postgrex 2020-04-17 12:45:13 +03: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
Haelwenn
d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop'
Fix for logger configuration

Closes #1694

See merge request pleroma/pleroma!2396
2020-04-17 09:02:10 +00:00
Haelwenn
9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
Added need_reboot endpoint to admin api

Closes #1677

See merge request pleroma/pleroma!2373
2020-04-17 08:55:46 +00:00
Alexander Strizhakov
304ea09f4c
fix for logger configuration 2020-04-17 08:42:48 +03:00
rinpatch
badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
Enforcement of OAuth scopes check for authenticated API endpoints

See merge request pleroma/pleroma!2349
2020-04-16 21:58:57 +00:00
rinpatch
28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
Fix for use of `published` field from different entities

Closes #1691

See merge request pleroma/pleroma!2395
2020-04-16 18:38:58 +00:00
rinpatch
942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities 2020-04-16 18:05:36 +03:00
rinpatch
252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
Remove User.upgrade_changeset in favor of remote_user_creation

See merge request pleroma/pleroma!2368
2020-04-16 14:59:11 +00:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api 2020-04-16 16:03:26 +03:00
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController 2020-04-15 23:14:47 +04:00
Ivan Tashkinov
bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests. 2020-04-15 21:19:16 +03:00
Ivan Tashkinov
bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement 2020-04-15 19:20:34 +03:00
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
lain
4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
bf3afbc1a1 Merge branch 'logger-configuration' into 'develop'
Fix for logger configuration through admin-fe

See merge request pleroma/pleroma!2365
2020-04-14 15:11:25 +00:00
Haelwenn
60cc7d6c9a Merge branch 'issue/1276' into 'develop'
[#1276] An endpoint for getting unread notification count

Closes #1276

See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController 2020-04-13 22:44:52 +04:00
Maksim Pechnikov
a16b3dbcbf Merge branch 'develop' into issue/1276 2020-04-13 21:19:27 +03:00
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController 2020-04-13 21:21:04 +04:00
Ivan Tashkinov
a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-13 09:16:51 +03:00
Alexander Strizhakov
a050f3e015
fix for logger configuration through admin-fe 2020-04-13 08:56:28 +03:00
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy 2020-04-12 20:26:35 -05:00
rinpatch
5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop'
FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00