Egor Kislitsyn [Wed, 22 Apr 2020 16:18:12 +0000 (20:18 +0400)]
Merge branch 'develop' into openapi/account
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: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: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
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
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
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
Haelwenn (lanodan) Monnier [Fri, 17 Apr 2020 21:55:56 +0000 (23:55 +0200)]
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
rinpatch [Fri, 17 Apr 2020 20:47:43 +0000 (20:47 +0000)]
Merge branch '1682-basic-auth-permissions-fix' into 'develop'
[#1682] Fixed Basic Auth permissions issue
Closes #1682
See merge request pleroma/pleroma!2401
Haelwenn [Fri, 17 Apr 2020 19:21:34 +0000 (19:21 +0000)]
Merge branch 'update/pleroma-fe-
20200417' into 'develop'
pleroma-fe bundle: update to
ac9985aedbc2ed53121eec06a95013186c4eefd4
See merge request pleroma/pleroma!2402
Mark Felder [Fri, 17 Apr 2020 18:22:25 +0000 (13:22 -0500)]
Ivan Tashkinov [Fri, 17 Apr 2020 18:21:10 +0000 (21:21 +0300)]
[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
Egor Kislitsyn [Fri, 17 Apr 2020 15:27:22 +0000 (19:27 +0400)]
Improve OpenAPI errors
rinpatch [Fri, 17 Apr 2020 14:03:04 +0000 (14:03 +0000)]
Merge branch 'sideeffects-test' into 'develop'
SideEffects: Test for notification creation.
See merge request pleroma/pleroma!2399
lain [Fri, 17 Apr 2020 13:50:15 +0000 (15:50 +0200)]
SideEffects: Test for notification creation.
rinpatch [Fri, 17 Apr 2020 13:40:25 +0000 (13:40 +0000)]
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
Ivan Tashkinov [Fri, 17 Apr 2020 13:23:58 +0000 (16:23 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
# CHANGELOG.md
Haelwenn (lanodan) Monnier [Fri, 17 Apr 2020 12:32:15 +0000 (14:32 +0200)]
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Alexander Strizhakov [Thu, 16 Apr 2020 07:36:37 +0000 (10:36 +0300)]
don't restart postgrex
Haelwenn [Fri, 17 Apr 2020 09:39:29 +0000 (09:39 +0000)]
Merge branch 'sync-changelog' into 'develop'
Move changelog entries to unreleased section
See merge request pleroma/pleroma!2397
Alexander Strizhakov [Fri, 17 Apr 2020 09:33:11 +0000 (12:33 +0300)]
move changelogs entries to unreleased section
Haelwenn [Fri, 17 Apr 2020 09:19:35 +0000 (09:19 +0000)]
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
Haelwenn [Fri, 17 Apr 2020 09:02:10 +0000 (09:02 +0000)]
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
Fix for logger configuration
Closes #1694
See merge request pleroma/pleroma!2396
Haelwenn [Fri, 17 Apr 2020 08:55:46 +0000 (08:55 +0000)]
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
Alexander Strizhakov [Fri, 17 Apr 2020 05:42:48 +0000 (08:42 +0300)]
fix for logger configuration
rinpatch [Thu, 16 Apr 2020 21:58:57 +0000 (21:58 +0000)]
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
rinpatch [Thu, 16 Apr 2020 18:38:58 +0000 (18:38 +0000)]
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
rinpatch [Thu, 16 Apr 2020 18:37:56 +0000 (18:37 +0000)]
Merge branch 'features/remove-user-source_data' into 'develop'
User: remove source_data
Closes #820
See merge request pleroma/pleroma!2339
rinpatch [Thu, 16 Apr 2020 18:28:52 +0000 (21:28 +0300)]
Merge branch 'develop' into features/remove-user-source_data
Alexander Strizhakov [Thu, 16 Apr 2020 15:05:36 +0000 (18:05 +0300)]
fix for use of published from different entities
rinpatch [Thu, 16 Apr 2020 14:59:11 +0000 (14:59 +0000)]
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
rinpatch [Thu, 16 Apr 2020 14:54:57 +0000 (17:54 +0300)]
user: remove blank?
Alexander Strizhakov [Mon, 13 Apr 2020 11:07:23 +0000 (14:07 +0300)]
added need_reboot endpoint to admin api
lain [Thu, 16 Apr 2020 09:38:24 +0000 (09:38 +0000)]
Merge branch 'small-fix-rewrite_policy' into 'develop'
small fix in the rewrite_policy example
See merge request pleroma/pleroma!2391
Egor Kislitsyn [Wed, 15 Apr 2020 18:59:25 +0000 (22:59 +0400)]
Cleanup SubscriptionController
Ivan Tashkinov [Wed, 15 Apr 2020 18:19:16 +0000 (21:19 +0300)]
[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
Ilja [Wed, 15 Apr 2020 17:03:27 +0000 (19:03 +0200)]
small fix in the rewrite_policy example
Ivan Tashkinov [Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
Haelwenn [Wed, 15 Apr 2020 15:26:55 +0000 (15:26 +0000)]
Merge branch 'fix/1659-rate-limiter' into 'develop'
remote_ip plug adds remote_ip_found flag
Closes #1659
See merge request pleroma/pleroma!2390
Egor Kislitsyn [Wed, 15 Apr 2020 13:16:32 +0000 (17:16 +0400)]
Fix credo warning
Egor Kislitsyn [Wed, 15 Apr 2020 12:51:37 +0000 (16:51 +0400)]
Add a TODO note
Egor Kislitsyn [Wed, 15 Apr 2020 12:45:45 +0000 (16:45 +0400)]
Abstract pagination params in OpenAPI spec
Alexander Strizhakov [Wed, 15 Apr 2020 12:27:34 +0000 (15:27 +0300)]
remote_ip plug adds remote_ip_found flag
Egor Kislitsyn [Wed, 15 Apr 2020 11:39:32 +0000 (15:39 +0400)]
Fix formatting
minibikini [Wed, 15 Apr 2020 11:29:10 +0000 (11:29 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
minibikini [Wed, 15 Apr 2020 10:48:52 +0000 (10:48 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
minibikini [Wed, 15 Apr 2020 10:48:32 +0000 (10:48 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
minibikini [Wed, 15 Apr 2020 10:30:19 +0000 (10:30 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
minibikini [Wed, 15 Apr 2020 10:27:01 +0000 (10:27 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
minibikini [Wed, 15 Apr 2020 10:26:53 +0000 (10:26 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
minibikini [Wed, 15 Apr 2020 10:26:44 +0000 (10:26 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
rinpatch [Wed, 15 Apr 2020 10:15:15 +0000 (10:15 +0000)]
Merge branch 'uploads-csp-changes' into 'develop'
Uploads: Sandbox them in the CSP.
See merge request pleroma/pleroma!2389
lain [Wed, 15 Apr 2020 10:05:22 +0000 (12:05 +0200)]
Uploads: Sandbox them in the CSP.
rinpatch [Tue, 14 Apr 2020 22:01:24 +0000 (22:01 +0000)]
Merge branch 'fix/openapi-form-mimetype' into 'develop'
openapi: add application/x-www-form-urlencoded to body types
Closes #1683
See merge request pleroma/pleroma!2387
rinpatch [Tue, 14 Apr 2020 21:49:21 +0000 (00:49 +0300)]
openapi: add application/x-www-form-urlencoded to body types
Closes #1683
feld [Tue, 14 Apr 2020 17:05:17 +0000 (17:05 +0000)]
Merge branch 'fix/richmedia-oban-error' into 'develop'
Attempt at fixing Oban not receiving :ok from RichMediaHelper job
Closes #1684
See merge request pleroma/pleroma!2377
Mark Felder [Tue, 14 Apr 2020 16:43:53 +0000 (11:43 -0500)]
Fix Oban not receiving :ok from RichMediaHelper job
lain [Tue, 14 Apr 2020 16:32:34 +0000 (16:32 +0000)]
Merge branch 'revert-
60cc7d6c' into 'develop'
Revert "Merge branch 'issue/1276' into 'develop'"
See merge request pleroma/pleroma!2384
lain [Tue, 14 Apr 2020 16:32:22 +0000 (16:32 +0000)]
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
lain [Tue, 14 Apr 2020 16:31:41 +0000 (16:31 +0000)]
Merge branch 'revert-
13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'"
See merge request pleroma/pleroma!2383
lain [Tue, 14 Apr 2020 16:31:30 +0000 (16:31 +0000)]
Revert "Merge branch 'marker-update-fix' into 'develop'"
This reverts merge request !2380
Egor Kislitsyn [Tue, 14 Apr 2020 15:45:22 +0000 (19:45 +0400)]
Merge branch 'develop' into openapi/account
feld [Tue, 14 Apr 2020 15:11:25 +0000 (15:11 +0000)]
Merge branch 'logger-configuration' into 'develop'
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
lain [Tue, 14 Apr 2020 13:17:44 +0000 (13:17 +0000)]
Merge branch 'marker-update-fix' into 'develop'
Marker update migration: Don't try to update virtual field.
See merge request pleroma/pleroma!2380
lain [Tue, 14 Apr 2020 13:07:57 +0000 (13:07 +0000)]
Merge branch 'chore/spelling' into 'develop'
Fix spelling in log message
See merge request pleroma/pleroma!2378
lain [Tue, 14 Apr 2020 13:06:09 +0000 (15:06 +0200)]
Marker update migration: Don't try to update virtual field.
lain [Tue, 14 Apr 2020 11:08:33 +0000 (11:08 +0000)]
Merge branch 'fix/issue_1679' into 'develop'
[#1679] fixed logs
See merge request pleroma/pleroma!2379
projects / akkoma / log