akkoma
4 years agomore acme.sh updates
Farhan Khan [Fri, 14 Aug 2020 02:18:33 +0000 (22:18 -0400)]
more acme.sh updates

4 years agoacme updates
Farhan Khan [Fri, 14 Aug 2020 01:24:08 +0000 (21:24 -0400)]
acme updates

4 years agoRearranging acme
Farhan Khan [Fri, 14 Aug 2020 00:58:46 +0000 (20:58 -0400)]
Rearranging acme

4 years agoAdded comment
Farhan Khan [Thu, 13 Aug 2020 23:34:04 +0000 (19:34 -0400)]
Added comment

4 years agoMinor patch update
Farhan Khan [Thu, 13 Aug 2020 23:08:13 +0000 (19:08 -0400)]
Minor patch update

4 years agoacme.sh and netbsd to freebsd updates
Farhan Khan [Fri, 7 Aug 2020 01:52:39 +0000 (01:52 +0000)]
acme.sh and netbsd to freebsd updates

4 years agoUpdated some more instruction specifics.
Farhan Khan [Fri, 7 Aug 2020 01:04:33 +0000 (01:04 +0000)]
Updated some more instruction specifics.

4 years agoUpdated ssl and domain name updates
Farhan Khan [Thu, 6 Aug 2020 23:35:33 +0000 (23:35 +0000)]
Updated ssl and domain name updates
Removed the reference to niaa

4 years agoMinor reorganization
Farhan Khan [Thu, 6 Aug 2020 23:24:12 +0000 (23:24 +0000)]
Minor reorganization

4 years agoAdding installation documentation for FreeBSD + rc.d script
Farhan Khan [Thu, 6 Aug 2020 04:01:57 +0000 (00:01 -0400)]
Adding installation documentation for FreeBSD + rc.d script

4 years agoMerge branch 'issue/2036-part-2' into 'develop'
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

4 years agofix cron wroker
Maksim Pechnikov [Thu, 13 Aug 2020 18:01:54 +0000 (21:01 +0300)]
fix cron wroker

4 years agofix Cron.PurgeExpiredActivitiesWorker
Maksim Pechnikov [Thu, 13 Aug 2020 18:01:21 +0000 (21:01 +0300)]
fix Cron.PurgeExpiredActivitiesWorker

4 years agoMerge branch 'fix/activity-expirations-again' into 'develop'
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

4 years agoMerge branch 'nitfix/side-effects-typo' into 'develop'
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

4 years agoside_effects: Fix typo on notification
Haelwenn (lanodan) Monnier [Thu, 13 Aug 2020 16:10:43 +0000 (18:10 +0200)]
side_effects: Fix typo on notification

4 years agoMerge branch 'reject' into 'develop'
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

4 years agoMerge branch 'ci-fix-2' into 'develop'
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

4 years agoCI: Add cmake to build
lain [Thu, 13 Aug 2020 14:38:04 +0000 (16:38 +0200)]
CI: Add cmake to build

4 years agoMerge branch 'update-frontend-2020-08-13' into 'develop'
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

4 years agoUpdate frontend
lain [Thu, 13 Aug 2020 14:04:34 +0000 (16:04 +0200)]
Update frontend

4 years agoMerge branch 'cmake' into 'develop'
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

4 years agoBuild files: Add cmake
lain [Thu, 13 Aug 2020 12:12:45 +0000 (14:12 +0200)]
Build files: Add cmake

4 years agoMerge branch 'fix/users_ap_id_not_null' into 'develop'
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

4 years agoMigrations: Fix Logger requirements.
lain [Thu, 13 Aug 2020 10:32:05 +0000 (12:32 +0200)]
Migrations: Fix Logger requirements.

4 years agoMerge branch '1152-deletion' into 'develop'
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

4 years agoreverting pinned posts in filtering
Alexander Strizhakov [Wed, 12 Aug 2020 17:01:21 +0000 (20:01 +0300)]
reverting pinned posts in filtering

