20347898e2
Merge branch 'fix/federation-context-issues' into 'develop'
...
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects
See merge request pleroma/pleroma!3717
2022-09-04 18:43:36 +00:00
21ab7369ca
Bump minimum Elixir version to 1.10
...
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.
Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
2022-09-02 22:53:54 +02:00
d67d191344
Fix fedi-fe build URL
2022-08-24 23:39:02 -06:00
cc0f32c253
Add glitch-lily as an installable frontend
2022-08-19 22:54:56 -06:00
88c1c76d3e
Migrations: delete contexts with BaseMigrator
...
Due to the lengthiness of this task, the migration has been adapted into
a BaseMigrator migration, running in the background instead.
2022-08-15 01:47:09 +02:00
b53cf7d4b3
Change default moderator privileges to better match what we previously had
...
Moderators were able to delete statusses via pleroma-fe. For that reason I now gave them :messages_delete by default.
They are also able to recieve reports through the notifications. For that reason I now gave them :reports_manage_reports by default.
They were also able to see deactivated accounts through pleroma-fe. However
* they were unable to tell if the account is deactivated or not (which was a bug and fixed by thes privileges MR this commit is part of)
* they were not able to actually change the activation state.
Because of this, I decided to *not* give them the privilege :users_manage_activation_state as this would give significantly more
privileges, while not giving it will actually improve the current experience as it works around the existing bug of not showing activation state.
2022-08-07 07:22:33 +02:00
5153eba3a8
Add authorized_fetch_mode to description.exs
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-25 19:53:51 +02:00
c045a49909
Add privilege for announcements
2022-07-14 08:40:26 +02:00
44d14e8a9c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-14 07:07:19 +02:00
fdc71f6051
Merge branch 'short-description' into 'develop'
...
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
2022-07-13 04:42:24 +00:00
f88ed1df75
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-05 12:05:19 +02:00
42d4bd3a5d
Rename pipelines and add forgotten tags
...
I renamed some tags before, but forgot to rename the pipelines
I also had some tags which I forgot to add to the config, description, etc.
These have now been done/added
2022-07-02 08:55:14 +02:00
51f87ba30c
Change order of privilege tags to make more sense
...
The tags were listed in different places
They were listed in a rather randomly order
I reordered them in a way I think makes more sense
2022-07-02 07:59:46 +02:00
c0e4b1b3e2
Fix typo's
...
priviledge |-> privilege
2022-07-02 07:52:39 +02:00
37fdf148b0
Rename privilege tags
...
I first focussed on getting things working
Now that they do and we know what tags there are, I put some thought in providing better names
I use the form <what_it_controls>_<what_it_allows_you_to_do>
:statuses_read => :messages_read
:status_delete => :messages_delete
:user_read => :users_read
:user_deletion => :users_delete
:user_activation => :users_manage_activation_state
:user_invite => :users_manage_invites
:user_tag => :users_manage_tags
:user_credentials => :users_manage_credentials
:report_handle => :reports_manage_reports
:emoji_management => :emoji_manage_emoji
2022-07-01 10:28:09 +02:00
ecd42a2ce1
Add privilige :emoji_management
2022-06-21 12:10:27 +02:00
0ee8f33250
Add privilige :status_delete
...
It also allows to update a message, so it's not just deleting. I need a better name...
2022-06-21 12:10:27 +02:00
cbb26262a5
Add privileges for :user_read
2022-06-21 12:10:27 +02:00
3f26f1b30f
Add privileges for :report_handle
2022-06-21 12:10:27 +02:00
14e697a64f
Add privileges for :user_invite
2022-06-21 12:10:27 +02:00
e102d25d23
Add privileges for :user_activation
2022-06-21 12:10:27 +02:00
cb60cc4e02
Add privileges for :user_tag
2022-06-21 12:10:27 +02:00
5a65e2dac5
Remove privileged_staff
...
Everything that was done through this setting, can now be set by giving the proper privileges to the roles.
2022-06-21 12:10:27 +02:00
8a9144ca8b
Add priviledges for :user_credentials
...
I only moved the ones from the :require_privileged_staff block for now
2022-06-21 12:10:27 +02:00
9f6c364759
Add privilege :user_deletion
2022-06-21 12:10:27 +02:00
5b19543f0a
Add new setting and Plug to allow for privilege settings for staff
2022-06-21 12:10:26 +02:00
6f23fc8e08
Add tlsv1.3 to suggestions
2022-05-31 00:51:48 +02:00
fbf9eced11
Add short_description field
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:04:27 +02:00
e473bcf7a0
Max media attachment count
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-06 17:41:15 +01:00
dd7977bb68
Merge branch 'birth-dates' into 'develop'
...
Birth dates
See merge request pleroma/pleroma!3608
2022-01-25 15:35:47 +00:00
53de3a9d44
Revert "Merge branch 'log-slow-queries' into 'develop'"
...
This reverts merge request !3553
2022-01-24 18:54:43 +00:00
98ce239ebc
Update description.exs
2022-01-22 13:28:00 -06:00
66e8c6f90f
Birthdays: birth_date --> birthday
2022-01-22 13:21:55 -06:00
397f67fef8
Format code, expose instance configuration related to birth dates
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 18:18:38 +01:00
b108b05650
Birth dates, birthday reminders API, allow instance admins to require minimum age
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 14:57:48 +01:00
0f90fd5805
WIP account endorsements
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 18:15:10 +01:00
a659428024
Merge branch 'restricted-moderators' into 'develop'
...
AdminAPI: Optionally restrict moderators from accessing sensitive data
See merge request pleroma/pleroma!3578
2021-12-27 17:06:22 +00:00
6e27fc9c12
Merge branch 'log-slow-queries' into 'develop'
...
Log slow Ecto queries
See merge request pleroma/pleroma!3553
2021-12-27 15:41:06 +00:00
08c0f09bad
Made slow queries logging disabled by default.
2021-12-27 09:13:31 +03:00
f02715c4b2
Fix lint errors
2021-12-27 03:42:03 +03:00
cd1041c3a4
API: optionally restrict moderators from accessing sensitive data
2021-12-27 02:27:48 +03:00
3e9e7178bc
Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params.
2021-12-26 22:49:00 +03:00
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
613f55b078
Merge branch 'benchmark' into 'develop'
...
Fix benchmarks
See merge request pleroma/pleroma!3551
2021-12-06 21:16:30 +00:00
ce4560c2a1
Fix benchmarks
2021-12-03 16:20:54 -05:00
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
2021-11-15 14:27:59 +00:00
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
21720db859
Merge branch 'dkuku-develop-patch-66061' into 'develop'
...
Update dev.exs error message to write to stderr.
See merge request pleroma/pleroma!3492
2021-08-13 12:10:52 +00:00
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
2021-08-06 08:08:20 -06:00
ee26f2c91b
Quarantine placeholders
...
* kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case
* The mrf simple and transparency exclusion were already OK
2021-08-06 07:59:54 +02:00
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
2021-08-06 07:59:53 +02:00
64002e92ad
config/description.exs: Update quarantine settings to tuples
2021-08-06 07:59:53 +02:00
5c5571c668
use puts instead warn
2021-07-27 21:01:41 +00:00
69ebfb29fb
Update dev.exs error message to write to stderr. Currently it dumps this message at the beginnig of the file when using vim-autoformat with mix format
2021-07-27 20:41:36 +00:00
33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
2021-07-27 08:29:53 -05:00
94db0b7cd6
Add activity+json to Phoenix :format_encoders
...
Fixes ErrorView rendering
2021-07-27 08:28:52 -05:00
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
2021-06-03 15:52:16 +00:00
679d4c23e9
Update wording for relays in docs and config description
2021-06-02 11:30:09 -05:00
297feb73f4
Formatting
2021-06-02 11:21:04 -05:00
dcf84ac12e
disableChat / disableShout didn't actually do anything for PleromaFE
2021-06-01 16:53:32 -05:00
8ff2d8d17d
Update description file for new shout config setting location
2021-06-01 11:49:47 -05:00
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
36fe8950f7
Update PleromaFE settings for the old chat box
2021-06-01 11:49:16 -05:00
68aa56b9e4
Just call it shout
2021-06-01 11:49:16 -05:00
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
69aed310de
Adding description
2021-05-29 02:22:33 +00:00
a833a2d76b
Merge branch 'plug-runtime-dev' into 'develop'
...
Put Plugs in runtime mode in :dev, :test to speed up recompilation
See merge request pleroma/pleroma!3411
2021-05-28 18:57:45 +00:00
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
2021-05-20 14:02:58 -05:00
0461794375
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
2021-05-19 14:27:59 -05:00
e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation
2021-05-19 14:27:46 -05:00
32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config
2021-05-16 12:27:29 -05:00
b22f54eb29
Make prod.secret.exs optional (with warning)
2021-05-16 12:26:32 -05:00
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
fa2e62078c
Remove MastoFE configuration stuff
2021-04-15 23:51:04 -06:00
2557e805a3
Support for configuration via AdminFE
2021-03-30 11:10:43 -05:00
8b81d62227
Upstream original followbot implementation
2021-03-30 11:10:03 -05:00
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
2021-02-27 21:26:17 +01:00
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
2021-02-23 13:52:28 +03:00
a98c4423f3
Apply i1t's suggestion(s) to 1 file(s)
2021-02-22 20:41:57 +00:00
db7d6f337f
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
2021-02-19 18:37:37 -06:00
b981edad8a
[ #3213 ] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
2021-02-18 20:40:10 +03:00
6d66fadea7
Remove `:auth, :enforce_oauth_admin_scope_usage`
...
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
2021-02-17 20:47:38 +03:00
349b8b0f4f
[ #3213 ] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).
2021-02-13 22:01:11 +03:00
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
2021-02-11 19:31:57 +03:00
a996ab46a5
[ #3213 ] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
2021-02-11 19:30:21 +03:00
a52cedba62
Merge branch 'chore/descriptions-improvements' into 'develop'
...
More descriptions improvements
See merge request pleroma/pleroma!3307
2021-02-08 19:21:01 +00:00
ce7c275fb3
Improve various descriptions and labels
2021-02-08 11:45:50 -06:00
2bffa8e020
Make the suggestion match the default value
2021-02-08 11:25:32 -06:00
4dbb08a19f
Improved Mailer descriptions
2021-02-08 10:08:33 -06:00
d1c6dd97aa
[ #3213 ] Partially addressed code review points.
...
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
2021-02-07 22:24:12 +03:00
f736501e97
Alpha-sort adapters
...
Add various labels, descriptions and suggestions for all adapter settings and try to use
the same terminology by the service provider.
2021-02-06 13:18:48 -06:00
0fcf16dcb8
Move Enabled to top as it's the master control of all email. Description not really needed.
2021-02-06 12:34:32 -06:00
bd828e5c9c
More description improvements
2021-02-06 12:28:49 -06:00
227dd84f11
Update SMTP error description and default value
2021-02-06 12:06:47 -06:00
9e3e8e2e30
Update Swoosh docs URL, lint
2021-02-06 12:04:28 -06:00
cfc474c5f7
There is no reason to expose these Local adapter settings either.
2021-02-06 12:01:11 -06:00
6ffe15cc9f
Remove No MX lookups setting
...
This setting defaults to false so the relay host will be used in an MX query so
multiple SMTP servers can be used. gen_smtp code states that all records returned from the
MX query are attempted in order and only a permanent SMTP error will stop the client from
attempting other servers in the list. Connection failures, TLS issues, etc will cause it to
try the next host.
If there is no MX record associated with the relay host, it automatically tries connecting to it
directly.
There is really no reason to expose this to end users. The default value is fine for everyone.
2021-02-06 11:55:25 -06:00
85710b026f
Improve SMTP adapter setting descriptions
2021-02-06 11:55:01 -06:00
9f98885388
No reason to suggest users try the useless "Local" mail adapter
2021-02-06 11:28:55 -06:00
887db076b5
Load an emoji.txt specific to the test env
2021-02-03 16:40:59 -06:00
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
2021-02-03 14:23:23 +00:00
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-31 20:38:58 +03:00
6fd4163ab6
[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
2021-01-31 20:37:33 +03:00
9948ff3356
[ #3213 ] Added HashtagsCleanupWorker periodic job.
2021-01-31 18:24:19 +03:00
2048b93929
Add missing :ex_aws, :s3, :region setting
2021-01-29 11:31:15 -06:00
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
2021-01-26 18:14:01 +00:00
875fbaae35
support for expires_in/expires_at in filters
2021-01-26 08:27:45 +03:00
e709dec2eb
Add Invalidation Script url_format setting
2021-01-21 14:52:02 -06:00
003402df40
Add ability to invalidate cache entries for Apache
2021-01-21 14:20:13 -06:00
7fcaa188a0
Allow to define custom HTTP headers per each frontend
2021-01-21 21:55:23 +03:00
133644dfa2
Ability to set the Service-Worker-Allowed header
2021-01-21 21:55:11 +03:00
c041e9c630
[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.
...
Changed default hashtags filtering strategy to non-aggregate approach.
2021-01-21 20:23:08 +03:00
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-21 20:20:35 +03:00
5ade430e46
changed naming in changelog
2021-01-21 10:13:02 +03:00
6d48144a9d
use proper naming
...
for MediaProxyWarmingPolicy in ConcurrentLimiter
2021-01-21 09:50:18 +03:00
b4ff63d020
configurable limits for ConcurrentLimiter
...
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
2021-01-21 09:47:21 +03:00
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
2021-01-20 22:48:48 +00:00
086100e3b7
Consistent comment style for :ex_aws
2021-01-20 16:39:39 -06:00
48b399cedb
[ #3213 ] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
2021-01-16 20:22:14 +03:00
f9e0c05ca4
Only run one attachment cleanup job per node
...
The previous limit of 5 was probably causing massing performance issues due to concurrent full table scans.
2021-01-15 14:50:32 -06:00
5627f3642f
Not needed in test.exs
2021-01-13 11:54:45 -06:00
f0ab60189e
truncated_namespace should default to nil
2021-01-13 11:54:00 -06:00
c7cd9bd591
Password: Add password module
...
Replaces Pbkdf2.
2021-01-13 15:09:01 +01:00
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
2021-01-12 16:31:35 -06:00
ac1298fce8
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
...
Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236
2021-01-07 16:25:39 +00:00
1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-01-06 15:22:35 -06:00
48cd336a72
allow external emoji
2021-01-06 10:13:01 -06:00
5e128a6be3
Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'
...
Fix proxy and mediaproxy description.exs
See merge request pleroma/pleroma!3219
2021-01-05 21:16:33 +00:00
d69c78ceb9
Remove configurability of upload proxy opts, simplify
2021-01-05 15:06:00 -06:00
8864ac65c6
Add dinosaur gif from https://gifs.cc
...
"Our animations are free to be used to enhance your website."
2021-01-05 13:25:14 -06:00
8e5904daa5
SideEffects.DeleteTest: asyncify.
...
Replace Mock with Mox, mock out Logger.
2021-01-04 18:40:59 +01:00
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
2020-12-26 10:26:35 +00:00
ce78b64db8
Formatting
2020-12-23 17:41:10 -06:00
5a084d6f8d
Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE
2020-12-23 17:38:33 -06:00
5db1e6c8d3
Pipeline test: Switch from Mock to Mox.
...
Speeds up the test and makes it possible to run async.
2020-12-21 16:35:12 +01:00
ecd39a8fe5
Test config: Raise pool size for postgres.
...
Given all the async tests, this can become a bottleneck.
2020-12-21 12:31:12 +01:00
a05e1d4e48
config/description.exs: Remove outdated information about Oban
...
The version of Oban we depend on no longer uses ShareLocks, so this
note no longer applies.
2020-12-19 11:27:42 +03:00
95a9bdfc37
Tests: Use NullCache for async tests.
...
Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test.
2020-12-18 19:53:19 +01:00
9a744d49c8
Jason: Remove by now superfluous jason_types file
2020-12-18 17:44:19 +01:00
62bf4a1292
[ #2353 ] Virtually never-expiring OAuth tokens (new and already issued ones).
2020-12-17 20:49:00 +03:00
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
2020-12-14 11:02:32 -06:00
tusooa