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
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 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.
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
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
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.
lain [Tue, 11 Aug 2020 13:32:00 +0000 (15:32 +0200)]
AcceptValidation: Codify accept rules.
Egor Kislitsyn [Tue, 11 Aug 2020 13:21:17 +0000 (17:21 +0400)]
Set `users.approval_pending` default to `false`
lain [Tue, 11 Aug 2020 13:13:07 +0000 (15:13 +0200)]
AcceptValidator: Add basic validator with tests.
lain [Tue, 11 Aug 2020 12:02:09 +0000 (14:02 +0200)]
Transmogrifier: Small readability changes.
lain [Tue, 11 Aug 2020 12:00:21 +0000 (14:00 +0200)]
Transmogrifier Tests: Extract Accept handling
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
lain [Tue, 11 Aug 2020 09:08:27 +0000 (09:08 +0000)]
Apply 1 suggestion(s) to 1 file(s)
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
lain [Tue, 11 Aug 2020 08:54:38 +0000 (10:54 +0200)]
SideEffects: Handle strange deletion case.
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
Mark Felder [Mon, 10 Aug 2020 16:32:24 +0000 (11:32 -0500)]
Merge branch 'develop' into fix/activity-expirations-again
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
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
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
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
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
lain [Mon, 10 Aug 2020 13:31:36 +0000 (15:31 +0200)]
Transmogrifier: Remove duplicate code.
Alibek Omarov [Mon, 10 Aug 2020 13:24:45 +0000 (16:24 +0300)]
docs: add cmake to other installation guides
lain [Mon, 10 Aug 2020 13:12:45 +0000 (15:12 +0200)]
Docs: Add cmake dependency
lain [Mon, 10 Aug 2020 13:05:13 +0000 (13:05 +0000)]
Revert "Merge branch 'issue/1023' into 'develop'"
This reverts merge request !2763
Ilja [Mon, 10 Aug 2020 11:29:54 +0000 (11:29 +0000)]
Apply 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)
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
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
rinpatch [Fri, 7 Aug 2020 19:10:09 +0000 (22:10 +0300)]
20200802170532_fix_legacy_tags: chunk the user query
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.
lain [Mon, 10 Aug 2020 08:33:05 +0000 (10:33 +0200)]
AccountController: Build the correct update activity.
Will fix federation issues.
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
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
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
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.
Mark Felder [Sat, 8 Aug 2020 17:44:18 +0000 (12:44 -0500)]
Don't filter on local
Mark Felder [Sat, 8 Aug 2020 17:40:52 +0000 (12:40 -0500)]
Ensure we only expire Create activities with the Mix task
Mark Felder [Sat, 8 Aug 2020 17:33:37 +0000 (12:33 -0500)]
Add migration to remove invalid activity expirations
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
Egor Kislitsyn [Sat, 8 Aug 2020 12:29:40 +0000 (16:29 +0400)]
Add mix task to add expiration to all local statuses
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.
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
Mark Felder [Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)]
Merge branch 'develop' into fix/ldap-auth-issues
Mark Felder [Fri, 7 Aug 2020 19:54:14 +0000 (14:54 -0500)]
Make a new function instead of overloading register_changeset/3
rinpatch [Fri, 7 Aug 2020 18:25:16 +0000 (21:25 +0300)]
Add security policy for Pleroma backend
Closes #1848
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
Angelina Filippova [Fri, 7 Aug 2020 18:04:13 +0000 (21:04 +0300)]
Add new `image` type to settings whose values are image urls
Alex Gleason [Fri, 7 Aug 2020 18:02:39 +0000 (13:02 -0500)]
Force 204 responses to be empty, fixes #2029
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
lain [Fri, 7 Aug 2020 15:59:55 +0000 (17:59 +0200)]
Docs: Remove wrong / confusing auth docs.
rinpatch [Fri, 7 Aug 2020 14:33:59 +0000 (17:33 +0300)]
CI: install cmake since fast_html now requires it
lain [Fri, 7 Aug 2020 14:51:26 +0000 (14:51 +0000)]
Merge branch 'spoopy-user' into 'develop'
restricted_nicknames: Add names from MastoAPI endpoints
See merge request pleroma/pleroma!2857
Mark Felder [Fri, 7 Aug 2020 14:42:10 +0000 (09:42 -0500)]
Add a note about the proper value for uid
rinpatch [Fri, 7 Aug 2020 14:21:28 +0000 (14:21 +0000)]
Merge branch 'object-age-changelog' into 'develop'
Changelog: Add information about the object age policy
See merge request pleroma/pleroma!2859
projects / akkoma / log