a7079057a9
Merge branch 'tusooa/docker-hexpm' into 'develop'
...
Use versioned image from hexpm for docker images
See merge request pleroma/pleroma!3834
2023-02-09 19:47:00 +00:00
7138910f30
Update mix.exs
2023-02-09 14:37:34 -05:00
724bf7c647
Merge branch 'tusooa/3055-instance-languages' into 'develop'
...
Allow customizing instance languages
Closes #3055
See merge request pleroma/pleroma!3835
2023-02-09 19:23:29 +00:00
50abb54d15
Merge branch 'fix-relme' into 'develop'
...
Fix rel="me"
See merge request pleroma/pleroma!3824
2023-02-09 19:09:54 +00:00
4d3c2fb21b
Merge branch 'tusooa/notif-setting' into 'develop'
...
Fix block_from_stranger setting
See merge request pleroma/pleroma!3833
2023-02-09 19:09:23 +00:00
16276c8f87
Merge branch 'test-warnings' into 'develop'
...
Fix warnings in tests, treat warnings as errors in CI.
See merge request pleroma/pleroma!3827
2023-02-09 19:05:50 +00:00
8583b3721d
B TestHelper, CI: Work with older elixir version.
2023-02-09 12:36:02 -05:00
e412363ff8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into test-warnings
2023-02-09 12:28:02 -05:00
55a8aa9787
Require related object for notifications to filter on content
2023-02-08 13:07:34 +03:00
08132002d2
Fix inproper content being cached in report content
2023-02-03 16:00:39 -05:00
bc7ec43179
Allow customizing instance languages
2023-01-26 20:17:13 -05:00
1cf20184ff
Use versioned image from hexpm
2023-01-18 19:01:10 -05:00
7467b24730
Fix block_from_stranger setting
2023-01-18 18:36:52 -05:00
97f947deaf
Fix tests
2023-01-15 21:39:05 -05:00
5af9ce4a01
Fix type of admin_account.is_confirmed
2023-01-15 18:41:36 -05:00
3b4b84b74c
Force spec for every operation to have a listed tag
2023-01-15 18:31:37 -05:00
bddcb3ed68
Add names to additionalProperties
2023-01-15 17:28:32 -05:00
a2766f310c
Bump linkify
2023-01-06 14:12:07 -05:00
09ed8f4f8a
Test double dot link
2023-01-06 14:11:56 -05:00
686fef59db
Test that zwnj is treated as word char in hashtags
2023-01-06 14:01:42 -05:00
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
fe00fbfd54
B StripLocation: Add test, work for all svgs.
2023-01-05 11:29:06 -05:00
5b4962165e
Added SVG to formats not compatible with exiftool
2023-01-05 11:26:57 -05:00
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
2eec3f8207
B TestHelper: Remove warnings-as-errors
...
It's already set in mix.exs
2023-01-03 17:01:56 -05:00
b3a1cfaa7a
Tests: Capture logs to clean up the test output.
2023-01-03 15:39:14 -05:00
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
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
e853cfe7c3
Revert "Merge branch 'copyright-bump' into 'develop'"
...
This reverts merge request !3825
2023-01-02 20:38:50 +00:00
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
45646ff52c
TagValidator: Add test for Link tag
2022-12-30 20:55:02 +00:00
39e4b788ad
Remove unwanted code specific to MIX_ENV=test
2022-12-30 15:36:21 -05:00
bea43aba33
Fix rel="me"
...
Cachex for this was not started
2022-12-29 19:42:14 +00:00
c7dc5ce85c
TagValidator: Allow unrecognized Tag types
2022-12-29 14:21:20 +00:00
4b66f2b7f1
Bump earmark to 1.4.22
2022-12-28 11:57:29 -05:00
2bc6911139
Merge branch 'weblate-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3818
2022-12-24 11:01:22 +00:00
64eef1eae4
Extract translatable strings
2022-12-24 06:06:39 +00:00
b367f22256
Merge branch 'mergeback/2.5.0' into 'develop'
...
Mergeback: 2.5.0
See merge request pleroma/pleroma!3817
2022-12-23 18:15:52 +00:00
6126f203d3
mix: version 2.5.50
2022-12-23 18:46:14 +01:00
f76c1d4f70
Merge branch 'release/2.5.0' into 'stable'
...
Release 2.5.0
See merge request pleroma/pleroma!3816
2022-12-23 17:43:21 +00:00
91c22637de
mix: Release 2.5.0
2022-12-23 17:10:02 +01:00
ee7694fa91
CHANGELOG: Set 2.5.0
2022-12-23 17:09:57 +01:00
5ce7db455c
Git merge is not my favorite tool
2022-12-23 17:07:26 +01:00
3fbd42061c
Revert "Delete report notifs when demoting from superuser"
...
This reverts commit 4504c81080
2022-12-23 17:06:09 +01:00
7d68d64d63
Merge back 2.4.5
2022-12-23 17:05:05 +01:00
6bce88b9e7
Merge branch 'pleromafe-2.5.0' into 'develop'
...
Update PleromaFE bundle to 2.5.0
See merge request pleroma/pleroma!3815
2022-12-23 14:32:10 +00:00
2c5bc9cffd
Update PleromaFE bundle to 2.5.0
2022-12-23 15:01:49 +01:00
99ff91584d
Merge branch 'adminfe-2.5.0' into 'develop'
...
Update AdminFE bundle to version 2.5.0
See merge request pleroma/pleroma!3814
2022-12-23 13:48:35 +00:00
718ff64c3b
Merge branch 'fine_grained_moderation_privileges' into 'develop'
...
fine grained moderation privileges (continued)
See merge request pleroma/pleroma!3812
2022-12-23 13:48:07 +00:00
lain