sadposter [Thu, 30 Apr 2020 00:32:52 +0000 (01:32 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
rinpatch [Wed, 29 Apr 2020 22:01:17 +0000 (22:01 +0000)]
Merge branch 'fix/add-exclude-replies-openapi' into 'develop'
Add exlude_replies to OpenAPI spec for account timelines
See merge request pleroma/pleroma!2443
rinpatch [Wed, 29 Apr 2020 21:49:59 +0000 (00:49 +0300)]
Add exlude_replies to OpenAPI spec for account timelines
sadposter [Wed, 29 Apr 2020 21:41:50 +0000 (22:41 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
lain [Wed, 29 Apr 2020 11:09:30 +0000 (11:09 +0000)]
Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'
Automatic checks of authentication / authorization / instance publicity
See merge request pleroma/pleroma!2409
Ivan Tashkinov [Tue, 28 Apr 2020 17:04:25 +0000 (20:04 +0300)]
[#2349] Post-merge fix.
Ivan Tashkinov [Tue, 28 Apr 2020 16:56:20 +0000 (19:56 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lain [Tue, 28 Apr 2020 15:40:18 +0000 (15:40 +0000)]
Merge branch 'docs/notification_destroy_multiple' into 'develop'
Document DELETE /api/v1/notifications/destroy_multiple
Closes #1711
See merge request pleroma/pleroma!2435
Mark Felder [Tue, 28 Apr 2020 15:13:58 +0000 (10:13 -0500)]
Document DELETE /api/v1/notifications/destroy_multiple
rinpatch [Tue, 28 Apr 2020 11:57:16 +0000 (11:57 +0000)]
Merge branch 'openapi/account' into 'develop'
Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374
lain [Tue, 28 Apr 2020 09:18:59 +0000 (09:18 +0000)]
Merge branch 'mongoose-secure' into 'develop'
mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432
fence [Mon, 27 Apr 2020 23:29:31 +0000 (01:29 +0200)]
formating
sadposter [Mon, 27 Apr 2020 21:57:16 +0000 (22:57 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Egor Kislitsyn [Mon, 27 Apr 2020 18:55:05 +0000 (22:55 +0400)]
Move single used schemas to operation schema
fence [Mon, 27 Apr 2020 17:32:58 +0000 (19:32 +0200)]
mongooseim test: explicitly set password for the deactivated used
fence [Mon, 27 Apr 2020 17:16:05 +0000 (19:16 +0200)]
requested changes to mongoose test
fence [Mon, 27 Apr 2020 17:11:03 +0000 (19:11 +0200)]
requested changes to mongoose_im_controller.ex
Egor Kislitsyn [Mon, 27 Apr 2020 16:46:52 +0000 (20:46 +0400)]
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
fence [Mon, 27 Apr 2020 16:31:00 +0000 (18:31 +0200)]
add tests for deactivated users for mongoose auth
fence [Mon, 27 Apr 2020 15:55:33 +0000 (17:55 +0200)]
secure mongoose auth endpoint
Egor Kislitsyn [Mon, 27 Apr 2020 10:33:00 +0000 (14:33 +0400)]
Merge branch 'develop' into openapi/account
rinpatch [Sun, 26 Apr 2020 11:39:17 +0000 (11:39 +0000)]
Merge branch 'img-src-blob' into 'develop'
Let blob: pass CSP
See merge request pleroma/pleroma!2427
Alex Gleason [Sun, 26 Apr 2020 05:28:57 +0000 (00:28 -0500)]
Let blob: pass CSP
lain [Sat, 25 Apr 2020 19:24:22 +0000 (19:24 +0000)]
Merge branch '1706-dm-timeline-failure-fix' into 'develop'
[#1706] Prevented error on unresolved activity actors for timeline actions
Closes #1706
See merge request pleroma/pleroma!2425
Ivan Tashkinov [Sat, 25 Apr 2020 15:42:08 +0000 (18:42 +0300)]
[#1706] Formatting fix.
Ivan Tashkinov [Sat, 25 Apr 2020 15:24:10 +0000 (18:24 +0300)]
[#1706] Prevented error on unresolved activity actors for timeline actions.
Ivan Tashkinov [Fri, 24 Apr 2020 19:25:27 +0000 (22:25 +0300)]
[#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
rinpatch [Fri, 24 Apr 2020 16:58:24 +0000 (16:58 +0000)]
Merge branch 'bugfix/announce-race-condition' into 'develop'
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
lain [Fri, 24 Apr 2020 16:32:13 +0000 (16:32 +0000)]
Merge branch 'reply-filtering-refactor' into 'develop'
Reply filtering refactor
See merge request pleroma/pleroma!2424
lain [Fri, 24 Apr 2020 16:25:26 +0000 (18:25 +0200)]
Reply Filtering: Refactor.
lain [Fri, 24 Apr 2020 16:10:43 +0000 (16:10 +0000)]
Merge branch 'openapi-improvements' into 'develop'
Support validation for inline OpenAPI schema and automatic tests for examples
Closes #1696
See merge request pleroma/pleroma!2421
Ivan Tashkinov [Fri, 24 Apr 2020 13:52:38 +0000 (16:52 +0300)]
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
lain [Fri, 24 Apr 2020 10:27:51 +0000 (10:27 +0000)]
Apply suggestion to CHANGELOG.md
lain [Fri, 24 Apr 2020 10:26:54 +0000 (10:26 +0000)]
Update differences_in_mastoapi_responses.md
Alexander Strizhakov [Fri, 24 Apr 2020 06:57:30 +0000 (09:57 +0300)]
bench sync
Alexander Strizhakov [Fri, 24 Apr 2020 06:24:08 +0000 (09:24 +0300)]
updating benchmarks
Alexander [Wed, 4 Dec 2019 07:29:26 +0000 (10:29 +0300)]
formatting
Alexander [Wed, 4 Dec 2019 06:49:17 +0000 (09:49 +0300)]
reply filtering
lain [Fri, 24 Apr 2020 12:37:53 +0000 (14:37 +0200)]
Announcements: Prevent race condition.
lain [Fri, 24 Apr 2020 12:09:15 +0000 (12:09 +0000)]
Merge branch 'feature/remove-unused-like-code' into 'develop'
ActivitPub: Remove `like` function.
See merge request pleroma/pleroma!2422
lain [Fri, 24 Apr 2020 11:59:48 +0000 (13:59 +0200)]
Credo fixes.
lain [Fri, 24 Apr 2020 11:48:13 +0000 (13:48 +0200)]
ActivitPub: Remove `like` function.
We don't need another way to build likes.
Egor Kislitsyn [Fri, 24 Apr 2020 10:46:59 +0000 (14:46 +0400)]
Support validation for inline OpenAPI schema and automatic tests for examples
Ivan Tashkinov [Thu, 23 Apr 2020 18:47:33 +0000 (21:47 +0300)]
[#2409] Fixed before-action callback results persistence.
rinpatch [Thu, 23 Apr 2020 12:40:38 +0000 (12:40 +0000)]
Merge branch 'bugfix/repeating-announce' into 'develop'
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
lain [Thu, 23 Apr 2020 11:33:30 +0000 (13:33 +0200)]
CommonAPI: Don't make repeating announces possible
rinpatch [Thu, 23 Apr 2020 11:22:30 +0000 (11:22 +0000)]
Merge branch 'bugfix/null-scheduled-at' into 'develop'
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
lain [Wed, 22 Apr 2020 19:26:32 +0000 (19:26 +0000)]
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
lain [Wed, 22 Apr 2020 19:21:21 +0000 (21:21 +0200)]
SideEffects: Use less cryptic syntax.
Haelwenn [Wed, 22 Apr 2020 17:37:09 +0000 (17:37 +0000)]
Merge branch 'bugfix/1670-user-count' into 'develop'
Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414
lain [Wed, 22 Apr 2020 17:02:22 +0000 (19:02 +0200)]
Stats: Use `invisible` property for filtering.
lain [Wed, 22 Apr 2020 16:40:53 +0000 (18:40 +0200)]
SideEffects: Run in transaction.
This fixes race conditions.
Egor Kislitsyn [Wed, 22 Apr 2020 16:20:19 +0000 (20:20 +0400)]
Update Flake ID description
Egor Kislitsyn [Wed, 22 Apr 2020 16:18:12 +0000 (20:18 +0400)]
Merge branch 'develop' into openapi/account
Ivan Tashkinov [Wed, 22 Apr 2020 15:51:59 +0000 (18:51 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Ivan Tashkinov [Wed, 22 Apr 2020 15:50:25 +0000 (18:50 +0300)]
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
Haelwenn [Wed, 22 Apr 2020 15:46:04 +0000 (15:46 +0000)]
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
Haelwenn [Wed, 22 Apr 2020 15:33:04 +0000 (15:33 +0000)]
Merge branch 'bugfix/following-fix-status-code' into 'develop'
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
Haelwenn [Wed, 22 Apr 2020 15:31:51 +0000 (15:31 +0000)]
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415
Egor Kislitsyn [Wed, 22 Apr 2020 15:31:03 +0000 (19:31 +0400)]
Update CHANGELOG
Egor Kislitsyn [Wed, 22 Apr 2020 15:00:08 +0000 (19:00 +0400)]
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.
Egor Kislitsyn [Wed, 22 Apr 2020 14:13:13 +0000 (18:13 +0400)]
Fix blocks import
Egor Kislitsyn [Tue, 21 Apr 2020 16:05:25 +0000 (20:05 +0400)]
Fix follow import
lain [Wed, 22 Apr 2020 15:21:13 +0000 (17:21 +0200)]
Streamer: Stream boosts to the boosting user.
Haelwenn [Wed, 22 Apr 2020 15:12:19 +0000 (15:12 +0000)]
Merge branch 'feature/voters-count' into 'develop'
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
Haelwenn [Wed, 22 Apr 2020 15:09:10 +0000 (15:09 +0000)]
Merge branch 'worker-messages' into 'develop'
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
lain [Wed, 22 Apr 2020 14:10:55 +0000 (14:10 +0000)]
Merge branch 'microformats' into 'develop'
static_fe: Add microformats2 classes
See merge request pleroma/pleroma!2215
Karol Kosek [Wed, 22 Apr 2020 14:02:40 +0000 (16:02 +0200)]
static_fe: Add microformats2 classes
lain [Wed, 22 Apr 2020 13:31:37 +0000 (15:31 +0200)]
Stats: Ignore internal users for user count.
lain [Wed, 22 Apr 2020 13:04:26 +0000 (15:04 +0200)]
AccountController: Use code 400 for self-follow.
lain [Wed, 22 Apr 2020 12:41:31 +0000 (12:41 +0000)]
Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
Fix migrate to db config
Closes #1689
See merge request pleroma/pleroma!2394
lain [Wed, 22 Apr 2020 12:26:19 +0000 (14:26 +0200)]
StatusController: Ignore nil scheduled_at parameters.
lain [Wed, 22 Apr 2020 12:10:27 +0000 (12:10 +0000)]
Merge branch 'docs/debian-packages' into 'develop'
debian_based_*.md: Use erlang-nox metapackage
See merge request pleroma/pleroma!2268
lain [Wed, 22 Apr 2020 12:10:20 +0000 (12:10 +0000)]
Apply suggestion to docs/installation/debian_based_en.md
lain [Wed, 22 Apr 2020 12:06:39 +0000 (14:06 +0200)]
Polls: Persist and show voters' count
lain [Wed, 22 Apr 2020 11:28:52 +0000 (13:28 +0200)]
Federator: Return proper values for jobs
lain [Wed, 22 Apr 2020 11:28:34 +0000 (13:28 +0200)]
WebPush: Return proper values for jobs.
Egor Kislitsyn [Tue, 21 Apr 2020 19:54:45 +0000 (23:54 +0400)]
Add OpenAPI schema for FlakeID
Egor Kislitsyn [Tue, 21 Apr 2020 19:30:24 +0000 (23:30 +0400)]
Improve OpenAPI schema
- Removes unneeded wrapping in examples
- Adds `:format` attributes
Ivan Tashkinov [Tue, 21 Apr 2020 13:29:19 +0000 (16:29 +0300)]
checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
lain [Tue, 21 Apr 2020 10:13:50 +0000 (10:13 +0000)]
Merge branch 'openapi/custom-emojis' into 'develop'
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
sadposter [Mon, 20 Apr 2020 23:24:32 +0000 (00:24 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
rinpatch [Mon, 20 Apr 2020 18:30:01 +0000 (18:30 +0000)]
Merge branch 'accept-deletes' into 'develop'
Always accept deletions through SimplePolicy, add :reject_deletes group
See merge request pleroma/pleroma!2371
rinpatch [Mon, 20 Apr 2020 18:29:03 +0000 (18:29 +0000)]
Merge branch 'router-cleanup' into 'develop'
Cleanup and DRY the Router
See merge request pleroma/pleroma!2406
Alex Gleason [Mon, 20 Apr 2020 15:13:56 +0000 (10:13 -0500)]
Merge remote-tracking branch 'upstream/develop' into accept-deletes
Alex Gleason [Mon, 13 Apr 2020 18:48:32 +0000 (13:48 -0500)]
Add :reject_deletes option to SimplePolicy
Egor Kislitsyn [Mon, 20 Apr 2020 14:39:05 +0000 (18:39 +0400)]
Add OpenAPI spec for `AccountController.identity_proofs` operation
Egor Kislitsyn [Mon, 20 Apr 2020 14:37:45 +0000 (18:37 +0400)]
Merge branch 'develop' into openapi/account
lain [Mon, 20 Apr 2020 13:01:17 +0000 (13:01 +0000)]
Merge branch 'cleanup-subscription-controller' into 'develop'
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
lain [Mon, 20 Apr 2020 12:59:16 +0000 (12:59 +0000)]
Merge branch 'fix-object_age_policy' into 'develop'
Fix ObjectAgePolicy
See merge request pleroma/pleroma!2404
Ilja [Mon, 20 Apr 2020 12:59:16 +0000 (12:59 +0000)]
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
lain [Mon, 20 Apr 2020 12:57:45 +0000 (12:57 +0000)]
Merge branch 'mrf-docs-update' into 'develop'
Expand MRF SimplePolicy docs
See merge request pleroma/pleroma!2370
Egor Kislitsyn [Mon, 20 Apr 2020 12:38:00 +0000 (16:38 +0400)]
Cleanup and DRY the Router
rinpatch [Sun, 19 Apr 2020 21:45:20 +0000 (21:45 +0000)]
Merge branch '1559-follow-request-notifications' into 'develop'
[#1559] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
rinpatch [Sun, 19 Apr 2020 21:44:25 +0000 (21:44 +0000)]
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
mix.exs: Do not bail out when .git doesn’t exists
See merge request pleroma/pleroma!2405
Haelwenn (lanodan) Monnier [Sun, 19 Apr 2020 18:23:48 +0000 (20:23 +0200)]
mix.exs: Do not bail out when .git doesn’t exists
sadposter [Sat, 18 Apr 2020 15:16:27 +0000 (16:16 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Haelwenn [Sat, 18 Apr 2020 06:59:23 +0000 (06:59 +0000)]
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes #1697
See merge request pleroma/pleroma!2403
Haelwenn [Fri, 17 Apr 2020 22:48:40 +0000 (22:48 +0000)]
Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
Haelwenn [Fri, 17 Apr 2020 22:48:37 +0000 (22:48 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
projects / akkoma / log