4 years agodon't load pinned activities in due_expirations
Alexander Strizhakov [Wed, 12 Aug 2020 16:46:47 +0000 (19:46 +0300)]
don't load pinned activities in due_expirations

4 years agoMerge branch 'docs_improve_static_dir_documentation' into 'develop'
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

4 years agoUpdate robots_txt.md
feld [Wed, 12 Aug 2020 16:19:34 +0000 (16:19 +0000)]
Update robots_txt.md

4 years agoMerge branch 'feature/update-welcome-setting-in-description' into 'develop'
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

4 years agoAdd warning to the migration
Mark Felder [Wed, 12 Aug 2020 16:13:24 +0000 (11:13 -0500)]
Add warning to the migration

4 years agoAdd the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.
Mark Felder [Wed, 12 Aug 2020 16:00:01 +0000 (11:00 -0500)]
Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.

4 years agoMerge branch 'develop' into fix/activity-expirations-again
Mark Felder [Wed, 12 Aug 2020 14:42:28 +0000 (09:42 -0500)]
Merge branch 'develop' into fix/activity-expirations-again

4 years agoAdminApiControllerTest: Add test that `deleted` users get deactivated.
lain [Wed, 12 Aug 2020 14:31:00 +0000 (16:31 +0200)]
AdminApiControllerTest: Add test that `deleted` users get deactivated.

4 years agoActivityPub: Remove `reject`, move everything to the Pipeline.
lain [Wed, 12 Aug 2020 13:07:46 +0000 (15:07 +0200)]
ActivityPub: Remove `reject`, move everything to the Pipeline.

4 years agoTransmogrifier: Move Rejects to the Pipeline
lain [Wed, 12 Aug 2020 12:48:51 +0000 (14:48 +0200)]
Transmogrifier: Move Rejects to the Pipeline

4 years agodon't expire pinned posts
Alexander Strizhakov [Wed, 12 Aug 2020 12:15:17 +0000 (15:15 +0300)]
don't expire pinned posts

