hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17,654 commits 2 branches 0 tags 242 MiB
Commit graph

17,654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phantasm
662c9f36ac Favicon Plug: Update moduledoc and rename to adhere to convention 2026-03-05 20:21:19 +00:00
Phantasm
2388964b14 Favicon Plug: Add tests 2026-03-05 20:21:19 +00:00
Phantasm
d03ae43ee0 Favicon Plug: Simplify and pass when not requesting favicon 2026-03-05 20:21:19 +00:00
Yonle
8975129680 webplug(favicon): remove check on url path. 2026-03-05 20:21:19 +00:00
Yonle
96f252023e constants: remove favicon.png from static_only_files 2026-03-05 20:21:19 +00:00
Yonle
0879dd3950 endpoint: reorder: handle favicon plug first 2026-03-05 20:21:19 +00:00
Yonle
4bc0b26abe changelog.d: add cache-control-immutable 2026-03-05 20:21:19 +00:00
Yonle
8abd25950a endpoint: use favicon plug 2026-03-05 20:21:19 +00:00
Yonle
970e0f9044 endpoint: set cache control for favicon.png 
Signed-off-by: Yonle <yonle@proton.me>
 2026-03-05 20:21:19 +00:00
Yonle
848b3f5d5b reverse_proxy,endpoint,uploaded_media: add immutable cache-control flag 2026-03-05 20:21:19 +00:00
Phantasm
222306ff27 Merge pull request 'Fix AccountController Plug warning from typo' (#7848) from phnt/pleroma:plug-test-typo into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7848
 2026-03-03 22:20:34 +00:00
Phantasm
ca38217898
 		Fix AccountController Plug warning 
the URI path used in plug tests must start with "/", got: "api/v1/blocks"
  (plug 1.19.1) lib/plug/adapters/test/conn.ex:14: Plug.Adapters.Test.Conn.conn/4
  (phoenix 1.7.14) lib/phoenix/test/conn_test.ex:236: Phoenix.ConnTest.dispatch_endpoint/5
  (phoenix 1.7.14) lib/phoenix/test/conn_test.ex:225: Phoenix.ConnTest.dispatch/5
  test/pleroma/web/mastodon_api/controllers/account_controller_test.exs:2099: Pleroma.Web.MastodonAPI.AccountControllerTest."test getting a list of blocks"/1
  (ex_unit 1.19.5) lib/ex_unit/runner.ex:528: ExUnit.Runner.exec_test/2
  (ex_unit 1.19.5) lib/ex_unit/capture_log.ex:121: ExUnit.CaptureLog.with_log/2
  (ex_unit 1.19.5) lib/ex_unit/runner.ex:477: anonymous fn/3 in ExUnit.Runner.maybe_capture_log/3
  (stdlib 7.2) timer.erl:599: :timer.tc/2
  (ex_unit 1.19.5) lib/ex_unit/runner.ex:450: anonymous fn/6 in ExUnit.Runner.spawn_test_monitor/4
 2026-03-03 23:11:39 +01:00
nicole mikołajczyk
65c7d0c7b9 Merge pull request 'Update comment for prepare_object, rename prepare_outgoing' (#7818) from mkljczk/pleroma:update-comment into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7818
 2026-03-03 12:49:50 +00:00
nicole mikołajczyk
68de463392 Merge pull request 'update mix.exs deps versions to match mix.lock so they don't look that scary' (#7839) from mkljczk/pleroma:mix-exs-update into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7839
Reviewed-by: Phantasm <phnt@noreply.git.pleroma.social>
 2026-03-02 23:37:01 +00:00
nicole mikołajczyk
3620726ff3 Merge pull request 'Add sane defaults for :database_config_whitelist, add a task to remove non-whitelisted configs' (#7837) from pleroma-database-config-whitelist into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7837
 2026-03-02 22:38:31 +00:00
nicole mikołajczyk
37041aae60 update mix.exs deps versions to match mix.lock so they don't look that scary 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-02 22:50:49 +01:00
nicole mikołajczyk
c3b779036d Merge branch 'develop' into pleroma-database-config-whitelist 2026-03-01 22:44:08 +00:00
nicole mikołajczyk
36a79ab58e Merge pull request 'Add issue and pull request templates for Forgejo' (#7819) from mkljczk/pleroma:forgejo-templates into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7819
Reviewed-by: Phantasm <phnt@noreply.git.pleroma.social>
 2026-03-01 22:43:10 +00:00
nicole mikołajczyk
d389359ec3 Merge pull request 'mix.exs: use correct override value' (#7838) from mkljczk/pleroma:mix-exs-fix into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7838
 2026-03-01 22:42:17 +00:00
nicole mikołajczyk
6405a2e682 Merge pull request 'Move avatar_description and header_description fields to the account object' (#7828) from mkljczk/pleroma:avatar-description-mastodon-api into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7828
 2026-03-01 22:40:01 +00:00
nicole mikołajczyk
38c30d50b4 Merge pull request 'Update docs on scrobbles' (#7836) from mkljczk/pleroma:docs-scrobble into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7836
 2026-03-01 22:39:44 +00:00
nicole mikołajczyk
9040f97cea Merge pull request 'Do not use Enum.map for side-effects' (#7840) from mkljczk/pleroma:map-side-effects into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7840
 2026-03-01 22:39:26 +00:00
nicole mikołajczyk
a9b5a28c26 Do not use Enum.map for side-effects 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-27 16:24:10 +01:00
nicole mikołajczyk
938ee4cb01 mix.exs: use correct override value 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-27 15:45:57 +01:00
mkljczk
c392b21db1 Update docs on scrobbles 2026-02-27 09:22:14 +00:00
Phantasm
588bc656f2 Merge pull request #7751 from gitlab-mr-iid-4374 into develop 2026-02-22 21:56:00 +00:00
Phantasm
ef7be0a1e5 DB prune: Add test for hashtags 2026-02-22 21:46:41 +00:00
Phantasm
e32ab8aef2 DB prune: Check if user follows hashtag with no objects before deletion 2026-02-22 21:46:41 +00:00
nicole mikołajczyk
0b950f6253 comment out stuff 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-18 13:37:10 +01:00
nicole mikołajczyk
3d9ac413af Move avatar_description and header_description fields to the account object 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-17 14:00:21 +01:00
feld
1c685ea41a Update README.md 
fix logo
 2026-02-12 00:34:08 +00:00
nicole mikołajczyk
b798f7d6e9 Add issue and pull request templates for Forgejo 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-10 14:53:45 +01:00
nicole mikołajczyk
2e80c786bb Update comment for prepare_object, rename prepare_outgoing 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-10 14:37:30 +01:00
lain
ec6ffa4fdf Merge pull request 'CI: Add basic woodpecker file' (#7816) from woodpecker-ci into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7816
 2026-02-09 17:46:19 +00:00
Lain Soykaf
4693dc837b CI: Only run on PR 2026-02-09 10:13:29 +04:00
Lain Soykaf
feda4d0718 CI: Add basic woodpecker file 2026-02-09 09:01:16 +04:00
nicole mikołajczyk
cb78699a3b Merge branch 'instance-profile-fields' into 'develop' 
Add /api/v2/instance profile fields limits info used by Mastodon

See merge request pleroma/pleroma!4434
 2026-01-30 23:04:49 +01:00
nicole mikołajczyk
833e9829ba Merge branch 'relationship-expires-at' into 'develop' 
MastoAPI AccountView: Add mute/block expiry to the relationship object (simplified)

See merge request pleroma/pleroma!4433
 2026-01-30 07:08:21 +01:00
nicole mikołajczyk
bd30d461b0 Add /api/v2/instance profile fields limits info used by Mastodon 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-30 07:05:45 +01:00
nicole mikołajczyk
5001fb3a78 Update changelog 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 14:02:55 +01:00
nicole mikołajczyk
bc0c7fb310 Fix tests, relationship should always define _expires_at 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 13:58:33 +01:00
Phantasm
c1e33bfadb MastoAPI AccountView AccountController: Add more block/mute expiry tests 2026-01-28 13:50:34 +01:00
Phantasm
e7a4d5ea66 MastoAPI AccountView: Add mute/block expiry to the relationship key 2026-01-28 13:50:23 +01:00
nicole mikołajczyk
6fac6ff7f1 MastoAPI AccountView: Add mute/block expiry to the relationship object 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 13:49:34 +01:00
nicole mikołajczyk
055242f438 Merge branch 'assign-users' into 'develop' 
Allow assigning users to reports

See merge request pleroma/pleroma!3670
 2026-01-28 11:22:09 +01:00
nicole mikołajczyk
80ede85f75 Allow assigning users to reports 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 10:35:19 +01:00
lain
d6bec8b6b7 Merge branch 'delete-outdated-docs' into 'develop' 
Docs: Remove outdated, incorrect, inappropriate or unmaintained install docs

See merge request pleroma/pleroma!4432
 2026-01-25 05:46:31 +00:00
Phantasm
54092d2b7c Docs: Remove outdated, incorrect, inappropriate or unmaintained install docs 2026-01-25 05:46:28 +00:00
lain
a7a3978a20 Merge branch 'revert-d6888e24' into 'develop' 
Update Hackney, fix redirect issues

See merge request pleroma/pleroma!4412
 2026-01-17 11:09:27 +00:00
Lain Soykaf
a4fb651fac ConfigController: Don't allow whitelist modification. 2026-01-17 13:30:07 +04:00