Commit graph

15800 commits

Author SHA1 Message Date
Alex Gleason
d3bbb0fdd7
Add a Gitbook-ish SUMMARY.md 2023-02-04 16:43:17 -06:00
marcin mikołajczak
c6c724cea1 Merge branch 'merge-pleroma' into 'develop'
merge pleroma

See merge request soapbox-pub/rebased!229
2023-02-04 22:39:35 +00:00
830d7c1d58 Let moderators do things
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-04 23:23:07 +01:00
tusooa
08132002d2
Fix inproper content being cached in report content 2023-02-03 16:00:39 -05:00
83bdebcaea Do not expose privileges for other users
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-02 21:30:38 +01:00
tusooa
bc7ec43179
Allow customizing instance languages 2023-01-26 20:17:13 -05:00
Alex Gleason
75fee84600 Merge branch 'rich-media-ua' into 'develop'
Use WhatsApp user-agent for rich media by default

See merge request soapbox-pub/rebased!233
2023-01-22 00:08:44 +00:00
Alex Gleason
e8f414b3d0
Use WhatsApp user-agent for rich media by default
Related https://gitlab.com/soapbox-pub/rebased/-/issues/180
2023-01-21 18:05:53 -06:00
tusooa
1cf20184ff
Use versioned image from hexpm 2023-01-18 19:01:10 -05:00
tusooa
7467b24730
Fix block_from_stranger setting 2023-01-18 18:36:52 -05:00
tusooa
97f947deaf
Fix tests 2023-01-15 21:39:05 -05:00
tusooa
5af9ce4a01
Fix type of admin_account.is_confirmed 2023-01-15 18:41:36 -05:00
tusooa
3b4b84b74c
Force spec for every operation to have a listed tag 2023-01-15 18:31:37 -05:00
tusooa
bddcb3ed68
Add names to additionalProperties 2023-01-15 17:28:32 -05:00
marcin mikołajczak
0d08f049e9 Merge branch 'internal-webhooks' into 'develop'
Add internal (not managable from API) webhooks

See merge request soapbox-pub/rebased!197
2023-01-11 17:32:25 +00:00
marcin mikołajczak
9e3468c833 Merge branch 'develop' into 'internal-webhooks'
# Conflicts:
#   lib/pleroma/webhook.ex
2023-01-11 09:58:50 +00:00
a9e3ff9af9 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2023-01-10 13:39:39 +01:00
tusooa
a2766f310c
Bump linkify 2023-01-06 14:12:07 -05:00
tusooa
09ed8f4f8a
Test double dot link 2023-01-06 14:11:56 -05:00
tusooa
686fef59db
Test that zwnj is treated as word char in hashtags 2023-01-06 14:01:42 -05:00
lain
2a244b391d Merge branch '2768-strip-location' into 'develop'
Resolve "Exiftool may conflict with SVG files"

Closes #2768

See merge request pleroma/pleroma!3829
2023-01-05 16:50:02 +00:00
Lain Soykaf
fe00fbfd54 B StripLocation: Add test, work for all svgs. 2023-01-05 11:29:06 -05:00
Dmytro Poltavchenko
5b4962165e Added SVG to formats not compatible with exiftool 2023-01-05 11:26:57 -05:00
lain
51b4513258 Merge branch 'tusooa/earmark' into 'develop'
Bump earmark to 1.4.~34~22

Closes #3033

See merge request pleroma/pleroma!3820
2023-01-03 22:10:28 +00:00
Lain Soykaf
2eec3f8207 B TestHelper: Remove warnings-as-errors
It's already set in mix.exs
2023-01-03 17:01:56 -05:00
Lain Soykaf
b3a1cfaa7a Tests: Capture logs to clean up the test output. 2023-01-03 15:39:14 -05:00
Lain Soykaf
72b3ec35f8 Fix warnings in tests, treat warnings as errors in CI.
The warnings revealed two bad tests, the code still worked but the test
didn't actually test for it. Activating this for CI to prevent issues
like these in the future.
2023-01-03 14:59:14 -05:00
lain
a0cdc4cf9e Merge branch 'revert-0fe3f749' into 'develop'
Revert "Merge branch 'copyright-bump' into 'develop'"

See merge request pleroma/pleroma!3826
2023-01-02 21:06:52 +00:00
lain
e853cfe7c3 Revert "Merge branch 'copyright-bump' into 'develop'"
This reverts merge request !3825
2023-01-02 20:38:50 +00:00
Haelwenn
0fe3f749ea Merge branch 'copyright-bump' into 'develop'
Bump copyright year

See merge request pleroma/pleroma!3825
2023-01-02 16:38:34 +00:00
10886eeaa2 Bump copyright year
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-01 12:13:06 +01:00
silverpill
45646ff52c TagValidator: Add test for Link tag 2022-12-30 20:55:02 +00:00
Mark Felder
39e4b788ad Remove unwanted code specific to MIX_ENV=test 2022-12-30 15:36:21 -05:00
5c69ecf2bf Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-12-30 21:16:15 +01:00
0b91bfc047 Merge remote-tracking branch 'soapbox/develop' into merge-pleroma 2022-12-30 21:16:10 +01:00
marcin mikołajczak
64945b3b4c Merge branch 'restrict-unauth' into 'develop'
Respect restrict_unauthenticated in /api/v1/accounts/lookup

See merge request soapbox-pub/rebased!232
2022-12-30 17:53:30 +00:00
Atsuko Karagi
08db6765c8 Respect restrict_unauthenticated in /api/v1/accounts/lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-29 23:30:04 +01:00
Mark Felder
bea43aba33 Fix rel="me"
Cachex for this was not started
2022-12-29 19:42:14 +00:00
silverpill
c7dc5ce85c TagValidator: Allow unrecognized Tag types 2022-12-29 14:21:20 +00:00
tusooa
4b66f2b7f1
Bump earmark to 1.4.22 2022-12-28 11:57:29 -05:00
marcin mikołajczak
232170cbff Merge branch 'events-csp' into 'develop'
Actually fix CSP

See merge request soapbox-pub/rebased!231
2022-12-25 11:30:09 +00:00
9a3369f724 Actually fix CSP
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-25 10:04:29 +01:00
Alex Gleason
bc7af05954 Merge branch 'rebased-3.0' into 'develop'
Bump version to v3.0

See merge request soapbox-pub/rebased!230
2022-12-24 23:00:39 +00:00
Alex Gleason
7796bd4037
Bump version to v3.0 2022-12-24 16:59:22 -06:00
43f16e6321 Add ObanHelpers.perform_all to notifications test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-24 17:37:41 +01:00
29bc5d6d3f delete test for destroy_multiple_from_types/2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-24 17:30:32 +01:00
Haelwenn
2bc6911139 Merge branch 'weblate-extract' into 'develop'
Extract translatable strings

See merge request pleroma/pleroma!3818
2022-12-24 11:01:22 +00:00
weblate-extractor
64eef1eae4 Extract translatable strings 2022-12-24 06:06:39 +00:00
4b9df78df3 Add class=emoji to emojify test, related to commit 8f3e7505
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-23 20:36:34 +01:00
91f311c33f Try to use the new privileges system for mastodon admin api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-23 19:49:43 +01:00