4 years agoTransmogrifier Tests: Extract rejections.
lain [Wed, 12 Aug 2020 11:39:54 +0000 (13:39 +0200)]
Transmogrifier Tests: Extract rejections.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
lain [Wed, 12 Aug 2020 10:53:04 +0000 (12:53 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject

4 years agoleave expirations with Create and Note types
Alexander Strizhakov [Wed, 12 Aug 2020 09:41:47 +0000 (12:41 +0300)]
leave expirations with Create and Note types

4 years agoMerge branch 'issue/2036-job-monitor' into 'develop'
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

4 years agofix job monitor
Maksim Pechnikov [Tue, 11 Aug 2020 19:06:33 +0000 (22:06 +0300)]
fix job monitor

4 years agoLinting fixes.
lain [Tue, 11 Aug 2020 17:22:14 +0000 (19:22 +0200)]
Linting fixes.

4 years agoEnsure only Note objects are set to expire
Mark Felder [Tue, 11 Aug 2020 16:28:22 +0000 (11:28 -0500)]
Ensure only Note objects are set to expire

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expira...
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

4 years agoActivityPub: Remove ActivityPub.accept
lain [Tue, 11 Aug 2020 15:43:16 +0000 (17:43 +0200)]
ActivityPub: Remove ActivityPub.accept

Switch to the pipeline in CommonAPI and SideEffects

4 years agoEnsure ap_id column in users table cannot be null
Mark Felder [Tue, 11 Aug 2020 14:52:28 +0000 (09:52 -0500)]
Ensure ap_id column in users table cannot be null

4 years agoTransmogrifier: Handle accepts with the pipeline
lain [Tue, 11 Aug 2020 15:26:01 +0000 (17:26 +0200)]
Transmogrifier: Handle accepts with the pipeline

4 years agoTransmogrifier Test: Remove mastodon hack test.
lain [Tue, 11 Aug 2020 14:22:15 +0000 (16:22 +0200)]
Transmogrifier Test: Remove mastodon hack test.

4 years agoLinter fixes.
lain [Tue, 11 Aug 2020 14:07:42 +0000 (16:07 +0200)]
Linter fixes.

4 years agoMerge branch 'set-approval-pending-default-to-false' into 'develop'
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

4 years agoTransmogrifier: Remove handling of orphaned accepts
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.

4 years agoAcceptValidation: Codify accept rules.
lain [Tue, 11 Aug 2020 13:32:00 +0000 (15:32 +0200)]
AcceptValidation: Codify accept rules.

4 years agoSet `users.approval_pending` default to `false`
Egor Kislitsyn [Tue, 11 Aug 2020 13:21:17 +0000 (17:21 +0400)]
Set `users.approval_pending` default to `false`

4 years agoAcceptValidator: Add basic validator with tests.
lain [Tue, 11 Aug 2020 13:13:07 +0000 (15:13 +0200)]
AcceptValidator: Add basic validator with tests.

4 years agoTransmogrifier: Small readability changes.
lain [Tue, 11 Aug 2020 12:02:09 +0000 (14:02 +0200)]
Transmogrifier: Small readability changes.

4 years agoTransmogrifier Tests: Extract Accept handling
lain [Tue, 11 Aug 2020 12:00:21 +0000 (14:00 +0200)]
Transmogrifier Tests: Extract Accept handling

4 years agoMerge branch '204-fix' into 'develop'
lain [Tue, 11 Aug 2020 09:18:56 +0000 (09:18 +0000)]
Merge branch '204-fix' into 'develop'

Fix 500 errors when returning :no_content, fixes #2029

Closes #2029

See merge request pleroma/pleroma!2856

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Tue, 11 Aug 2020 09:08:27 +0000 (09:08 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoMerge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma...
lain [Tue, 11 Aug 2020 08:55:10 +0000 (10:55 +0200)]
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again

4 years agoSideEffects: Handle strange deletion case.
lain [Tue, 11 Aug 2020 08:54:38 +0000 (10:54 +0200)]
SideEffects: Handle strange deletion case.

4 years agoMerge branch 'admin-active-filter' into 'develop'
feld [Mon, 10 Aug 2020 17:16:38 +0000 (17:16 +0000)]
Merge branch 'admin-active-filter' into 'develop'

Admin API: Filter out unapproved users when the `active` filter is on

Closes #2037

See merge request pleroma/pleroma!2872

4 years agoMerge branch 'develop' into fix/activity-expirations-again
Mark Felder [Mon, 10 Aug 2020 16:32:24 +0000 (11:32 -0500)]
Merge branch 'develop' into fix/activity-expirations-again

4 years agoAdmin API: Filter out unapproved users when the `active` filter is on
Egor Kislitsyn [Mon, 10 Aug 2020 13:57:36 +0000 (17:57 +0400)]
Admin API: Filter out unapproved users when the `active` filter is on

4 years agoMerge branch 'revert-a6d3bb5f' into 'develop'
lain [Mon, 10 Aug 2020 13:59:38 +0000 (13:59 +0000)]
Merge branch 'revert-a6d3bb5f' into 'develop'

Revert "Merge branch 'issue/1023' into 'develop'"

Closes #2033

See merge request pleroma/pleroma!2868

4 years agoMerge branch 'remove-unreachable-code' into 'develop'
lain [Mon, 10 Aug 2020 13:47:20 +0000 (13:47 +0000)]
Merge branch 'remove-unreachable-code' into 'develop'

Transmogrifier: Remove duplicate code.

See merge request pleroma/pleroma!2871

4 years agoMerge branch 'develop' into 'develop'
lain [Mon, 10 Aug 2020 13:47:02 +0000 (13:47 +0000)]
Merge branch 'develop' into 'develop'

docs: add cmake to other installation guides

Closes #2039

See merge request pleroma/pleroma!2870

4 years agoMerge branch '2039-cmake' into 'develop'
lain [Mon, 10 Aug 2020 13:46:52 +0000 (13:46 +0000)]
Merge branch '2039-cmake' into 'develop'

Docs: Add cmake dependency

Closes #2039

See merge request pleroma/pleroma!2869

4 years agoTransmogrifier: Remove duplicate code.
lain [Mon, 10 Aug 2020 13:31:36 +0000 (15:31 +0200)]
Transmogrifier: Remove duplicate code.

4 years agodocs: add cmake to other installation guides
Alibek Omarov [Mon, 10 Aug 2020 13:24:45 +0000 (16:24 +0300)]
docs: add cmake to other installation guides

4 years agoDocs: Add cmake dependency
lain [Mon, 10 Aug 2020 13:12:45 +0000 (15:12 +0200)]
Docs: Add cmake dependency

4 years agoRevert "Merge branch 'issue/1023' into 'develop'"
lain [Mon, 10 Aug 2020 13:05:13 +0000 (13:05 +0000)]
Revert "Merge branch 'issue/1023' into 'develop'"

This reverts merge request !2763

4 years agoApply 1 suggestion(s) to 1 file(s)
Ilja [Mon, 10 Aug 2020 11:29:54 +0000 (11:29 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoApply 1 suggestion(s) to 1 file(s)
Ilja [Mon, 10 Aug 2020 11:29:40 +0000 (11:29 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoMerge branch 'fix/flaky-migration-episode-666' into 'develop'
rinpatch [Mon, 10 Aug 2020 09:17:08 +0000 (09:17 +0000)]
Merge branch 'fix/flaky-migration-episode-666' into 'develop'

20200802170532_fix_legacy_tags: Select only fields the migration needs

See merge request pleroma/pleroma!2863

4 years agoMerge branch '2038-old-update-info' into 'develop'
rinpatch [Mon, 10 Aug 2020 09:04:16 +0000 (09:04 +0000)]
Merge branch '2038-old-update-info' into 'develop'

AccountController: Build the correct update activity.

Closes #2038

See merge request pleroma/pleroma!2867

4 years ago20200802170532_fix_legacy_tags: chunk the user query
rinpatch [Fri, 7 Aug 2020 19:10:09 +0000 (22:10 +0300)]
20200802170532_fix_legacy_tags: chunk the user query

4 years ago20200802170532_fix_legacy_tags: Select only fields the migration needs
rinpatch [Fri, 7 Aug 2020 19:05:17 +0000 (22:05 +0300)]
20200802170532_fix_legacy_tags: Select only fields the migration needs

Selecting the full struct will break as soon as a new field is added.

4 years agoAccountController: Build the correct update activity.
lain [Mon, 10 Aug 2020 08:33:05 +0000 (10:33 +0200)]
AccountController: Build the correct update activity.

Will fix federation issues.

4 years agoMerge branch 'feat/floki-fast-html-2' into 'develop'
lain [Sun, 9 Aug 2020 11:18:00 +0000 (11:18 +0000)]
Merge branch 'feat/floki-fast-html-2' into 'develop'

Update to fast_html 2 and use it for Floki parsing

See merge request pleroma/pleroma!2861

4 years agoMerge branch 'security-policy' into 'develop'
lain [Sun, 9 Aug 2020 11:06:54 +0000 (11:06 +0000)]
Merge branch 'security-policy' into 'develop'

Add security policy for Pleroma backend

Closes #1848

See merge request pleroma/pleroma!2862

4 years agoMerge branch 'develop' into 'feat/floki-fast-html-2'
lain [Sun, 9 Aug 2020 10:53:58 +0000 (10:53 +0000)]
Merge branch 'develop' into 'feat/floki-fast-html-2'

# Conflicts:
#   config/config.exs

4 years agoLimit expirations for each cron execution to 50.
Mark Felder [Sat, 8 Aug 2020 17:49:02 +0000 (12:49 -0500)]
Limit expirations for each cron execution to 50.

This should prevent servers from being crushed. 50/min is a pretty good rate.

4 years agoDon't filter on local
Mark Felder [Sat, 8 Aug 2020 17:44:18 +0000 (12:44 -0500)]
Don't filter on local

4 years agoEnsure we only expire Create activities with the Mix task
Mark Felder [Sat, 8 Aug 2020 17:40:52 +0000 (12:40 -0500)]
Ensure we only expire Create activities with the Mix task

4 years agoAdd migration to remove invalid activity expirations
Mark Felder [Sat, 8 Aug 2020 17:33:37 +0000 (12:33 -0500)]
Add migration to remove invalid activity expirations

4 years agoMerge branch 'ensure-expiration-mix-task' into 'develop'
lain [Sat, 8 Aug 2020 15:16:55 +0000 (15:16 +0000)]
Merge branch 'ensure-expiration-mix-task' into 'develop'

Add mix task to add expiration to all local statuses

Closes #2020

See merge request pleroma/pleroma!2865

4 years agoAdd mix task to add expiration to all local statuses
Egor Kislitsyn [Sat, 8 Aug 2020 12:29:40 +0000 (16:29 +0400)]
Add mix task to add expiration to all local statuses

4 years agoImprove static_dir documentation
Ilja [Sat, 8 Aug 2020 10:21:44 +0000 (12:21 +0200)]
Improve static_dir documentation

* It was still written for From Source installs. Now it's both OTP and From Source
* I linked to the cheatsheet where it was about configuration
* I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it
    * i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option
* I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers
* The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.)
* Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.

4 years agoMerge branch 'fix/ldap-auth-issues' into 'develop'
lain [Fri, 7 Aug 2020 20:59:44 +0000 (20:59 +0000)]
Merge branch 'fix/ldap-auth-issues' into 'develop'

Fix LDAP auth issues

Closes #1646

See merge request pleroma/pleroma!2852

4 years agoMerge branch 'develop' into fix/ldap-auth-issues
Mark Felder [Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)]
Merge branch 'develop' into fix/ldap-auth-issues

4 years agoMake a new function instead of overloading register_changeset/3
Mark Felder [Fri, 7 Aug 2020 19:54:14 +0000 (14:54 -0500)]
Make a new function instead of overloading register_changeset/3

4 years agoAdd security policy for Pleroma backend
rinpatch [Fri, 7 Aug 2020 18:25:16 +0000 (21:25 +0300)]
Add security policy for Pleroma backend

Closes #1848

4 years agoMerge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social...
Angelina Filippova [Fri, 7 Aug 2020 18:05:44 +0000 (21:05 +0300)]
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description

4 years agoAdd new `image` type to settings whose values are image urls
Angelina Filippova [Fri, 7 Aug 2020 18:04:13 +0000 (21:04 +0300)]
Add new `image` type to settings whose values are image urls

4 years agoForce 204 responses to be empty, fixes #2029
Alex Gleason [Fri, 7 Aug 2020 18:02:39 +0000 (13:02 -0500)]
Force 204 responses to be empty, fixes #2029

4 years agoMerge branch 'authenticator-docs' into 'develop'
rinpatch [Fri, 7 Aug 2020 17:51:48 +0000 (17:51 +0000)]
Merge branch 'authenticator-docs' into 'develop'

Docs: Remove wrong / confusing auth docs.

Closes #2028

See merge request pleroma/pleroma!2860

4 years agoDocs: Remove wrong / confusing auth docs.
lain [Fri, 7 Aug 2020 15:59:55 +0000 (17:59 +0200)]
Docs: Remove wrong / confusing auth docs.

4 years agoCI: install cmake since fast_html now requires it
rinpatch [Fri, 7 Aug 2020 14:33:59 +0000 (17:33 +0300)]
CI: install cmake since fast_html now requires it