Commit graph

1,457 commits

Author SHA1 Message Date
Mark Felder
cd3abe0b4c Fix more Logger warn -> warning 2023-12-20 16:23:57 -05:00
Haelwenn (lanodan) Monnier
086ba59d03 HTTPSignaturePlug: Add :authorized_fetch_mode_exceptions 2023-12-16 19:25:51 +01:00
Lain Soykaf
cca6c20eb6 Revert "EmailTest: use config mock"
This reverts commit dca41cc4a3.
2023-12-12 19:35:19 +04:00
Lain Soykaf
dca41cc4a3 EmailTest: use config mock 2023-12-12 15:25:52 +04:00
Lain Soykaf
190120fd79 Tests: More test fixes 2023-12-12 14:03:46 +04:00
Lain Soykaf
00def0875b RichMediaTest: Use mocked config 2023-12-12 13:28:11 +04:00
Lain Soykaf
22c4d89dbb ScheduledActivity: Use config mocking 2023-12-12 12:48:55 +04:00
Lain Soykaf
90a47ca050 S3 Test: Remove global state dependencies 2023-12-11 09:25:05 +04:00
Lain Soykaf
06fc196772 Backup: Fix config 2023-12-10 19:46:25 +04:00
Lain Soykaf
6e3267d1bd Tests: Fix all the tests. 2023-12-10 19:19:56 +04:00
Lain Soykaf
c068a218ea Backup Tests: Split out async tests, use mox. 2023-12-10 18:57:46 +04:00
Lain Soykaf
e5beab7f16 Config/Test: Don't start promex during testing. 2023-12-10 17:18:18 +04:00
lain
ef7bda61ad Merge branch 'promex' into 'develop'
Switch to PromEx for prometheus metrics

See merge request pleroma/pleroma!3967
2023-11-28 07:50:16 +00:00
Henry Jameson
a5aa8ea796 Add support for configuring a favicon and embed PWA manifest in server-generated-meta 2023-11-14 11:05:23 +01:00
Mark Felder
66cb3294ed Switch to PromEx for prometheus metrics
Recommending use of the separate HTTP server for exposing the metrics
and securing it externally on your firewall or reverse proxy. It will
listen on port 4021 by default.
2023-11-13 15:34:59 -05:00
lain
5f19fbc5a9 Merge branch 'phoenix1.7' into 'develop'
Update to Phoenix 1.7

See merge request pleroma/pleroma!3900
2023-11-12 13:34:27 +00:00
Lain Soykaf
c1402af293 B Getting: Add default implementation, delegate, prepare test support. 2023-11-12 14:49:15 +04:00
Lain Soykaf
0c5cc51983 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch 2023-11-12 13:53:18 +04:00
Mark Felder
a0e08c6ec2 Merge branch 'develop' into phoenix1.7 2023-11-07 16:05:04 -05:00
Mark Felder
bf426c53b4 Fix digest email processing, consolidate Oban queues
The email related jobs can all share a single Oban queue
2023-11-07 15:14:36 -05:00
Henry Jameson
034189afc8 Merge branch 'favicon' into shigusegubu 2023-11-01 18:51:03 +02:00
Henry Jameson
6f38915198 lint? 2023-10-30 11:29:57 +02:00
Henry Jameson
af4be5623e Merge branch 'favicon' into shigusegubu 2023-10-29 19:29:07 +02:00
Henry Jameson
3d2067d433 typo 2023-10-29 19:28:57 +02:00
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
marcin mikołajczak
6b8c5e12df Add contact account to InstanceView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-10-26 23:32:08 +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
Mark Felder
ffee478ed0 Move websocket config for Shoutbox to the Endpoint
This is the modern way of configuring it
2023-05-31 15:30:58 -04:00
Mark Felder
a7e7db4a29 Phoenix.Endpoint.Cowboy2Handler -> Plug.Cowboy.Handler 2023-05-31 13:48:16 -04: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
marcin mikołajczak
6e51845d44 Merge remote-tracking branch 'pleroma/develop' into secure-mode
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-27 16:41:16 +01:00