b050adb5e2
Merge branch 'fix/docs' into 'develop'
...
Docs: Fix incorrect shell command
See merge request pleroma/pleroma!3396
2021-04-20 18:02:48 +00:00
7eded72189
Fix incorrect shell command
...
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
2021-04-20 12:31:14 -05:00
8defbe431e
Merge branch 'feature/opt-out-of-google-floc' into 'develop'
...
Add opting out of Google FLoC to HTTPSecurityPlug headers
Closes #2630
See merge request pleroma/pleroma!3393
2021-04-19 22:39:52 +00:00
Sean King
2780cdd4e7
Add CHANGELOG entry
2021-04-19 16:06:19 -06: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
7183655a07
Merge branch 'fix/tests' into 'develop'
...
Fix tests broken since !3312
See merge request pleroma/pleroma!3395
2021-04-19 21:34:38 +00: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
Haelwenn
152cb3074e
Merge branch 'fix/notifsettings-breaking-login' into 'develop'
...
Enforce user.notification_settings is NOT NULL
Closes #2571
See merge request pleroma/pleroma!3386
2021-04-15 21:34:55 +00:00
0a7c2a32ba
Merge branch 'develop' into 'fix/notifsettings-breaking-login'
...
# Conflicts:
# CHANGELOG.md
2021-04-15 14:59:26 +00:00
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
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
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
861f192852
Document fixed ability to save ConcurrentLimiter settings in ConfigDB
2021-04-13 14:39:44 -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
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
cdd271b065
Fix assignment / assertion
2021-04-13 10:55:54 -05:00
9fbcdc15b1
Validate custom instance thumbnail set via AdminAPI produces correct URL
2021-04-13 10:52:53 -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
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
31ce8a3730
Fix CHANGELOG entry meant for next release
2021-04-01 10:15:01 -05:00
765f0907df
Document user login failure fix for NULL notification_settings
2021-04-01 10:07:57 -05:00
4ecf6ceea6
Enforce user.notification_settings is NOT NULL
2021-04-01 10:06:24 -05: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
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
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
16a7ffb1ea
Fix function calls due to module name change
2021-03-30 11:10:44 -05:00
bfcdcd4f69
Temp file leaked, oops
2021-03-30 11:10:44 -05:00
d29f6d6b6e
Add more details to the cheatsheat for FollowBot MRF
2021-03-30 11:10:44 -05:00
03f38ac4eb
Prefer FollowBot naming convention vs Followbot
2021-03-30 11:10:44 -05:00
7eab98d5c8
Document new FollowBot MRF
2021-03-30 11:10:44 -05:00
fef4f3772c
More tests to validate Followbot is behaving
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
f73d166785
Only need to validate a follow request is generated for now
2021-03-30 11:10:44 -05:00
