Commit graph

1248 commits

Author SHA1 Message Date
Ilja
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
Ilja
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
Ilja
9f6c364759 Add privilege :user_deletion 2022-06-21 12:10:27 +02:00
Ilja
5b19543f0a Add new setting and Plug to allow for privilege settings for staff 2022-06-21 12:10:26 +02:00
Henry Jameson
83e4a112b9 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Add tlsv1.3 to suggestions
  hackney adapter helper & reverse proxy client: enable TLSv1.3
  StealEmojiPolicy: fix String rejected_shortcodes
  Instruct users to run 'git pull' as the pleroma user
  Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
  mix: Bump to 2.4.52 for 2.4.3 mergeback
  Skip cache when /objects or /activities is authenticated
  Allow to skip cache in Cache plug
  update sweet_xml [Security]
2022-06-07 16:02:14 +03:00
Pierre-Louis Bonicoli
6f23fc8e08
Add tlsv1.3 to suggestions 2022-05-31 00:51:48 +02:00
Henry Jameson
46c4d3b80f huuups 2022-04-19 18:17:41 +03:00
Henry Jameson
d08362cb30 hups 2022-04-19 18:17:25 +03:00
Henry Jameson
aa38f1da41 resolve deprecation warnings in conf 2022-04-19 18:16:30 +03:00
Henry Jameson
0613478bdb engage db congfiguration 2022-04-19 17:56:26 +03:00
Henry Jameson
31115e24c0 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (294 commits)
  Fix incorrect fallback when English is set to first language
  Fix eratic test for POST /api/pleroma/admin/reports/:id/notes
  After code review
  Support fallbacking to other languages
  Delete report notifs when demoting from superuser
  Update Caddyfile to Caddy v2
  Lint
  Support multiple locales from userLanguage cookie
  Support multiple locales formally
  Make lint happy
  Add test for fallbacking to a general language
  Fallback to a variant if the language in general is not supported
  Add changelog
  Document API addition
  Allow user to register with custom language
  Allow update_credentials to update User.language
  Send emails i18n'd using backend-stored user language
  Make all emails translatable
  Fix digest test
  Make mail and mailer translatable
  ...
2022-04-19 14:27:21 +03:00
marcin mikołajczak
fbf9eced11 Add short_description field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:04:27 +02:00
marcin mikołajczak
e473bcf7a0 Max media attachment count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-06 17:41:15 +01:00
Alex Gleason
dd7977bb68 Merge branch 'birth-dates' into 'develop'
Birth dates

See merge request pleroma/pleroma!3608
2022-01-25 15:35:47 +00:00
Alex Gleason
53de3a9d44 Revert "Merge branch 'log-slow-queries' into 'develop'"
This reverts merge request !3553
2022-01-24 18:54:43 +00:00
Alex Gleason
98ce239ebc
Update description.exs 2022-01-22 13:28:00 -06:00
Alex Gleason
66e8c6f90f
Birthdays: birth_date --> birthday 2022-01-22 13:21:55 -06:00
marcin mikołajczak
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
marcin mikołajczak
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
marcin mikołajczak
0f90fd5805 WIP account endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 18:15:10 +01:00
Alex Gleason
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
Alex Gleason
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
Ivan Tashkinov
08c0f09bad Made slow queries logging disabled by default. 2021-12-27 09:13:31 +03:00
Alibek Omarov
f02715c4b2 Fix lint errors 2021-12-27 03:42:03 +03:00
Alibek Omarov
cd1041c3a4 API: optionally restrict moderators from accessing sensitive data 2021-12-27 02:27:48 +03:00
Ivan Tashkinov
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
marcin mikołajczak
de006443f0 MastoAPI: Profile directory 2021-12-26 02:35:17 +00:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard 2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
lain
613f55b078 Merge branch 'benchmark' into 'develop'
Fix benchmarks

See merge request pleroma/pleroma!3551
2021-12-06 21:16:30 +00:00
Alex Gleason
ce4560c2a1
Fix benchmarks 2021-12-03 16:20:54 -05:00
lain
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
Haelwenn
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
rinpatch
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
Henry Jameson
9916734b76 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (33 commits)
  maybe_notify_subscribers: Don't create notifications from ingested messages
  TwitterAPI: Make change_email require body params instead of query
  TwitterAPI: Make change_password require body params instead of query
  Make the OPT recomendation clearer
  ObjectAgePolicy: Fix pattern matching on published
  fix: stream out Create Activity
  Improve readability
  Quarantine placeholders
  improve changelog entry
  Make transparency_exclusions use tuples in admin-fe
  Add key- and valuePlaceholders for quarantined_instances and mrf_simple
  Add transparency_exclusions also to the breaking changes
  Change docs
  quarantine instances info
  Change what nodeinfo returns without breaking backwards compatibility
  Return maps in node_info
  Add database migrations
  Fixed deprecation warning checks
  config/description.exs: Update quarantine settings to tuples
  make linter happy
  ...
2021-08-11 21:56:37 +03:00
Haelwenn
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
Henry Jameson
78c21efa1e Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (252 commits)
  mix.exs: 2.4.50
  Update PleromaFE Bundle (2.4.0)
  CHANGELOG.md: Fix instances of 2020 being actually 2021
  Release 2.4.0
  Update AdminFE bundle
  Visibility: check Tombstone objects in visible_for_user?/2
  CHANGELOG: fixed JSON error rendering
  Add activity+json to Phoenix :format_encoders Fixes ErrorView rendering
  CHANGELOG: AdminAPI return date with users
  AdminAPI: add date to users
  CHANGELOG: AdminAPI users sort
  AdminAPI: sort user results by ID descending
  Moderators: reorganize :admin_api pipeline in Router
  Moderators: add UserIsStaffPlug
  AP C2S: Remove restrictions and make it go through pipeline
  Update Linkify to fix crash on posts with a URL we failed to parse correctly
  fix the fucking list timelines on mastofe/soapbox-fe
  Deletions: change User.purge/1 to defp, add CHANGELOG entry
  Deletions: don't purge keys so Delete/Undo activities can be signed
  Deletions: allow deactivated users to be deleted
  ...
2021-08-08 17:59:23 +03:00
Sean King
1841bd8383 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe 2021-08-06 08:08:20 -06:00
Ilja
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
Ilja
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
Ilja
64002e92ad
config/description.exs: Update quarantine settings to tuples 2021-08-06 07:59:53 +02:00
Daniel
5c5571c668 use puts instead warn 2021-07-27 21:01:41 +00:00
Daniel
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
Alex Gleason
33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix 2021-07-27 08:29:53 -05:00
Alex Gleason
94db0b7cd6
Add activity+json to Phoenix :format_encoders
Fixes ErrorView rendering
2021-07-27 08:28:52 -05:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes 2021-07-18 11:49:22 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification 2021-07-17 22:19:38 -05:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream 2021-06-04 14:42:44 -06:00
Haelwenn
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
Mark Felder
679d4c23e9 Update wording for relays in docs and config description 2021-06-02 11:30:09 -05:00