lain
e154fcf525
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
2020-08-17 12:26:53 +00:00
Hugo Müller-Downing
317b6c6c52
Start :ssl if not started when running migration or rollback
2020-08-17 17:34:03 +10:00
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
2020-08-14 20:55:45 +03:00
lain
76ce3a1c9e
Mogrifun: Add a line about the purpose of the module.
2020-08-14 18:27:18 +02:00
Maksim Pechnikov
9b055f7211
fix cron wroker
2020-08-13 21:03:15 +03:00
Maksim Pechnikov
3515cb5c3a
fix Cron.PurgeExpiredActivitiesWorker
2020-08-13 21:01:21 +03:00
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
Haelwenn (lanodan) Monnier
4f3c955f26
side_effects: Fix typo on notification
2020-08-13 18:10:43 +02:00
Alexander Strizhakov
29a7bcd5bb
reverting pinned posts in filtering
2020-08-12 20:01:21 +03:00
Alexander Strizhakov
3ab83f837e
don't load pinned activities in due_expirations
2020-08-12 19:46:47 +03:00
Mark Felder
98058bd06e
Merge branch 'develop' into fix/activity-expirations-again
2020-08-12 09:42:28 -05:00
lain
2e347e8286
ActivityPub: Remove reject, move everything to the Pipeline.
2020-08-12 15:07:46 +02:00
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
2020-08-12 14:48:51 +02:00
Alexander Strizhakov
eec1ba232c
don't expire pinned posts
2020-08-12 15:15:17 +03:00
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
2020-08-12 12:53:04 +02:00
Maksim Pechnikov
76462efbfa
fix job monitor
2020-08-11 22:06:33 +03:00
lain
500576dcb6
Linting fixes.
2020-08-11 19:22:14 +02:00
Mark Felder
724ed354f2
Ensure only Note objects are set to expire
2020-08-11 11:28:22 -05:00
lain
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 17:49:24 +02:00
lain
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
2020-08-11 17:43:16 +02:00
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
2020-08-11 17:26:01 +02:00
lain
3f6d50111e
Linter fixes.
2020-08-11 16:07:42 +02:00
lain
da3f9b9988
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.
2020-08-11 15:41:19 +02:00
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
2020-08-11 15:32:52 +02:00
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
2020-08-11 15:13:07 +02:00
lain
8f9fbc86c0
Transmogrifier: Small readability changes.
2020-08-11 14:02:09 +02:00
lain
686002164a
Merge branch '204-fix' into 'develop'
...
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
2020-08-11 09:18:56 +00:00
lain
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 10:55:10 +02:00
lain
7e4932362b
SideEffects: Handle strange deletion case.
2020-08-11 10:54:38 +02:00
feld
78484fe0ef
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
2020-08-10 17:16:38 +00:00
Mark Felder
024b7ce0b7
Merge branch 'develop' into fix/activity-expirations-again
2020-08-10 11:32:24 -05:00
Egor Kislitsyn
249f21dcbb
Admin API: Filter out unapproved users when the active filter is on
2020-08-10 18:27:39 +04:00
lain
93fbf39954
Merge branch 'revert-a6d3bb5f' into 'develop'
...
Revert "Merge branch 'issue/1023' into 'develop'"
Closes #2033
See merge request pleroma/pleroma!2868
2020-08-10 13:59:38 +00:00
lain
11fc90744c
Transmogrifier: Remove duplicate code.
2020-08-10 15:31:36 +02:00
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
Mark Felder
e08ea01d09
Limit expirations for each cron execution to 50.
...
This should prevent servers from being crushed. 50/min is a pretty good rate.
2020-08-08 12:49:02 -05:00
Mark Felder
cf4c97242b
Ensure we only expire Create activities with the Mix task
2020-08-08 12:40:52 -05:00
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
Mark Felder
474147a67a
Make a new function instead of overloading register_changeset/3
2020-08-07 14:54:14 -05:00
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05:00
lain
34cbe9f44a
Merge branch 'features/poll-validation' into 'develop'
...
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
2020-08-07 10:44:06 +00:00
Ivan Tashkinov
135ae4e35a
[ #2025 ] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
2020-08-06 16:00:00 +03:00
lain
10b0e55acf
Merge branch 'whole-word-filter-hotfix' into 'develop'
...
Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851
2020-08-06 08:35:39 +00:00
Mark Felder
2a4bca5bd7
Comments are good when they're precise...
2020-08-05 11:40:09 -05:00
Roman Chvanikov
7569f225f1
Move checks to application startup
2020-08-05 19:38:55 +03:00
Mark Felder
81126b0142
Add email to user account only if it exists in LDAP
2020-08-05 11:36:12 -05:00
Roman Chvanikov
4672b61106
Merge branch 'develop' into command-available-check
2020-08-05 19:16:48 +03:00
lain
9d7ce1a6d0
CommonValidations: More refactors.
2020-08-05 17:56:12 +02:00
