Commit graph

1262 commits

Author SHA1 Message Date
Henry Jameson
7a84ae4548 Merge branch 'favicon' into shigusegubu 2023-10-29 19:25:45 +02:00
Henry Jameson
5848ef137f add fields needed for chrome to make website installable 2023-10-29 19:25:14 +02:00
Henry Jameson
b1b41e8be1 Merge branch 'favicon' into shigusegubu 2023-10-29 19:14:48 +02:00
Henry Jameson
337d047c4d embed favicon on backend and make it configurable 2023-10-29 18:58:57 +02:00
tusooa
87353e5ad1
Fix config descriptions for mrf inline quote 2023-09-13 19:20:32 -04:00
tusooa
163e563733
Allow more flexibility in InlineQuotePolicy 2023-09-13 19:19:05 -04:00
Alex Gleason
93e4972b50
Add InlineQuotePolicy as a default MRF 2023-09-13 19:19:04 -04:00
Alex Gleason
57ef1d1211
Add InlineQuotePolicy to force quote URLs inline 2023-09-13 19:19:04 -04:00
Henry Jameson
a5048c270e oops 2023-09-04 19:39:51 +03:00
Henry Jameson
303db126a8 Merge remote-tracking branch 'origin/tusooa/quote' into shigusegubu 2023-09-04 19:34:06 +03:00
Henry Jameson
78697ad23a Merge remote-tracking branch 'origin/develop' into shigusegubu 2023-07-19 21:06:02 +03:00
tusooa
44eb648179
Fix config descriptions for mrf inline quote 2023-07-12 22:07:51 -04:00
tusooa
2c70857f9f
Allow more flexibility in InlineQuotePolicy 2023-07-12 09:30:43 -04:00
Alex Gleason
1cb39bfb90
Add InlineQuotePolicy as a default MRF 2023-07-10 17:52:10 -04:00
Alex Gleason
1a6ab18ebc
Add InlineQuotePolicy to force quote URLs inline 2023-07-10 17:52:07 -04:00
tusooa
28ff828caa
Add emoji policy to remove emojis matching certain urls
https://git.pleroma.social/pleroma/pleroma/-/issues/2775
2023-07-07 06:58:22 -04:00
Haelwenn
41f2ee69a8 Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop'
Detail backup states

Closes #3024

See merge request pleroma/pleroma!3809
2023-06-27 12:08:11 +00:00
Henry Jameson
00a9eae74a Merge remote-tracking branch 'origin/develop' into shigusegubu 2023-05-27 16:42:36 +03:00
duponin
0231a09310 Remove SSH/BBS feature from core
And link to sshocial, the replacement client for this removed feature
2023-04-23 10:47:07 +02:00
Henry Jameson
5f29bf2e4f Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (57 commits)
  remove static_fe pipeline for /users/:nickname/feed
  oops, remove unused import
  use scrub_html_and_truncate instead of scrub_html for feed item title
  modify Utils.scrub_html_and_truncate to take omission parameter
  format feed_view.ex
  feed eex templates: use published field from @data, not @activity.data
  fix tag feeds: remote activities might not have a summary field
  Make clear the test names
  Fix FederatorTest
  Stop oban from retrying if validating errors occur when processing incoming data
  Add the security fix to the changelog
  Sanitize filenames when uploading
  Allow with_relationships param for blocks
  Bundle frontend
  Bump version in mix project to 2.5.1
  Compose changelog for 2.5.1
  Ignores in exiftool read descriptions
  Bump crypt to v1.0.1
  Update mix.exs
  Bump linkify
  ...
2023-03-09 23:19:11 +02:00
tusooa
bc7ec43179
Allow customizing instance languages 2023-01-26 20:17:13 -05:00
Henry Jameson
e2eeded539 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (126 commits)
  Revert "Merge branch 'copyright-bump' into 'develop'"
  Bump copyright year
  Extract translatable strings
  mix: version 2.5.50
  mix: Release 2.5.0
  CHANGELOG: Set 2.5.0
  Git merge is not my favorite tool
  Revert "Delete report notifs when demoting from superuser"
  Update PleromaFE bundle to 2.5.0
  Make lint happy
  Use crazy hack to finally get pleroma:report notifications not visible after revoking privileges
  Update AdminFE bundle to version 2.5.0
  Extract translatable strings
  Fix TwitterCard meta tags
  Fix CommonAPI delete function to use User.privileged? instead of User.superuser?
  use to_rfc2822 instead of pub_date in tests, too
  document rss/atom fix in changelog
  modify user feed controller test to expect summary for title
  remove pub_date() -- use to_rfc2822 instead
  remove ap_id test -- the element makes the feed break
  ...
