sadposter
|
50a644a221
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-05-12 16:13:30 +01:00 |
|
|
|
745375bdcf
|
Merge branch 'dont-crash-email-settings' into 'develop'
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
|
2021-05-04 13:30:00 +00:00 |
|
Alex Gleason
|
c186b059a7
|
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
|
2021-05-03 14:43:28 -05:00 |
|
Alex Gleason
|
c80b1aaf51
|
Don't crash when email settings are invalid
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
|
2021-05-03 14:43:14 -05:00 |
|
Alex Gleason
|
52fc59f125
|
Merge remote-tracking branch 'upstream/develop' into earmark
|
2021-04-30 13:17:03 -05:00 |
|
Alex Gleason
|
6727a3659f
|
Remove Pleroma.Formatter.minify/2
|
2021-04-30 12:27:06 -05:00 |
|
Alex Gleason
|
e7ac15905e
|
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
|
2021-04-29 12:19:10 -05:00 |
|
|
|
959dc6e6fc
|
Cleanup and ensure we obey custom Repo timeout
|
2021-04-22 10:15:50 -05:00 |
|
|
|
99fd9c5e38
|
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval
|
2021-04-22 10:15:50 -05:00 |
|
|
|
9f711ddcf8
|
Try to set query timeout intelligently
|
2021-04-22 10:15:50 -05:00 |
|
|
|
9bc69196d5
|
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task
|
2021-04-22 10:15:50 -05:00 |
|
|
|
0effcd2cfe
|
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.
|
2021-04-22 10:15:50 -05:00 |
|
Sean King
|
d1eb1913e8
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
|
2021-04-19 15:42:38 -06:00 |
|
|
|
efed94a23e
|
Fix error response which was breaking tests related to pinned posts
|
2021-04-19 16:23:57 -05:00 |
|
Sean King
|
2b4f958b2a
|
Add opting out of Google FLoC to HTTPSecurityPlug headers
|
2021-04-18 14:00:18 -06:00 |
|
rinpatch
|
15f87cf658
|
Merge branch 'features/ingestion-ecto-tag' into 'develop'
TagValidator: New
See merge request pleroma/pleroma!3244
|
2021-04-16 09:55:55 +00:00 |
|
rinpatch
|
79376b4afb
|
Merge branch 'feature/521-pinned-post-federation' into 'develop'
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
|
2021-04-16 09:53:47 +00:00 |
|
rinpatch
|
0ababdc068
|
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381
|
2021-04-16 09:50:26 +00:00 |
|
|
|
f95b52255b
|
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test
|
2021-04-14 09:39:57 -05:00 |
|
|
|
c3b8c77967
|
Improve string_to_elixir_types/1 with guards
|
2021-04-13 14:39:57 -05:00 |
|
|
|
ee53ad4d77
|
Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1
|
2021-04-13 14:39:31 -05:00 |
|
|
|
0feafcc20c
|
Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE
|
2021-04-09 10:30:27 -05:00 |
|
Alexander Strizhakov
|
681a42c359
|
release runtime provider fix for paths
|
2021-04-08 15:45:31 +03:00 |
|
Haelwenn (lanodan) Monnier
|
ef36f7fa5c
|
Move tag fixup to object_validator
|
2021-04-05 19:07:45 +02:00 |
|
Haelwenn (lanodan) Monnier
|
7ebfe89900
|
object_validators: Mark validate_data as private
|
2021-04-01 14:18:41 +02:00 |
|
Haelwenn (lanodan) Monnier
|
37a7f521fd
|
Insert string-hashtags in Pipeline
Cannot be done in Ecto schemas because only one type is allowed in arrays, and
needs to be done before the MRFs.
|
2021-04-01 14:18:41 +02:00 |
|
Haelwenn (lanodan) Monnier
|
5ae27c8451
|
pipeline_test: Fix usage of %Activity{}
|
2021-04-01 14:18:40 +02:00 |
|
Haelwenn (lanodan) Monnier
|
9015df2229
|
TagValidator: New
|
2021-04-01 14:18:40 +02:00 |
|
Haelwenn
|
1e3db07586
|
Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"
This reverts merge request !3382
|
2021-04-01 12:00:58 +00:00 |
|
rinpatch
|
ce9ed6c730
|
Merge branch 'refactor/object_validator_validate' into 'develop'
object_validator: Refactor most of validate/2 to a generic block
See merge request pleroma/pleroma!3383
|
2021-04-01 11:10:12 +00:00 |
|
Haelwenn (lanodan) Monnier
|
af1cd28f9b
|
object_validator: Refactor most of validate/2 to a generic block
|
2021-04-01 12:18:52 +02:00 |
|
Miss Pasture
|
863010ea63
|
date-times are always strings
|
2021-03-31 06:51:22 +00:00 |
|
|
|
03f38ac4eb
|
Prefer FollowBot naming convention vs Followbot
|
2021-03-30 11:10:44 -05:00 |
|
|
|
4796df0bc3
|
Remove Task.async as it is broken here and probably a premature optimization anyway
|
2021-03-30 11:10:44 -05:00 |
|
|
|
c252ac71d4
|
Revert
|
2021-03-30 11:10:44 -05:00 |
|
|
|
778010ef8e
|
Do not try to follow local users. Their posts are already available locally on the instance.
|
2021-03-30 11:10:44 -05:00 |
|
|
|
86182ef8e4
|
Change module name to FollowbotPolicy
|
2021-03-30 11:10:44 -05:00 |
|
|
|
1926d0804b
|
Add follow_requests_outstanding_since?/3 to Pleroma.Activity
|
2021-03-30 11:10:44 -05:00 |
|
|
|
f0dcc1ca69
|
Lint
|
2021-03-30 11:10:44 -05:00 |
|
|
|
a176914c73
|
Better checking of previous follow request attempts
|
2021-03-30 11:10:44 -05:00 |
|
|
|
3989ec508c
|
Prevent duplicates from being processed
|
2021-03-30 11:10:44 -05:00 |
|
|
|
3949cfdc24
|
Make the followbot only dispatch follow requests once per 30 day period
|
2021-03-30 11:10:43 -05:00 |
|
Mark Felder
|
e78738173a
|
Enforce that the followbot must be marked as a bot.
|
2021-03-30 11:10:43 -05:00 |
|
Mark Felder
|
fba770b3ea
|
Try to handle misconfiguration scenarios gracefully
|
2021-03-30 11:10:03 -05:00 |
|
Mark Felder
|
8b81d62227
|
Upstream original followbot implementation
|
2021-03-30 11:10:03 -05:00 |
|
Alexander Strizhakov
|
4d046afd27
|
tests for release config provider
|
2021-03-27 09:05:33 +03:00 |
|
Alexander Strizhakov
|
6e108b8603
|
reading the file, instead of config keyword
|
2021-03-26 19:19:19 +03:00 |
|
Alexander Strizhakov
|
1885268c9c
|
expanding validator
|
2021-03-25 13:26:54 +03:00 |
|
Alexander Strizhakov
|
2a520ba008
|
expanding AddRemoveValidator
|
2021-03-25 13:03:42 +03:00 |
|
Alexander Strizhakov
|
8857242c95
|
removeing corresponding add activity
|
2021-03-25 13:03:41 +03:00 |
|
