lain [Mon, 27 Apr 2020 15:48:34 +0000 (17:48 +0200)]
Chat API: Align more to Pleroma/Mastodon API.
lain [Mon, 27 Apr 2020 14:08:03 +0000 (16:08 +0200)]
ChatView: Add actor_account_id
lain [Mon, 27 Apr 2020 12:35:12 +0000 (14:35 +0200)]
Changelog: Add info about `/api/v1/instance` changes
lain [Mon, 27 Apr 2020 12:33:21 +0000 (14:33 +0200)]
Docs: Add `/api/v1/instance` information
lain [Mon, 27 Apr 2020 12:28:08 +0000 (14:28 +0200)]
InstanceController: Add extensions to `/api/v1/instance`
lain [Mon, 27 Apr 2020 12:02:11 +0000 (14:02 +0200)]
Credo fixes.
lain [Mon, 27 Apr 2020 11:48:09 +0000 (13:48 +0200)]
Docs: Add chat motivation and api description.
lain [Mon, 27 Apr 2020 10:45:59 +0000 (12:45 +0200)]
Chat Schemas: Inline unimportant Schemas.
Egor Kislitsyn [Mon, 27 Apr 2020 10:33:00 +0000 (14:33 +0400)]
Merge branch 'develop' into openapi/account
lain [Mon, 27 Apr 2020 10:19:27 +0000 (12:19 +0200)]
ChatControllerTest: Use new schema testing functions.
lain [Mon, 27 Apr 2020 10:07:08 +0000 (12:07 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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.
lain [Thu, 23 Apr 2020 14:55:00 +0000 (16:55 +0200)]
Docs: Add documentation about chatmessages
lain [Thu, 23 Apr 2020 14:19:49 +0000 (16:19 +0200)]
ChatMessage: Correctly ingest emoji tags.
lain [Thu, 23 Apr 2020 13:47:08 +0000 (15:47 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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.
Ivan Tashkinov [Wed, 22 Apr 2020 17:00:51 +0000 (20:00 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
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
Ivan Tashkinov [Wed, 22 Apr 2020 15:31:41 +0000 (15:31 +0000)]
Apply suggestion to lib/pleroma/notification.ex
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.
lain [Wed, 22 Apr 2020 10:52:39 +0000 (12:52 +0200)]
Litepub: Add ChatMessage.
lain [Wed, 22 Apr 2020 10:48:52 +0000 (12:48 +0200)]
ChatMessageValidator: Validation changes
Don't validate if the recipient is blocking the actor.
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
lain [Tue, 21 Apr 2020 16:32:30 +0000 (18:32 +0200)]
ChatControllerTest: Credo fixes.
lain [Tue, 21 Apr 2020 16:23:00 +0000 (18:23 +0200)]
ChatController: Validate parameters.
lain [Tue, 21 Apr 2020 15:51:06 +0000 (17:51 +0200)]
Chats: Add API specs.
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 12:24:27 +0000 (14:24 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
lain [Tue, 21 Apr 2020 10:00:33 +0000 (12:00 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Ivan Tashkinov [Tue, 21 Apr 2020 05:20:50 +0000 (08:20 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
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
lain [Mon, 20 Apr 2020 12:38:53 +0000 (14:38 +0200)]
ChatMessageView: Support emoji.
lain [Mon, 20 Apr 2020 12:08:54 +0000 (14:08 +0200)]
ChatMessage: Support emoji.
lain [Mon, 20 Apr 2020 11:14:59 +0000 (13:14 +0200)]
ChatMessageValidator: Require `published` field
lain [Mon, 20 Apr 2020 10:37:17 +0000 (12:37 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Mon, 20 Apr 2020 10:29:19 +0000 (12:29 +0200)]
Credo fixes.
projects / akkoma / log