2023-01-03 20:58:13 +02:00
tusooa
179efd9467
Make backup parameters configurable 2022-12-24 00:20:25 -05:00
Sean King
60df2d8a97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges 2022-12-18 22:03:48 -07:00
Lain Soykaf
63d00f8123 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps 2022-12-15 17:19:36 -05:00
Henry Jameson
447bfcdb35 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (208 commits)
  Document inclusion of wasm-unsafe-eval
  Update http_security_plug.ex
  Update lib/pleroma/web/plugs/http_security_plug.ex
  try to fix ruffle on chrome
  Alter priority of Delete activities to be lowest
  Deletes do not generate notifications of any kind, so skip trying
  Object.Fetcher: Set reachable on successful fetch
  Translated using Weblate (Ukrainian)
  Added translation using Weblate (Ukrainian)
  Added translation using Weblate (Ukrainian)
  Lint
  Update config cheatsheet
  Clarify config description
  Document Oban workers getting timeouts defined
  Lint
  Define sane Oban Worker timeouts
  Clean up stale entries in mix.lock
  Document removal of Quack
  Add migration to remove Quack from ConfigDB
  Remove Quack logging backend
  ...
2022-11-18 01:38:17 +02:00
tusooa
f38cb4ccac Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
Lint

See merge request pleroma/pleroma!3778
2022-11-12 19:48:26 +00:00
tusooa
14871fecd4
Lint 2022-11-12 14:16:52 -05:00
tusooa
1b0e47b79b Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
Give admin the choice to not strip reported statuses

Closes #2887

See merge request pleroma/pleroma!3773
2022-11-12 17:55:50 +00:00
Haelwenn
c2cfe0c690 Clarify config description 2022-11-12 17:44:31 +00:00
Haelwenn
7c8618dc9a Merge branch 'no-ducks' into 'develop'
Remove Quack logging backend

See merge request pleroma/pleroma!3776
2022-11-12 05:40:07 +00:00
Mark Felder
6b87b3f2ea Remove Quack logging backend 2022-11-11 12:36:29 -05:00
lain
e7c40c2509 fix envvar 2022-11-11 15:40:32 +00:00
Iván Raskovsky
36519bdbee allow custom db port 2022-11-11 12:22:21 -03:00
marcin mikołajczak
eb70676931 Update links to Soapbox
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-11 12:13:30 +01:00
tusooa
6f047cc308
Do not strip reported statuses when configured not to 2022-11-09 22:36:57 -05:00
Mark Felder
7c64f705f6 Update to Phoenix 1.6 and chase dependencies
Also bump minimum Elixir to 1.11
2022-11-03 16:13:07 +00:00
Alexander Strizhakov
4121bca895 expanding WebFinger 2022-11-03 09:48:24 -04:00
Tusooa Zhu
467b6cad6f
Reduce incoming and outgoing federation queue sizes to 5 2022-09-17 16:34:33 -04:00
marcin mikołajczak
c6bc523914 Clarify birthday_min_age config description
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 20:25:01 +02:00
tusooa
f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop'
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
2022-09-05 15:19:34 +00:00
tusooa
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
Haelwenn (lanodan) Monnier
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
Sean King
d67d191344
Fix fedi-fe build URL 2022-08-24 23:39:02 -06:00
Sean King
cc0f32c253
Add glitch-lily as an installable frontend 2022-08-19 22:54:56 -06:00
Hélène
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
Ilja
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
Henry Jameson
550693111e Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (115 commits)
  Change test case wording
  Use `duration` param for mute expiration duration
  Emoji: apply recommended tail call changes
  Extract translatable strings
  Emoji: split qualification variation into a module
  Add authorized_fetch_mode to description.exs
  EmojiReactValidator: use new qualification method
  Emoji: implement full-qualifier using combinations
  EmojiReactValidator: fix emoji qualification
  Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'"
  Translated using Weblate (French)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  ...
2022-08-01 14:55:02 +03:00
marcin mikołajczak
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
Ilja
c045a49909 Add privilege for announcements 2022-07-14 08:40:26 +02:00