sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,325 Commits 1 Branch 0 Tags 184 MiB
0ba8efc950
Commit Graph

13325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Haelwenn
0ba8efc950 Merge branch 'fix/mastodon-interface-docs-link' into 'develop' 
Fix Mastodon interface link in documentation, fixes #2622

Closes #2622

See merge request pleroma/pleroma!3391
 2021-04-15 05:44:01 +00:00
Sean King
d9fce0133e
Fix Mastodon interface link 2021-04-14 14:01:33 -06:00
feld
1bf2b645c5 Merge branch 'fix/adminapi-concurrent-limiter' into 'develop' 
Fix ConcurrentLimiter settings via AdminAPI

See merge request pleroma/pleroma!3390
 2021-04-14 16:52:02 +00:00
Mark Felder
f95b52255b Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test 2021-04-14 09:39:57 -05:00
Mark Felder
c3b8c77967 Improve string_to_elixir_types/1 with guards 2021-04-13 14:39:57 -05:00
Mark Felder
861f192852 Document fixed ability to save ConcurrentLimiter settings in ConfigDB 2021-04-13 14:39:44 -05:00
Mark Felder
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
Mark Felder
905efc57e9 Initial test validating the AdminAPI issue 2021-04-13 14:39:28 -05:00
Haelwenn
d2a03d3c86 Merge branch 'fix/instance-thumbnail-url' into 'develop' 
Fix URL to custom instance thumbnail

Closes #2611

See merge request pleroma/pleroma!3388
 2021-04-13 19:05:07 +00:00
Mark Felder
cdd271b065 Fix assignment / assertion 2021-04-13 10:55:54 -05:00
Mark Felder
9fbcdc15b1 Validate custom instance thumbnail set via AdminAPI produces correct URL 2021-04-13 10:52:53 -05:00
Mark Felder
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
feld
f8cef70416 Merge branch 'chore/CHANGELOG' into 'develop' 
Fix CHANGELOG entry meant for next release

See merge request pleroma/pleroma!3387
 2021-04-01 15:26:46 +00:00
Mark Felder
31ce8a3730 Fix CHANGELOG entry meant for next release 2021-04-01 10:15:01 -05:00
Haelwenn
96fe4dd4e2 Merge branch 'revert-c368bf6d' into 'develop' 
Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"

See merge request pleroma/pleroma!3385
 2021-04-01 12:11:21 +00: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
rinpatch
c368bf6dce Merge branch 'patch-fix-open-api-spec' into 'develop' 
OpenAPI: Fix `date-time` being specified as an `integer` in OpenAPI spec (when it should be a `string`) in AccountCreateResponse

See merge request pleroma/pleroma!3382
 2021-03-31 08:19:31 +00:00
Miss Pasture
863010ea63 date-times are always strings 2021-03-31 06:51:22 +00:00
feld
4c16f5d2ca Merge branch 'upstream/mrf-followbot' into 'develop' 
Upstream/mrf followbot

See merge request pleroma/pleroma!3060
 2021-03-30 16:59:34 +00:00
Mark Felder
16a7ffb1ea Fix function calls due to module name change 2021-03-30 11:10:44 -05:00
Mark Felder
bfcdcd4f69 Temp file leaked, oops 2021-03-30 11:10:44 -05:00
Mark Felder
d29f6d6b6e Add more details to the cheatsheat for FollowBot MRF 2021-03-30 11:10:44 -05:00
Mark Felder
03f38ac4eb Prefer FollowBot naming convention vs Followbot 2021-03-30 11:10:44 -05:00
Mark Felder
7eab98d5c8 Document new FollowBot MRF 2021-03-30 11:10:44 -05:00
Mark Felder
fef4f3772c More tests to validate Followbot is behaving 2021-03-30 11:10:44 -05:00
Mark Felder
4796df0bc3 Remove Task.async as it is broken here and probably a premature optimization anyway 2021-03-30 11:10:44 -05:00
Mark Felder
f73d166785 Only need to validate a follow request is generated for now 2021-03-30 11:10:44 -05:00
Mark Felder
c252ac71d4 Revert 2021-03-30 11:10:44 -05:00
Mark Felder
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
Mark Felder
86182ef8e4 Change module name to FollowbotPolicy 2021-03-30 11:10:44 -05:00
Mark Felder
1926d0804b Add follow_requests_outstanding_since?/3 to Pleroma.Activity 2021-03-30 11:10:44 -05:00
Mark Felder
f0dcc1ca69 Lint 2021-03-30 11:10:44 -05:00
Mark Felder
a176914c73 Better checking of previous follow request attempts 2021-03-30 11:10:44 -05:00
Mark Felder
3989ec508c Prevent duplicates from being processed 2021-03-30 11:10:44 -05:00
Mark Felder
3949cfdc24 Make the followbot only dispatch follow requests once per 30 day period 2021-03-30 11:10:43 -05:00
feld
2689463c7e Apply 1 suggestion(s) to 1 file(s) 2021-03-30 11:10:43 -05:00
Mark Felder
2557e805a3 Support for configuration via AdminFE 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
840dc4b44b Document :mrf_follow_bot 2021-03-30 11:10:34 -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
feld
caadde3b04 Merge branch 'fix/2585-config-migration-dir' into 'develop' 
migrating config to tmp folder

Closes #2585

See merge request pleroma/pleroma!3379
 2021-03-23 17:46:52 +00:00
Alexander Strizhakov
ad907254fb changelog entry 2021-03-23 12:40:49 -05:00
Alexander Strizhakov
4cd34d0197
suggestion 2021-03-23 17:27:02 +03:00
Alexander Strizhakov
03843a5386
migrating config to tmp folder 2021-03-23 14:29:02 +03:00
Haelwenn
c09844d3d2 Merge branch 'fix/copy-emoji-summary' into 'develop' 
Copy emoji in the subject from parent post

See merge request pleroma/pleroma!3378
 2021-03-23 09:27:03 +00:00
rinpatch
d3660b24d3 Copy emoji in the subject from parent post 
Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post.
 2021-03-22 21:20:47 +03:00
rinpatch
572363793f Merge branch 'fix/2579-finger-content-type' into 'develop' 
respect content-type header in finger request

Closes #2579

See merge request pleroma/pleroma!3375
 2021-03-21 08:25:02 +00:00