Haelwenn [Tue, 18 Aug 2020 19:02:33 +0000 (19:02 +0000)]
Merge branch '2064-image-blanking' into 'develop'
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
feld [Tue, 18 Aug 2020 15:57:43 +0000 (15:57 +0000)]
Merge branch 'improve/freebsd-rc-script' into 'develop'
Improve FreeBSD rc script
See merge request pleroma/pleroma!2901
Mark Felder [Tue, 18 Aug 2020 15:24:34 +0000 (10:24 -0500)]
Improve FreeBSD rc script
Passes rclint now, $HOME is dynamic, and properly matches process name for signalling shutdown.
lain [Tue, 18 Aug 2020 12:56:28 +0000 (12:56 +0000)]
Merge branch 'freebsd-docs' into 'develop'
FreeBSD installation process
See merge request pleroma/pleroma!2887
lain [Tue, 18 Aug 2020 12:56:07 +0000 (12:56 +0000)]
Merge branch 'chore/improve-descriptions' into 'develop'
Improve description for mediaproxy cache invalidation settings
See merge request pleroma/pleroma!2891
lain [Tue, 18 Aug 2020 12:37:35 +0000 (14:37 +0200)]
Test config: Default to filename for descriptions
lain [Tue, 18 Aug 2020 12:27:45 +0000 (12:27 +0000)]
Merge branch 'features/validators-audio' into 'develop'
Pipeline Ingestion: Audio
See merge request pleroma/pleroma!2897
lain [Tue, 18 Aug 2020 11:37:28 +0000 (13:37 +0200)]
Transmogrifier Test: Extract audio tests.
lain [Tue, 18 Aug 2020 11:31:42 +0000 (13:31 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
lain [Tue, 18 Aug 2020 11:31:13 +0000 (11:31 +0000)]
Merge branch 'purge-user' into 'develop'
Purge a local user upon deletion, fixes #2062
Closes #2062
See merge request pleroma/pleroma!2898
lain [Tue, 18 Aug 2020 11:24:39 +0000 (13:24 +0200)]
Changelog: Add info about upload description changes
lain [Tue, 18 Aug 2020 11:22:00 +0000 (13:22 +0200)]
Cheatsheet: Add information about filename descriptions
lain [Tue, 18 Aug 2020 11:21:30 +0000 (13:21 +0200)]
Pleroma.Upload: Set default upload name / description based on config.
lain [Tue, 18 Aug 2020 11:01:38 +0000 (11:01 +0000)]
Merge branch 'features/validators_use_ectotypes' into 'develop'
object_validators: Use ecto_types where available
See merge request pleroma/pleroma!2896
lain [Tue, 18 Aug 2020 10:38:13 +0000 (12:38 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
Alex Gleason [Tue, 18 Aug 2020 05:24:28 +0000 (00:24 -0500)]
Test that `POST /api/pleroma/delete_account` purges the user
Alex Gleason [Tue, 18 Aug 2020 05:10:09 +0000 (00:10 -0500)]
Test purging a user with User.delete/1
Alex Gleason [Tue, 18 Aug 2020 04:44:44 +0000 (23:44 -0500)]
Purge most user fields upon deletion, "right to be forgotten" #859
Alex Gleason [Tue, 18 Aug 2020 03:08:08 +0000 (22:08 -0500)]
Also purge bio and display name
Alex Gleason [Tue, 18 Aug 2020 02:52:28 +0000 (21:52 -0500)]
Purge a local user upon deletion, fixes #2062
Haelwenn (lanodan) Monnier [Tue, 18 Aug 2020 00:12:13 +0000 (02:12 +0200)]
common_fixes: Remove Utils.make_date call
Haelwenn (lanodan) Monnier [Tue, 18 Aug 2020 00:11:38 +0000 (02:11 +0200)]
common_fixes: Get fixes common from Audio and Question
Haelwenn (lanodan) Monnier [Mon, 17 Aug 2020 23:48:42 +0000 (01:48 +0200)]
Pipeline Ingestion: Audio
Haelwenn (lanodan) Monnier [Tue, 18 Aug 2020 00:01:40 +0000 (02:01 +0200)]
fetcher: fallback to [] when to/cc is nil
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2063
Haelwenn (lanodan) Monnier [Mon, 17 Aug 2020 21:46:42 +0000 (23:46 +0200)]
object_validators: Use ecto_types where available
lain [Mon, 17 Aug 2020 13:05:20 +0000 (13:05 +0000)]
Merge branch 'issue/1936' into 'develop'
[#1936] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
rinpatch [Mon, 17 Aug 2020 12:38:14 +0000 (12:38 +0000)]
Merge branch 'invisible-index' into 'develop'
Migrations: Add an index on the `invisible` field on users.
See merge request pleroma/pleroma!2895
lain [Mon, 17 Aug 2020 12:26:53 +0000 (12:26 +0000)]
Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy
Closes #2046
See merge request pleroma/pleroma!2890
lain [Mon, 17 Aug 2020 12:11:36 +0000 (14:11 +0200)]
Migrations: Add an index on the `invisible` field on users.
rinpatch [Mon, 17 Aug 2020 08:44:26 +0000 (08:44 +0000)]
Merge branch 'fix/start-ssl-if-ssl-required' into 'develop'
Start :ssl if not started when running migration or rollback
Closes #2056
See merge request pleroma/pleroma!2894
Hugo [Mon, 17 Aug 2020 07:58:24 +0000 (07:58 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Hugo Müller-Downing [Sun, 16 Aug 2020 04:02:33 +0000 (14:02 +1000)]
Start :ssl if not started when running migration or rollback
Maksim Pechnikov [Sun, 16 Aug 2020 03:54:48 +0000 (06:54 +0300)]
fix search media proxy urls
Ivan Tashkinov [Sat, 15 Aug 2020 15:30:20 +0000 (18:30 +0300)]
[#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
rinpatch [Sat, 15 Aug 2020 07:42:10 +0000 (07:42 +0000)]
Merge branch 'fix/docs-tabs' into 'develop'
Docs: Fix the way tabs are declared
Closes #2045
See merge request pleroma/pleroma!2892
rinpatch [Sat, 15 Aug 2020 06:49:12 +0000 (09:49 +0300)]
Docs: Fix the way tabs are declared
Since python doesn't have a way to lock deps for a particlar project
by default, I didn't bother with it. This resulted in mkdocs updating at
some point, bringing a breaking change to how tabs are declared and
broken tabs on docs-develop.pleroma.social. I've learned my lesson
and locked deps with pipenv in pleroma/docs!5. This MR updates Pleroma
docs to use the new tab style, fortunately my editor did most of it.
Closes #2045
feld [Fri, 14 Aug 2020 18:26:23 +0000 (18:26 +0000)]
Merge branch 'update/admin-fe-
20200814' into 'develop'
Update AdminFE bundle for 2.1.0 release
See merge request pleroma/pleroma!2889
Mark Felder [Fri, 14 Aug 2020 18:07:58 +0000 (13:07 -0500)]
Improve description for mediaproxy cache invalidation settings
Ivan Tashkinov [Fri, 14 Aug 2020 17:55:45 +0000 (20:55 +0300)]
[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
Mark Felder [Fri, 14 Aug 2020 17:48:49 +0000 (12:48 -0500)]
Update AdminFE bundle for 2.1.0 release
lain [Fri, 14 Aug 2020 17:15:59 +0000 (17:15 +0000)]
Merge branch '1806-mogrifun' into 'develop'
Mogrifun: Add a line about the purpose of the module.
Closes #1806
See merge request pleroma/pleroma!2888
lain [Fri, 14 Aug 2020 16:27:18 +0000 (18:27 +0200)]
Mogrifun: Add a line about the purpose of the module.
Farhan Khan [Fri, 14 Aug 2020 04:21:42 +0000 (00:21 -0400)]
minor changes
Farhan Khan [Fri, 14 Aug 2020 02:49:50 +0000 (22:49 -0400)]
Removed a trailing comment
Farhan Khan [Fri, 14 Aug 2020 02:38:23 +0000 (22:38 -0400)]
Updates
Farhan Khan [Fri, 14 Aug 2020 02:18:33 +0000 (22:18 -0400)]
more acme.sh updates
Farhan Khan [Fri, 14 Aug 2020 01:24:08 +0000 (21:24 -0400)]
acme updates
Farhan Khan [Fri, 14 Aug 2020 00:58:46 +0000 (20:58 -0400)]
Rearranging acme
Farhan Khan [Thu, 13 Aug 2020 23:34:04 +0000 (19:34 -0400)]
Added comment
Farhan Khan [Thu, 13 Aug 2020 23:08:13 +0000 (19:08 -0400)]
Minor patch update
Farhan Khan [Fri, 7 Aug 2020 01:52:39 +0000 (01:52 +0000)]
acme.sh and netbsd to freebsd updates
Farhan Khan [Fri, 7 Aug 2020 01:04:33 +0000 (01:04 +0000)]
Updated some more instruction specifics.
Farhan Khan [Thu, 6 Aug 2020 23:35:33 +0000 (23:35 +0000)]
Updated ssl and domain name updates
Removed the reference to niaa
Farhan Khan [Thu, 6 Aug 2020 23:24:12 +0000 (23:24 +0000)]
Minor reorganization
Farhan Khan [Thu, 6 Aug 2020 04:01:57 +0000 (00:01 -0400)]
Adding installation documentation for FreeBSD + rc.d script
feld [Thu, 13 Aug 2020 21:35:40 +0000 (21:35 +0000)]
Merge branch 'issue/2036-part-2' into 'develop'
[#2036] fixed cron worker
See merge request pleroma/pleroma!2886
Maksim Pechnikov [Thu, 13 Aug 2020 18:01:54 +0000 (21:01 +0300)]
fix cron wroker
Maksim Pechnikov [Thu, 13 Aug 2020 18:01:21 +0000 (21:01 +0300)]
fix Cron.PurgeExpiredActivitiesWorker
feld [Thu, 13 Aug 2020 17:38:19 +0000 (17:38 +0000)]
Merge branch 'fix/activity-expirations-again' into 'develop'
Fix activity expirations again
See merge request pleroma/pleroma!2866
Haelwenn [Thu, 13 Aug 2020 16:11:06 +0000 (16:11 +0000)]
Merge branch 'nitfix/side-effects-typo' into 'develop'
side_effects: Fix typo on notification
See merge request pleroma/pleroma!2885
Haelwenn (lanodan) Monnier [Thu, 13 Aug 2020 16:10:43 +0000 (18:10 +0200)]
side_effects: Fix typo on notification
Haelwenn [Thu, 13 Aug 2020 16:04:43 +0000 (16:04 +0000)]
Merge branch 'reject' into 'develop'
Move Accepts and Rejects to the Pipeline
See merge request pleroma/pleroma!2878
lain [Thu, 13 Aug 2020 14:40:31 +0000 (14:40 +0000)]
Merge branch 'ci-fix-2' into 'develop'
CI: Add cmake to build
See merge request pleroma/pleroma!2884
lain [Thu, 13 Aug 2020 14:38:04 +0000 (16:38 +0200)]
CI: Add cmake to build
lain [Thu, 13 Aug 2020 14:07:01 +0000 (14:07 +0000)]
Merge branch 'update-frontend-2020-08-13' into 'develop'
Update frontend
See merge request pleroma/pleroma!2883
lain [Thu, 13 Aug 2020 14:04:34 +0000 (16:04 +0200)]
Update frontend
lain [Thu, 13 Aug 2020 12:28:10 +0000 (12:28 +0000)]
Merge branch 'cmake' into 'develop'
Build files: Add cmake
See merge request pleroma/pleroma!2882
lain [Thu, 13 Aug 2020 12:12:45 +0000 (14:12 +0200)]
Build files: Add cmake
lain [Thu, 13 Aug 2020 11:01:03 +0000 (11:01 +0000)]
Merge branch 'fix/users_ap_id_not_null' into 'develop'
Ensure ap_id column in users table cannot be null
See merge request pleroma/pleroma!2875
lain [Thu, 13 Aug 2020 10:32:05 +0000 (12:32 +0200)]
Migrations: Fix Logger requirements.
lain [Thu, 13 Aug 2020 09:06:33 +0000 (09:06 +0000)]
Merge branch '1152-deletion' into 'develop'
User deletion issue exploration
See merge request pleroma/pleroma!2879
Maksim Pechnikov [Thu, 13 Aug 2020 06:00:25 +0000 (09:00 +0300)]
Merge branch 'develop' into issue/1936
Alexander Strizhakov [Wed, 12 Aug 2020 17:01:21 +0000 (20:01 +0300)]
reverting pinned posts in filtering
Alexander Strizhakov [Wed, 12 Aug 2020 16:46:47 +0000 (19:46 +0300)]
don't load pinned activities in due_expirations
feld [Wed, 12 Aug 2020 16:39:19 +0000 (16:39 +0000)]
Merge branch 'docs_improve_static_dir_documentation' into 'develop'
Improve static_dir documentation
See merge request pleroma/pleroma!2864
feld [Wed, 12 Aug 2020 16:19:34 +0000 (16:19 +0000)]
Update robots_txt.md
feld [Wed, 12 Aug 2020 16:18:40 +0000 (16:18 +0000)]
Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
Update :welcome settings in description.exs
Closes #2024
See merge request pleroma/pleroma!2843
Mark Felder [Wed, 12 Aug 2020 16:13:24 +0000 (11:13 -0500)]
Add warning to the migration
Mark Felder [Wed, 12 Aug 2020 16:00:01 +0000 (11:00 -0500)]
Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.
Mark Felder [Wed, 12 Aug 2020 14:42:28 +0000 (09:42 -0500)]
Merge branch 'develop' into fix/activity-expirations-again
lain [Wed, 12 Aug 2020 14:31:00 +0000 (16:31 +0200)]
AdminApiControllerTest: Add test that `deleted` users get deactivated.
lain [Wed, 12 Aug 2020 13:07:46 +0000 (15:07 +0200)]
ActivityPub: Remove `reject`, move everything to the Pipeline.
lain [Wed, 12 Aug 2020 12:48:51 +0000 (14:48 +0200)]
Transmogrifier: Move Rejects to the Pipeline
Alexander Strizhakov [Wed, 12 Aug 2020 12:15:17 +0000 (15:15 +0300)]
don't expire pinned posts
lain [Wed, 12 Aug 2020 11:39:54 +0000 (13:39 +0200)]
Transmogrifier Tests: Extract rejections.
lain [Wed, 12 Aug 2020 10:53:04 +0000 (12:53 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
Alexander Strizhakov [Wed, 12 Aug 2020 09:41:47 +0000 (12:41 +0300)]
leave expirations with Create and Note types
Maksim Pechnikov [Wed, 12 Aug 2020 05:51:09 +0000 (08:51 +0300)]
update docs
rinpatch [Wed, 12 Aug 2020 03:30:01 +0000 (03:30 +0000)]
Merge branch 'issue/2036-job-monitor' into 'develop'
[#2036] fix job monitor
See merge request pleroma/pleroma!2877
Maksim Pechnikov [Tue, 11 Aug 2020 19:06:33 +0000 (22:06 +0300)]
fix job monitor
lain [Tue, 11 Aug 2020 17:22:14 +0000 (19:22 +0200)]
Linting fixes.
Mark Felder [Tue, 11 Aug 2020 16:28:22 +0000 (11:28 -0500)]
Ensure only Note objects are set to expire
lain [Tue, 11 Aug 2020 15:49:24 +0000 (17:49 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
lain [Tue, 11 Aug 2020 15:43:16 +0000 (17:43 +0200)]
ActivityPub: Remove ActivityPub.accept
Switch to the pipeline in CommonAPI and SideEffects
Mark Felder [Tue, 11 Aug 2020 14:52:28 +0000 (09:52 -0500)]
Ensure ap_id column in users table cannot be null
lain [Tue, 11 Aug 2020 15:26:01 +0000 (17:26 +0200)]
Transmogrifier: Handle accepts with the pipeline
lain [Tue, 11 Aug 2020 14:22:15 +0000 (16:22 +0200)]
Transmogrifier Test: Remove mastodon hack test.
lain [Tue, 11 Aug 2020 14:07:42 +0000 (16:07 +0200)]
Linter fixes.
lain [Tue, 11 Aug 2020 13:59:17 +0000 (13:59 +0000)]
Merge branch 'set-approval-pending-default-to-false' into 'develop'
Set `users.approval_pending` default to `false`
See merge request pleroma/pleroma!2874
lain [Tue, 11 Aug 2020 13:41:19 +0000 (15:41 +0200)]
Transmogrifier: Remove handling of orphaned accepts
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
projects / akkoma / log