Mark Felder [Fri, 3 Jul 2020 22:19:43 +0000 (17:19 -0500)]
Document the Captcha CSP fix
Mark Felder [Fri, 3 Jul 2020 22:18:22 +0000 (17:18 -0500)]
Rename function and clarify that CSP is only strict with MediaProxy enabled
Mark Felder [Fri, 3 Jul 2020 22:06:20 +0000 (17:06 -0500)]
Add Captcha endpoint to CSP headers when MediaProxy is enabled.
Our CSP rules are lax when MediaProxy enabled, but lenient otherwise.
This fixes broken captcha on instances not using MediaProxy.
lain [Fri, 3 Jul 2020 15:06:33 +0000 (15:06 +0000)]
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
lain [Fri, 3 Jul 2020 14:59:12 +0000 (14:59 +0000)]
Merge branch '1912-leading-trailing-space-search' into 'develop'
SearchController: Trim query.
Closes #1912
See merge request pleroma/pleroma!2717
lain [Fri, 3 Jul 2020 14:46:11 +0000 (16:46 +0200)]
Update changelog
lain [Fri, 3 Jul 2020 14:44:31 +0000 (16:44 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
lain [Fri, 3 Jul 2020 14:38:22 +0000 (14:38 +0000)]
Merge branch '1892-exclude-bots-from-search-results' into 'develop'
[#1892] Exclusion of service actors from user search results
Closes #1892
See merge request pleroma/pleroma!2708
lain [Fri, 3 Jul 2020 14:36:55 +0000 (16:36 +0200)]
SearchController: Trim query.
rinpatch [Fri, 3 Jul 2020 10:44:19 +0000 (10:44 +0000)]
Merge branch '1910-migration-fix' into 'develop'
Notification Backfill: Explicitly select the needed fields.
Closes #1910
See merge request pleroma/pleroma!2715
lain [Fri, 3 Jul 2020 09:25:12 +0000 (11:25 +0200)]
Notification Backfill: Explicitly select the needed fields.
Prevents a crashing migration when we change user fields.
Ivan Tashkinov [Fri, 3 Jul 2020 08:02:15 +0000 (11:02 +0300)]
[#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.
feld [Thu, 2 Jul 2020 19:44:05 +0000 (19:44 +0000)]
Merge branch 'feature/1885-MRF-metadata' into 'develop'
Feature/1885 mrf metadata
Closes #1885
See merge request pleroma/pleroma!2693
feld [Thu, 2 Jul 2020 18:12:03 +0000 (18:12 +0000)]
Merge branch 'activation-meta' into 'develop'
Add more FE-required fields to /api/v1/instance
See merge request pleroma/pleroma!2613
Mark Felder [Thu, 2 Jul 2020 18:01:22 +0000 (13:01 -0500)]
Merge branch 'develop' into activation-meta
Mark Felder [Thu, 2 Jul 2020 17:59:45 +0000 (12:59 -0500)]
Document the new API extension of /api/v1/instance
Mark Felder [Thu, 2 Jul 2020 17:55:08 +0000 (12:55 -0500)]
Remove camelCase from the keys
Mark Felder [Thu, 2 Jul 2020 15:33:27 +0000 (10:33 -0500)]
Lint, long lines
Mark Felder [Thu, 2 Jul 2020 15:27:15 +0000 (10:27 -0500)]
Improve descriptions, move primary MRF settings to top for AdminFE ordering
Mark Felder [Thu, 2 Jul 2020 15:16:19 +0000 (10:16 -0500)]
Update AdminFE build to utilize new MRF metadata
Mark Felder [Thu, 2 Jul 2020 14:57:57 +0000 (09:57 -0500)]
Merge branch 'develop' into feature/1885-MRF-metadata
rinpatch [Thu, 2 Jul 2020 10:17:51 +0000 (10:17 +0000)]
Merge branch 'fetcher-fixes' into 'develop'
Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711
rinpatch [Thu, 2 Jul 2020 10:08:42 +0000 (10:08 +0000)]
Merge branch '1907-fix-announce-streaming' into 'develop'
Resolve "Streaming API: Repeats of your posts from random people are pushed to the timeline"
Closes #1907
See merge request pleroma/pleroma!2714
lain [Thu, 2 Jul 2020 08:43:32 +0000 (08:43 +0000)]
Merge branch 'feature/update-description' into 'develop'
Update settings descriptions and labels
See merge request pleroma/pleroma!2709
lain [Thu, 2 Jul 2020 07:57:31 +0000 (09:57 +0200)]
Credo fixes.
lain [Thu, 2 Jul 2020 07:54:48 +0000 (09:54 +0200)]
Changelog: Update with stream changes.
lain [Thu, 2 Jul 2020 07:50:26 +0000 (09:50 +0200)]
Streamer: Align announce streaming with polling.
lain [Thu, 2 Jul 2020 07:33:50 +0000 (09:33 +0200)]
SideEffects: Refactor.
rinpatch [Wed, 1 Jul 2020 13:51:23 +0000 (13:51 +0000)]
Merge branch '1716-handle-nickname-clashes' into 'develop'
ActivityPub: Handle clashing nicknames for the same ap id
Closes #1716
See merge request pleroma/pleroma!2712
lain [Wed, 1 Jul 2020 10:26:07 +0000 (12:26 +0200)]
ActivityPub: Handle clashing nicknames for the same ap id
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
lain [Wed, 1 Jul 2020 09:48:51 +0000 (11:48 +0200)]
Fetcher: Work when we can't get the OP.
lain [Wed, 1 Jul 2020 09:47:45 +0000 (11:47 +0200)]
Fixtures: Pretty print.
lain [Wed, 1 Jul 2020 09:18:02 +0000 (09:18 +0000)]
Merge branch 'revert-
651f2695' into 'develop'
Revert "Merge branch 'avatar-removing' into 'develop'"
See merge request pleroma/pleroma!2710
lain [Wed, 1 Jul 2020 08:51:56 +0000 (08:51 +0000)]
Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
Angelina Filippova [Wed, 1 Jul 2020 00:01:15 +0000 (03:01 +0300)]
Add labels, update descriptions and labels
Haelwenn [Tue, 30 Jun 2020 20:51:10 +0000 (20:51 +0000)]
Merge branch 'chore/rename-user-settings-column' into 'develop'
Rename user.settings column
See merge request pleroma/pleroma!2707
Mark Felder [Tue, 30 Jun 2020 20:25:10 +0000 (15:25 -0500)]
Add fields limits to instance metadata, add tests
Mark Felder [Tue, 30 Jun 2020 20:09:03 +0000 (15:09 -0500)]
Merge branch 'develop' into activation-meta
Ivan Tashkinov [Tue, 30 Jun 2020 18:26:39 +0000 (21:26 +0300)]
[#1892] Excluded bot actors (applications, services) from search results.
Mark Felder [Tue, 30 Jun 2020 16:50:53 +0000 (11:50 -0500)]
Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
lain [Tue, 30 Jun 2020 10:52:55 +0000 (10:52 +0000)]
Merge branch 'preloadfixups' into 'develop'
Some fixups for the preload.
See merge request pleroma/pleroma!2692
lain [Tue, 30 Jun 2020 09:55:58 +0000 (11:55 +0200)]
Credo fixes
lain [Tue, 30 Jun 2020 09:40:34 +0000 (11:40 +0200)]
Merge branch 'preload-fixups-2' into preloadfixups
lain [Tue, 30 Jun 2020 09:35:54 +0000 (11:35 +0200)]
Preload: Load the correct instance panel
lain [Tue, 30 Jun 2020 08:42:45 +0000 (08:42 +0000)]
Merge branch 'patch-1' into 'develop'
Use correct PostgreSQL version command in bug template
See merge request pleroma/pleroma!2706
normandy [Tue, 30 Jun 2020 03:12:30 +0000 (03:12 +0000)]
Use correct PostgreSQL version command in bug template
rinpatch [Mon, 29 Jun 2020 18:06:25 +0000 (18:06 +0000)]
Merge branch 'fix-notification-filtering' into 'develop'
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
lain [Mon, 29 Jun 2020 16:04:14 +0000 (16:04 +0000)]
Apply suggestion to lib/pleroma/notification.ex
lain [Mon, 29 Jun 2020 15:59:40 +0000 (15:59 +0000)]
Merge branch 'fix/cast-and-validate' into 'develop'
Fix CastAndValidate plug
Closes #1889
See merge request pleroma/pleroma!2704
lain [Mon, 29 Jun 2020 15:52:56 +0000 (17:52 +0200)]
Notification: Remove TODO.
lain [Mon, 29 Jun 2020 15:48:18 +0000 (17:48 +0200)]
Notifications: Never return `nil` in the notification list.
Egor Kislitsyn [Mon, 29 Jun 2020 15:47:04 +0000 (19:47 +0400)]
Test default "content-type" for CastAndValidate
feld [Mon, 29 Jun 2020 15:24:39 +0000 (15:24 +0000)]
Merge branch 'fix/swoosh-sendmail' into 'develop'
updated swoosh
See merge request pleroma/pleroma!2703
Egor Kislitsyn [Mon, 29 Jun 2020 13:33:00 +0000 (17:33 +0400)]
Fix CastAndValidate plug
Maksim Pechnikov [Mon, 29 Jun 2020 13:22:54 +0000 (16:22 +0300)]
updated swoosh
lain [Mon, 29 Jun 2020 12:44:58 +0000 (12:44 +0000)]
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
excluding attachment links from RichMedia
See merge request pleroma/pleroma!2702
Alexander Strizhakov [Mon, 29 Jun 2020 12:25:57 +0000 (15:25 +0300)]
excluding attachment links from RichMedia
lain [Mon, 29 Jun 2020 11:16:30 +0000 (11:16 +0000)]
Merge branch 'avatar-removing' into 'develop'
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
lain [Mon, 29 Jun 2020 10:40:23 +0000 (12:40 +0200)]
UpdateCredentialsTest: Add test for removing profile images.
lain [Mon, 29 Jun 2020 09:41:00 +0000 (11:41 +0200)]
Preloaders: Use strings as keys.
lain [Mon, 29 Jun 2020 09:06:20 +0000 (11:06 +0200)]
User preloader: Put user info at correct key
lain [Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)]
Merge branch '1031-parent-visible' into 'develop'
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
lain [Mon, 29 Jun 2020 08:32:56 +0000 (08:32 +0000)]
Merge branch 'openapi/schema-account-pleromafields' into 'develop'
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
See merge request pleroma/pleroma!2700
Haelwenn (lanodan) Monnier [Mon, 29 Jun 2020 01:31:33 +0000 (03:31 +0200)]
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
Haelwenn [Mon, 29 Jun 2020 00:56:02 +0000 (00:56 +0000)]
Merge branch 'docs/mastoapi-account-fields' into 'develop'
differences_in_mastoapi_responses: Update account fields
See merge request pleroma/pleroma!2699
Haelwenn (lanodan) Monnier [Mon, 29 Jun 2020 00:39:26 +0000 (02:39 +0200)]
differences_in_mastoapi_responses: Update account fields
lain [Sat, 27 Jun 2020 10:40:29 +0000 (10:40 +0000)]
Merge branch 'reduce-preloading-defaults' into 'develop'
Config: Reduce default preloaders to configuration endpoints.
See merge request pleroma/pleroma!2697
lain [Sat, 27 Jun 2020 10:18:37 +0000 (12:18 +0200)]
Config: Reduce default preloaders to configuration endpoints.
Fetching the timeline is a bit heavy to do by default.
lain [Sat, 27 Jun 2020 09:41:35 +0000 (09:41 +0000)]
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'
object/fetcher: Pass full Transmogrifier error
See merge request pleroma/pleroma!2696
Alexander Strizhakov [Sat, 27 Jun 2020 09:18:34 +0000 (12:18 +0300)]
added tab & labels for mrf policies
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 18:10:47 +0000 (20:10 +0200)]
object/fetcher: Pass full Transmogrifier error
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 05:16:24 +0000 (07:16 +0200)]
MastoAPI: Show source field when deleting
Haelwenn [Fri, 26 Jun 2020 17:41:00 +0000 (17:41 +0000)]
Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
Haelwenn [Fri, 26 Jun 2020 16:59:46 +0000 (16:59 +0000)]
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
lain [Fri, 26 Jun 2020 12:48:23 +0000 (14:48 +0200)]
Preloading: Fix nodeinfo url.
lain [Fri, 26 Jun 2020 12:47:38 +0000 (14:47 +0200)]
Preloading: Return correct data for statusnet stuff.
Alexander Strizhakov [Fri, 26 Jun 2020 12:22:08 +0000 (15:22 +0300)]
additional data to MRF policies in descriptions
lain [Fri, 26 Jun 2020 11:09:37 +0000 (11:09 +0000)]
Merge branch 'fix-chats' into 'develop'
Nodeinfo: Add chat information back in.
See merge request pleroma/pleroma!2691
lain [Fri, 26 Jun 2020 11:04:15 +0000 (13:04 +0200)]
Nodeinfo: Add chat information back in.
lain [Fri, 26 Jun 2020 10:06:00 +0000 (12:06 +0200)]
User: Don't unfollow on block when the relevant setting is set.
lain [Fri, 26 Jun 2020 09:58:40 +0000 (11:58 +0200)]
BlockValidator: Restore old behavior for incoming blocks.
Alexander Strizhakov [Fri, 26 Jun 2020 06:03:07 +0000 (09:03 +0300)]
Pleroma.Upload.Filter.Mogrify args description
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 03:39:35 +0000 (05:39 +0200)]
activity_draft: Add source field
Haelwenn [Fri, 26 Jun 2020 03:48:25 +0000 (03:48 +0000)]
Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'
nodeinfo: Fix MRF transparency
See merge request pleroma/pleroma!2689
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 03:33:59 +0000 (05:33 +0200)]
nodeinfo: Fix MRF transparency
feld [Thu, 25 Jun 2020 21:35:39 +0000 (21:35 +0000)]
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
feld [Thu, 25 Jun 2020 21:25:02 +0000 (21:25 +0000)]
Merge branch 'mastoapi-omitted' into 'develop'
MastoAPI differences: Document not implemented features
See merge request pleroma/pleroma!2687
feld [Thu, 25 Jun 2020 20:09:19 +0000 (20:09 +0000)]
Merge branch 'update/admin-fe-
20200625' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2688
Mark Felder [Thu, 25 Jun 2020 19:55:00 +0000 (14:55 -0500)]
Update AdminFE build
Alex Gleason [Thu, 25 Jun 2020 17:32:06 +0000 (12:32 -0500)]
MastoAPI differences: Document not implemented features
lain [Thu, 25 Jun 2020 10:42:57 +0000 (10:42 +0000)]
Merge branch 'chore/remove-reference-to-distsn' into 'develop'
Remove reference to defunct distsn.org
See merge request pleroma/pleroma!2675
lain [Thu, 25 Jun 2020 10:40:39 +0000 (12:40 +0200)]
AntiSpamLinkPolicy: Exempt local users.
lain [Thu, 25 Jun 2020 10:17:16 +0000 (10:17 +0000)]
Apply suggestion to config/description.exs
lain [Thu, 25 Jun 2020 10:14:19 +0000 (10:14 +0000)]
Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
lain [Thu, 25 Jun 2020 10:03:14 +0000 (12:03 +0200)]
Blocking: Don't federate if the options is set.
lain [Thu, 25 Jun 2020 09:51:33 +0000 (11:51 +0200)]
ActivityPub: Remove `block`.
lain [Thu, 25 Jun 2020 09:44:04 +0000 (11:44 +0200)]
AccountController: Extract blocking to CommonAPI.
lain [Thu, 25 Jun 2020 09:33:54 +0000 (11:33 +0200)]
Transmogrifier: Switch to pipeline for Blocks.
lain [Thu, 25 Jun 2020 09:13:35 +0000 (11:13 +0200)]
ObjectValidator: Basic `Block` support.
lain [Thu, 25 Jun 2020 08:54:00 +0000 (10:54 +0200)]
Transmogrifier Test: Extract block handling.
projects / akkoma / log