marcin mikołajczak
|
fdbcf99836
|
Merge branch 'merge-pleroma' into 'develop'
Merge pleroma
See merge request soapbox-pub/rebased!268
|
2023-11-21 21:23:21 +00:00 |
|
marcin mikołajczak
|
4a60306d7d
|
Merge branch 'authorize_interaction' into 'develop'
Support /authorize-interaction route used by Mastodon
See merge request soapbox-pub/rebased!285
|
2023-11-21 15:21:47 +00:00 |
|
|
|
d611be290a
|
Support /authorize-interaction route used by Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-21 16:12:28 +01:00 |
|
NEETzsche
|
61c810eba0
|
Add optional URL value for scrobbles
|
2023-11-20 13:21:11 -07:00 |
|
Alex Gleason
|
ff1db302c9
|
Revert "Merge branch 'neetzsche/include-scrobble-url' into 'develop'"
This reverts merge request !288
|
2023-11-20 17:44:55 +00:00 |
|
|
|
c78495900e
|
Merge remote-tracking branch 'origin/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-17 22:53:06 +01:00 |
|
NEETzsche
|
19b041a90b
|
Add optional URL value for scrobbles
|
2023-11-16 20:13:42 +00:00 |
|
Haelwenn
|
ca1b18ba2d
|
Merge branch 'federation_status-access' into 'develop'
router: Make /federation_status publicly available
See merge request pleroma/pleroma!3937
|
2023-11-15 08:20:37 +00:00 |
|
Haelwenn
|
50c896169c
|
Merge branch 'cflags' into 'develop'
Make eblurhash and elixir-captcha use system CFLAGS
See merge request pleroma/pleroma!3943
|
2023-11-15 08:19:29 +00:00 |
|
Haelwenn (lanodan) Monnier
|
66f5ae0c5a
|
router: Make /federation_status publicly available
|
2023-11-14 10:48:30 +01:00 |
|
Haelwenn (lanodan) Monnier
|
3831d31009
|
docs: Put a max version on erlang and elixir
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3194
|
2023-11-14 10:47:33 +01:00 |
|
Haelwenn (lanodan) Monnier
|
4472ab1fe9
|
changelog.d/system-cflags.fix: New entry
|
2023-11-14 10:45:00 +01:00 |
|
Haelwenn
|
bf2d6abaf2
|
Merge branch 'healthcheck-disabled-error' into 'develop'
TwitterAPI: Return proper error when healthcheck is disabled
See merge request pleroma/pleroma!3953
|
2023-11-14 09:41:26 +00:00 |
|
lain
|
752bc168f6
|
Merge branch 'quotes-count' into 'develop'
Count and display post quotes
See merge request pleroma/pleroma!3956
|
2023-11-12 13:38:09 +00:00 |
|
marcin mikołajczak
|
9a063deacc
|
Count and display post quotes
|
2023-11-12 13:38:08 +00: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
|
5208bd8a95
|
Add changelog.
|
2023-11-12 15:00:51 +04:00 |
|
Mark Felder
|
e23672d82f
|
Ensure benchee doesn't run unless we are executing benchmarks
|
2023-11-08 12:44:57 -05:00 |
|
Mark Felder
|
0ab853cab8
|
Merge branch 'develop' into phoenix1.7
|
2023-11-08 09:18:08 -05:00 |
|
Haelwenn (lanodan) Monnier
|
76c070fe86
|
ObjectValidators.BareUriTest: Replace calls of SafeText to BareUri
|
2023-11-08 02:17:50 +01: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 |
|
tusooa
|
aaf53d9d77
|
Bump package version for mergeback
|
2023-10-31 20:49:31 -04:00 |
|
tusooa
|
ad45b06b3f
|
Merge branch 'stable' into 'release/2.6.0'
# Conflicts:
# .gitlab-ci.yml
# lib/pleroma/web/common_api/utils.ex
# lib/pleroma/web/xml.ex
# mix.exs
# test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
# test/pleroma/web/common_api/utils_test.exs
# test/pleroma/web/mastodon_api/update_credentials_test.exs
# test/pleroma/web/xml_test.exs
|
2023-10-31 01:07:43 +00:00 |
|
|
|
0ebbe8d9d7
|
Merge remote-tracking branch 'pleroma/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-28 00:30:08 +02:00 |
|
|
|
1e7e9b77d8
|
Undeprecate audio scrobbling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-28 00:27:57 +02:00 |
|
tusooa
|
a2a69709b5
|
Bump version to 2.6.0
|
2023-10-24 19:57:31 -04:00 |
|
tusooa
|
b748efe66a
|
Fix mentioning punycode domains when using Markdown
|
2023-10-16 21:35:25 -04:00 |
|
tusooa
|
3e7d2e29b3
|
Add changelog
|
2023-10-15 17:20:26 -04:00 |
|
Haelwenn (lanodan) Monnier
|
2f6fc6a7ab
|
TwitterAPI: Return proper error when healthcheck is disabled
|
2023-09-24 23:32:17 +02:00 |
|
tusooa
|
d244c9d298
|
Add changelog
|
2023-09-13 19:19:05 -04:00 |
|
Alex Gleason
|
82d99b835e
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-09-03 10:09:05 -05:00 |
|
Mint
|
535a5ecad0
|
CommonAPI: Prevent users from accessing media of other users
commit 1afde067b1 upstream.
|
2023-09-03 11:19:13 +02:00 |
|
Mint
|
1afde067b1
|
CommonAPI: Prevent users from accessing media of other users
|
2023-09-03 10:41:37 +02:00 |
|
tusooa
|
3c5ecca377
|
Skip changelog
|
2023-08-30 20:37:45 -04:00 |
|
Haelwenn
|
1e685c8302
|
Merge branch 'csp-flash' into 'develop'
allow https: so that flash works across instances without need for media proxy
See merge request pleroma/pleroma!3879
|
2023-08-16 13:37:49 +00:00 |
|
tusooa
|
b729a8b140
|
Merge branch 'fix-dockerfile-perms' into 'develop'
Fix config ownership in dockerfile to pass restriction test
See merge request pleroma/pleroma!3931
|
2023-08-10 00:42:29 +00:00 |
|
Cat pony Black
|
c298e0165c
|
Fix config ownership in dockerfile to pass restriction test
|
2023-08-08 19:07:48 +02:00 |
|
|
|
cc5053fb92
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-08-05 15:26:32 +02:00 |
|
|
|
96a6b4dbc8
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-08-05 15:22:01 +02:00 |
|
mae
|
48b1e9bdc7
|
Completely disable xml entity resolution
|
2023-08-05 14:17:04 +02:00 |
|
Haelwenn
|
17c336de66
|
Merge branch 'docs/gentoo-otp-intro' into 'develop'
gentoo_otp_en.md: Indicate which install method it covers
See merge request pleroma/pleroma!3928
|
2023-08-05 11:04:32 +00:00 |
|
Haelwenn (lanodan) Monnier
|
4099ddb3dc
|
Mergeback release 2.5.4
|
2023-08-05 08:58:05 +02:00 |
|
Haelwenn (lanodan) Monnier
|
b631180b38
|
Release 2.5.4
|
2023-08-05 08:27:42 +02:00 |
|
Mark Felder
|
cc848b78dc
|
Document and test that XXE processing is disabled
https://vuln.be/post/xxe-in-erlang-and-elixir/
|
2023-08-05 08:23:04 +02:00 |
|
Mark Felder
|
6d48b0f1a9
|
Document and test that XXE processing is disabled
https://vuln.be/post/xxe-in-erlang-and-elixir/
|
2023-08-05 08:14:27 +02:00 |
|
Haelwenn (lanodan) Monnier
|
0e321698d2
|
gentoo_otp_en.md: Indicate which install method it covers
|
2023-08-04 17:11:20 +02:00 |
|
Alex Gleason
|
fa4f0ae328
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-08-04 09:32:59 -05:00 |
|
Haelwenn (lanodan) Monnier
|
9f0ad901ed
|
changelog: Entry for config permissions restrictions
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3135
|
2023-08-04 09:50:28 +02:00 |
|
Haelwenn (lanodan) Monnier
|
22df32b3f5
|
changelog: Entry for config permissions restrictions
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3135
|
2023-08-04 09:49:53 +02:00 |
|
