moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,531 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

15531 Commits

Author SHA1 Message Date
Mark Felder bf57fd82bb Clarify location of test.secret.exs file 2023-12-20 14:12:06 -05:00
feld 99b07c817e Merge branch 'web_push' into 'develop' 
Fix Web Push notification delivery

See merge request pleroma/pleroma!4008
 2023-12-19 16:19:35 +00:00
Mark Felder e2066994b1 Fix Web Push notification delivery 
Finch does not automatically append header content-type: octet-stream for binary payloads.
 2023-12-19 10:56:55 -05:00
Haelwenn 8893a044b3 Merge branch 'priority_activities' into 'develop' 
Priority activities

See merge request pleroma/pleroma!4004
 2023-12-18 00:49:09 +00:00
Lain Soykaf c1423ddca3 ActivityPub.Publisher: Filter inboxes 2023-12-17 11:15:58 +04:00
Lain Soykaf 77bb1bb6c8 Actually write changelog 2023-12-16 21:41:28 +04:00
Lain Soykaf a0f70cf7d0 Add changelog 2023-12-16 20:40:51 +04:00
Lain Soykaf c212fc1dcf User: Ignore non-local users when setting 'last active at' 2023-12-16 20:32:13 +04:00
Lain Soykaf 3fbc80eb58 B ActivityPub.Publisher: Prioritize direct mentions 2023-12-16 20:26:08 +04:00
Haelwenn 147b37b893 Merge branch 'mergeback/2.6.1' into 'develop' 
mergeback: 2.6.1

Closes #3194

See merge request pleroma/pleroma!4003
 2023-12-16 01:03:37 +00:00
tusooa f5559f3aff
Skip changelog for 2.6.1 mergeback 2023-12-15 19:45:23 -05:00
tusooa 453cb6a388
Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1 2023-12-15 19:43:07 -05:00
tusooa 6722b7f395 Merge branch 'release/2.6.1' into 'stable' 
Release: 2.6.1

See merge request pleroma/pleroma!3999
 2023-12-16 00:36:08 +00:00
Haelwenn f07b134add Fix formatting of changelog 2023-12-15 23:52:37 +00:00
lain 7622a83973 Merge branch 'service-actor-outbox' into 'develop' 
ap userview: add outbox field.

See merge request pleroma/pleroma!4002
 2023-12-15 06:22:55 +00:00
Lain Soykaf 766011544a UserViewTest: Add basice service actor test. 2023-12-15 10:01:31 +04:00
Yonle cb1b52d980 ap userview: add outbox field. 
Signed-off-by: Yonle <yonle@lecturify.net>
 2023-12-15 09:55:06 +04:00
tusooa 948f01f19a
Bundle 2.6.1 frontend 2023-12-14 20:32:49 -05:00
tusooa ad6a6aa07b
Bump version to 2.6.1 2023-12-14 20:14:41 -05:00
Haelwenn (lanodan) Monnier b1ea63b4c6
changelog.d/system-cflags.fix: New entry 2023-12-14 20:13:25 -05:00
Haelwenn (lanodan) Monnier 41f6e8f7f4
mix: Bump elixir-captcha for system-CFLAGS 2023-12-14 20:13:20 -05:00
Haelwenn (lanodan) Monnier 08839602bd
mix: cherry-pick eblurhash latest git for system-CFLAGS 2023-12-14 20:13:00 -05:00
Haelwenn (lanodan) Monnier 35090f6eac
TwitterAPI: Return proper error when healthcheck is disabled 2023-12-14 20:11:01 -05:00
Haelwenn (lanodan) Monnier 272271d939
docs: clang is also supported 2023-12-14 07:29:54 -05:00
Haelwenn (lanodan) Monnier 1b22f13488
docs: Put a max version on erlang and elixir 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3194
 2023-12-14 07:29:54 -05:00
Henry Jameson e635ee8b39
changelog 2023-12-14 07:28:52 -05:00
Henry Jameson 57445e65cb
update, add images 2023-12-14 07:28:52 -05:00
Henry Jameson 476fd01f8d
Initial draft on frontends management 2023-12-14 07:28:43 -05:00
lain 02acf7c0b3 Merge branch 'fix-develop-tests' into 'develop' 
StatusViewTest: Fix tests.

See merge request pleroma/pleroma!3998
 2023-12-13 10:05:18 +00:00
Lain Soykaf 1458de92f0 Gitlab CI: Switch to our own docker hub 2023-12-13 13:08:00 +04:00
Lain Soykaf 935dce9a0b Gitlab CI: Update postgres for rum tests. 2023-12-13 12:45:52 +04:00
Lain Soykaf 40fa1099bf StatusViewTest: Fix tests. 2023-12-13 11:19:08 +04:00
lain 29d202e1df Merge branch 'add-opengraph-rich-media-proxy' into 'develop' 
Add media proxy to opengraph rich media cards

See merge request pleroma/pleroma!3997
 2023-12-13 06:23:16 +00:00
lain 2c560266e9 Merge branch 'no-async-clear-config' into 'develop' 
Various test improvements and refactors

See merge request pleroma/pleroma!3991
 2023-12-12 15:54:55 +00:00
Lain Soykaf cca6c20eb6 Revert "EmailTest: use config mock" 
This reverts commit dca41cc4a3.
 2023-12-12 19:35:19 +04:00
Lain Soykaf a989b793de Revert "Tests: fix more tests" 
This reverts commit 05352330bb.
 2023-12-12 19:35:08 +04:00
Alexander Tumin e7af2addd8 Add media proxy to opengraph rich media cards 2023-12-12 18:32:02 +03:00
Lain Soykaf 877552c6f8 Linting 2023-12-12 19:11:15 +04:00
Lain Soykaf 05352330bb Tests: fix more tests 2023-12-12 19:08:57 +04:00
Lain Soykaf dca41cc4a3 EmailTest: use config mock 2023-12-12 15:25:52 +04:00
Lain Soykaf b13820dcd0 Tests: Remove `skip_on_mac` tag 2023-12-12 14:09:22 +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 31a524fb52 Merge branch 'docker-fix-22' into 'develop' 
Fix dockerfile compilation.

See merge request pleroma/pleroma!3996
 2023-12-12 09:06:11 +00:00
Lain Soykaf da3d1157e5 Fix dockerfile compilation. 2023-12-12 13:04:53 +04:00
Lain Soykaf 650edb60dc ScheduledActivityControllerTest: Fix tests, make async. 2023-12-12 12:56:07 +04:00
Lain Soykaf 4ba03aa29b MastodonAPITest: Fix tests 2023-12-12 12:55:53 +04:00
Lain Soykaf 22c4d89dbb ScheduledActivity: Use config mocking 2023-12-12 12:48:55 +04:00
Lain Soykaf 8da1fd329d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-clear-config 2023-12-12 12:29:22 +04:00
lain e9d9caa77c Merge branch 'fix-dockerfile' into 'develop' 
Dockerfile: Use platform libvips.

See merge request pleroma/pleroma!3995
 2023-12-12 08:11:33 +00:00