Maksim Pechnikov [Tue, 28 Apr 2020 03:45:59 +0000 (06:45 +0300)]
fix markdown format
Maksim Pechnikov [Wed, 15 Apr 2020 18:19:43 +0000 (21:19 +0300)]
added an endpoint for getting unread notification count
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
Alexander Strizhakov [Wed, 15 Apr 2020 12:27:34 +0000 (15:27 +0300)]
remote_ip plug adds remote_ip_found flag
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
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
Haelwenn [Tue, 14 Apr 2020 06:38:56 +0000 (06:38 +0000)]
Merge branch 'issue/1276' into 'develop'
[#1276] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
Maksim Pechnikov [Tue, 14 Apr 2020 05:43:47 +0000 (08:43 +0300)]
fix logger message
Mark Felder [Mon, 13 Apr 2020 22:04:43 +0000 (17:04 -0500)]
Fix spelling
rinpatch [Mon, 13 Apr 2020 20:04:49 +0000 (20:04 +0000)]
Merge branch 'openapi/domain-blocks' into 'develop'
Add OpenAPI spec for DomainBlockController
See merge request pleroma/pleroma!2376
Egor Kislitsyn [Mon, 13 Apr 2020 18:44:52 +0000 (22:44 +0400)]
Add OpenAPI spec for DomainBlockController
Maksim Pechnikov [Mon, 13 Apr 2020 18:19:27 +0000 (21:19 +0300)]
Merge branch 'develop' into issue/1276
rinpatch [Mon, 13 Apr 2020 13:05:40 +0000 (13:05 +0000)]
Merge branch 'output-of-relationships-in-statuses' into 'develop'
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications
See merge request pleroma/pleroma!2342
Ivan Tashkinov [Mon, 13 Apr 2020 12:38:50 +0000 (15:38 +0300)]
[#2342] Removed description.exs entry for temporary configuration option.
Ivan Tashkinov [Mon, 13 Apr 2020 06:16:51 +0000 (09:16 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
Ivan Tashkinov [Mon, 13 Apr 2020 06:16:35 +0000 (09:16 +0300)]
[#2342] Removed changelog entry for temporary configuration option.
Alexander Strizhakov [Mon, 13 Apr 2020 05:59:06 +0000 (08:59 +0300)]
changelog entry
Alexander Strizhakov [Fri, 10 Apr 2020 11:42:52 +0000 (14:42 +0300)]
fix for logger configuration through admin-fe
rinpatch [Sun, 12 Apr 2020 16:00:15 +0000 (16:00 +0000)]
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'
Fix mix tasks failing on OTP releases
Closes #1678
See merge request pleroma/pleroma!2369
rinpatch [Sun, 12 Apr 2020 15:49:31 +0000 (18:49 +0300)]
Fix mix tasks failing on OTP releases
No idea why this was even added.
Closes #1678
rinpatch [Sat, 11 Apr 2020 19:46:04 +0000 (19:46 +0000)]
Merge branch 'following-relationships-optimizations' into 'develop'
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
rinpatch [Sat, 11 Apr 2020 10:04:02 +0000 (10:04 +0000)]
Merge branch 'support/update_oban' into 'develop'
[#1555] updated the Oban package
See merge request pleroma/pleroma!2346
Maksim Pechnikov [Fri, 10 Apr 2020 18:27:50 +0000 (21:27 +0300)]
fix Oban migration
Maksim Pechnikov [Fri, 10 Apr 2020 18:27:41 +0000 (21:27 +0300)]
Merge branch 'develop' into support/update_oban
feld [Fri, 10 Apr 2020 16:56:41 +0000 (16:56 +0000)]
Merge branch 'chore/changelog-organization' into 'develop'
Add a section for changelog entries that pertain to the next patch release.
See merge request pleroma/pleroma!2366
Mark Felder [Fri, 10 Apr 2020 16:37:02 +0000 (11:37 -0500)]
Add a section for changelog entries that pertain to the next patch release.
This will make it easier to keep changelogs synced between develop and stable branches.
Haelwenn [Fri, 10 Apr 2020 12:12:49 +0000 (12:12 +0000)]
Merge branch 'fix/support-conversations-pagination' into 'develop'
Support pagination in conversations
See merge request pleroma/pleroma!2329
Egor Kislitsyn [Fri, 10 Apr 2020 10:18:57 +0000 (14:18 +0400)]
Merge branch 'develop' into fix/support-conversations-pagination
Haelwenn [Fri, 10 Apr 2020 05:15:11 +0000 (05:15 +0000)]
Merge branch 'chore/fix-changelog' into 'develop'
Chore/fix changelog
See merge request pleroma/pleroma!2364
Haelwenn [Fri, 10 Apr 2020 04:31:13 +0000 (04:31 +0000)]
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
Maksim Pechnikov [Fri, 10 Apr 2020 04:09:28 +0000 (07:09 +0300)]
Merge branch 'develop' into support/update_oban
Haelwenn [Fri, 10 Apr 2020 03:55:54 +0000 (03:55 +0000)]
Merge branch 'fix-otp-version-file-in-docker' into 'develop'
Create OTP_VERSION file by `mix release`
See merge request pleroma/pleroma!2362
kPherox [Thu, 9 Apr 2020 23:19:41 +0000 (23:19 +0000)]
Rename function
rinpatch [Tue, 7 Apr 2020 21:39:55 +0000 (00:39 +0300)]
CHANGELOG.md: update 2.0.2 release date
rinpatch [Tue, 7 Apr 2020 21:38:48 +0000 (00:38 +0300)]
CHANGELOG.md: add 2.0.2 update notes
rinpatch [Thu, 2 Apr 2020 20:37:14 +0000 (23:37 +0300)]
CHANGELOG.md: add entries for funkwhale-related changes
rinpatch [Tue, 31 Mar 2020 10:59:26 +0000 (13:59 +0300)]
CHANGELOG.md: Add 2.0.2 entry
rinpatch [Sun, 15 Mar 2020 21:50:03 +0000 (00:50 +0300)]
CHANGELOG.md: Add upgrade notes for 2.0.1
rinpatch [Sun, 15 Mar 2020 14:26:58 +0000 (17:26 +0300)]
changelog.md: add 2.0.1 entry
rinpatch [Thu, 9 Apr 2020 19:49:10 +0000 (19:49 +0000)]
Merge branch 'update-changelog' into 'develop'
Update CHANGELOG
See merge request pleroma/pleroma!2363
Egor Kislitsyn [Thu, 9 Apr 2020 19:36:17 +0000 (23:36 +0400)]
Update CHANGELOG
feld [Thu, 9 Apr 2020 19:32:11 +0000 (19:32 +0000)]
Merge branch 'notifications-dismiss-api' into 'develop'
Add `/api/v1/notifications/:id/dismiss` endpoint
Closes #1673
See merge request pleroma/pleroma!2360
kPherox [Thu, 9 Apr 2020 15:19:09 +0000 (00:19 +0900)]
Create OTP_VERSION file by `mix release`
lain [Thu, 9 Apr 2020 14:12:08 +0000 (14:12 +0000)]
Merge branch 'fix-otp-version-file-in-docker' into 'develop'
Add OTP_VERSION file to docker
Closes #1662
See merge request pleroma/pleroma!2361
Egor Kislitsyn [Thu, 9 Apr 2020 13:08:43 +0000 (17:08 +0400)]
Add `/api/v1/notifications/:id/dismiss` endpoint
kPherox [Thu, 9 Apr 2020 12:16:29 +0000 (21:16 +0900)]
Fix OTP_VERSION file in docker
lain [Thu, 9 Apr 2020 10:42:43 +0000 (10:42 +0000)]
Merge branch 'fix/1658-invite-send' into 'develop'
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
Alexander Strizhakov [Thu, 9 Apr 2020 10:28:54 +0000 (13:28 +0300)]
typo fix
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:50 +0000 (10:17 +0000)]
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:44 +0000 (10:17 +0000)]
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:36 +0000 (10:17 +0000)]
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:31 +0000 (10:17 +0000)]
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:24 +0000 (10:17 +0000)]
Apply suggestion to docs/API/admin_api.md
lain [Thu, 9 Apr 2020 09:48:56 +0000 (09:48 +0000)]
Merge branch 'open-api' into 'develop'
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
lain [Thu, 9 Apr 2020 09:47:07 +0000 (09:47 +0000)]
Merge branch 'formatter-html-safe' into 'develop'
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
Haelwenn [Thu, 9 Apr 2020 05:11:10 +0000 (05:11 +0000)]
Merge branch 'changelog-update' into 'develop'
No changelog entry - bug fixed only in develop
See merge request pleroma/pleroma!2359
Alexander Strizhakov [Thu, 9 Apr 2020 05:03:21 +0000 (08:03 +0300)]
no changelog entry - bug fixed only in develop
Haelwenn [Thu, 9 Apr 2020 02:43:03 +0000 (02:43 +0000)]
Merge branch 'bugfix/objectid_validator' into 'develop'
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
See merge request pleroma/pleroma!2358
Haelwenn (lanodan) Monnier [Thu, 9 Apr 2020 02:36:39 +0000 (04:36 +0200)]
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
rinpatch [Wed, 8 Apr 2020 19:58:31 +0000 (22:58 +0300)]
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
feld [Wed, 8 Apr 2020 17:13:54 +0000 (17:13 +0000)]
Merge branch 'gun-pool-fix' into 'develop'
Fix for gun connections pool
Closes #1669 and #1664
See merge request pleroma/pleroma!2356
Alexander Strizhakov [Wed, 8 Apr 2020 15:46:01 +0000 (18:46 +0300)]
fix for gun connections pool
rinpatch [Tue, 7 Apr 2020 11:41:10 +0000 (11:41 +0000)]
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
Maksim Pechnikov [Tue, 7 Apr 2020 11:09:43 +0000 (14:09 +0300)]
Merge branch 'develop' into issue/1276
kPherox [Tue, 7 Apr 2020 08:44:53 +0000 (08:44 +0000)]
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
Egor Kislitsyn [Fri, 3 Apr 2020 18:52:25 +0000 (22:52 +0400)]
Add Pleroma.Web.ApiSpec.Helpers
lain [Mon, 6 Apr 2020 12:51:35 +0000 (12:51 +0000)]
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
lain [Mon, 6 Apr 2020 12:49:17 +0000 (12:49 +0000)]
Merge branch 'improving-test-coverage' into 'develop'
Tests for emoji mix task
See merge request pleroma/pleroma!2350
lain [Mon, 6 Apr 2020 11:59:01 +0000 (11:59 +0000)]
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
lain [Mon, 6 Apr 2020 11:53:24 +0000 (13:53 +0200)]
ObjectID Validator: Refactor.
lain [Mon, 6 Apr 2020 11:46:34 +0000 (13:46 +0200)]
Transmogrifier: Refactoring / Renaming.
Alexander Strizhakov [Mon, 6 Apr 2020 11:27:20 +0000 (14:27 +0300)]
using another fn for file deletion
Alexander Strizhakov [Mon, 6 Apr 2020 07:45:25 +0000 (10:45 +0300)]
tests for emoji mix task
feld [Thu, 2 Apr 2020 19:36:55 +0000 (19:36 +0000)]
Merge branch 'fix/docs-markdown' into 'develop'
Fix formatting in documentation
See merge request pleroma/pleroma!2348
Egor Kislitsyn [Thu, 2 Apr 2020 19:01:29 +0000 (23:01 +0400)]
Fix formatting in documentation
feld [Thu, 2 Apr 2020 16:48:47 +0000 (16:48 +0000)]
Merge branch '2323-accounts-relationships-hotfix' into 'develop'
[#2323] Fixed /accounts/relationships
Closes pleroma-fe#820
See merge request pleroma/pleroma!2347
Ivan Tashkinov [Thu, 2 Apr 2020 16:38:39 +0000 (19:38 +0300)]
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
Ivan Tashkinov [Thu, 2 Apr 2020 16:23:30 +0000 (19:23 +0300)]
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
Egor Kislitsyn [Thu, 2 Apr 2020 13:33:23 +0000 (17:33 +0400)]
Add oAuth
Maksim Pechnikov [Thu, 2 Apr 2020 11:47:17 +0000 (14:47 +0300)]
Merge branch 'develop' into issue/1276
Maksim Pechnikov [Thu, 2 Apr 2020 06:34:11 +0000 (09:34 +0300)]
update Oban package
Egor Kislitsyn [Wed, 1 Apr 2020 19:00:59 +0000 (23:00 +0400)]
Add OpenAPI
Alexander Strizhakov [Wed, 1 Apr 2020 17:26:33 +0000 (20:26 +0300)]
error improvement for email_invite endpoint
feld [Wed, 1 Apr 2020 17:12:59 +0000 (17:12 +0000)]
Merge branch 'update/adminfe-
20200331' into 'develop'
Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343
Ivan Tashkinov [Wed, 1 Apr 2020 17:08:14 +0000 (20:08 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
# CHANGELOG.md
feld [Wed, 1 Apr 2020 17:05:09 +0000 (17:05 +0000)]
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
Ivan Tashkinov [Wed, 1 Apr 2020 16:49:09 +0000 (19:49 +0300)]
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
projects / akkoma / log