bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15977 commits 1 branch 0 tags 292 MiB
Commit graph

15977 commits

This branch
This branch
All branches
Author SHA1 Message Date
tusooa
7997ba0abe
Build images with kaniko 2023-04-12 11:49:33 -04:00
Duponin
e444832bb5 fix OTP install documentation 
'su pleroma' will never work if 'pleroma' user has no password, which is
better for security purpose.

If admin has no 'sudo' binary, I'm expecting them to be skilled enough 
to make their way on their own.
 2023-04-10 20:17:30 +00:00
marcin mikołajczak
6e34df8955 Merge branch 'static-pages-styles' into 'develop' 
Improve account header styles on authorization page

See merge request soapbox-pub/rebased!245
 2023-04-05 22:44:55 +00:00
marcin mikołajczak
89b7557732 Improve account header styles on authorization page 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-04-05 23:42:55 +02:00
Haelwenn
b7a831ca55 Merge branch 'from/upstream-develop/tusooa/require-changelog' into 'develop' 
require changelog

See merge request pleroma/pleroma!3739
 2023-04-05 07:53:11 +00:00
tusooa
686c3e03bd
Fix counting 2023-04-04 12:24:45 -04:00
Haelwenn
89a40b867d Allow more than 1 changelog entry 2023-04-04 16:20:46 +00:00
Haelwenn (lanodan) Monnier
ce16ff7ae8 mix: Update all dependencies 2023-04-04 11:19:38 +02:00
tusooa
78a6f56295 Merge branch 'doc/add-fedistar' into 'develop' 
Add Fedistar as a desktop client in docs

See merge request pleroma/pleroma!3866
 2023-04-01 17:46:30 +00:00
AkiraFukushima
e5f36f9f8d
Update contact information for Whalebird and Fedistar 2023-04-02 01:07:07 +09:00
AkiraFukushima
17f1b8d133
Remove Roma from docs 
Because this app is no longer maintained
 2023-04-02 01:03:15 +09:00
AkiraFukushima
81e1d6d9d0
Add Fedistar as a desktop client in docs 2023-04-02 01:02:22 +09:00
Ekaterina Vaartis
6a63dced4a Fix tests for frontend installation 2023-03-30 19:25:35 +03:00
Haelwenn
e4288df502 Merge branch 'background-timeout' into 'develop' 
Set background worker timeout to 15 minutes

See merge request pleroma/pleroma!3857
 2023-03-30 12:48:35 +02:00
tusooa
ad38cc3b0c Merge branch 'docs-otp-support' into 'develop' 
docs: Be more explicit about the level of compatibility of OTP releases

See merge request pleroma/pleroma!3849
 2023-03-30 12:48:12 +02:00
tusooa
40f14fd31c Merge branch 'remove-crypt' into 'develop' 
Remove crypt(3) support

Closes #3030 and #3062

See merge request pleroma/pleroma!3847
 2023-03-30 12:47:36 +02:00
Haelwenn
937df7e465 Merge branch 'fix/tag-feed-crashes' into 'develop' 
fix: atom/rss feed issues

Closes #3045

See merge request pleroma/pleroma!3851
 2023-03-30 12:46:35 +02:00
Haelwenn
d640df3927 Merge branch 'fix/static-fe-feed-500' into 'develop' 
fix: remove static_fe pipeline for /users/:nickname/feed

See merge request pleroma/pleroma!3852
 2023-03-30 12:45:39 +02:00
Haelwenn
22b72cd6b8 Merge branch 'tusooa/oban-common-pipeline' into 'develop' 
Stop oban from retrying if validating errors occur when processing incoming data

See merge request pleroma/pleroma!3844
 2023-03-30 12:43:58 +02:00
Ekaterina Vaartis
3037d2780c Also list frontends that are not in the config file 2023-03-30 11:16:40 +03:00
Ekaterina Vaartis
d3b27d45a9 List installed frontend refs in admin API 2023-03-29 23:23:06 +03:00
marcin mikołajczak
9310274c78 Merge branch 'merge-pleroma' into 'develop' 
Merge pleroma

See merge request soapbox-pub/rebased!244
 2023-03-28 10:48:37 +00:00
marcin mikołajczak
19b9ecb78c Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-03-28 12:36:52 +02:00
Haelwenn
4f7c11b281 Merge branch 'tusooa/3073-react-legacy' into 'develop' 
Fix emoji reactions for legacy 2-tuple formats

Closes #3073

See merge request pleroma/pleroma!3861
 2023-03-27 10:05:47 +00:00
tusooa
c5d946bc92
Fix emoji reactions for legacy 2-tuple formats 2023-03-26 15:12:40 -04:00
tusooa
67d1897c6e
Fix existing tests 2023-03-26 11:19:44 -04:00
tusooa
10930f7507
Dedupe poll options 2023-03-25 23:20:07 -04:00
Haelwenn
6d0cc8fa2a Merge branch 'features/image-object' into 'develop' 
Add support for Image objects

Closes #1581

See merge request pleroma/pleroma!3145
 2023-03-25 06:35:55 +00:00
Haelwenn
9c53d1fe19 Merge branch 'background-timeout' into 'develop' 
Set background worker timeout to 15 minutes

See merge request pleroma/pleroma!3857
 2023-03-25 05:40:35 +00:00
anemone
f463b7570e Set background worker timeout to 15 minutes 2023-03-23 23:14:52 -07:00
marcin mikołajczak
401e832f89 Merge branch 'merge-pleroma' into 'develop' 
Merge Pleroma

See merge request soapbox-pub/rebased!240
 2023-03-17 21:45:40 +00:00
marcin mikołajczak
e30381a533 No kurwa serio??? 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-03-17 22:33:16 +01:00
marcin mikołajczak
44df6d547b Fix profile fields update 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-03-16 20:41:51 +01:00
marcin mikołajczak
2427bf4e50 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2023-03-16 17:02:57 +01:00
marcin mikołajczak
47271b50a1 Fix api spec and tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-03-16 17:01:43 +01:00
Alex Gleason
eb1b4b2530 Merge branch 'fix-privilege' into 'develop' 
Prevent moderators from deleting admins

Closes #187

See merge request soapbox-pub/rebased!242
 2023-03-16 13:28:01 +00:00
tusooa
bf9db78426 Merge branch 'docs-otp-support' into 'develop' 
docs: Be more explicit about the level of compatibility of OTP releases

See merge request pleroma/pleroma!3849
 2023-03-16 08:11:44 +00:00
Haelwenn (lanodan) Monnier
9a2523a09a instances: Store some metadata based on NodeInfo 2023-03-16 09:02:20 +01:00
Haelwenn
353538d16c Merge branch 'pleroma-akkoma-emoji-port' into 'develop' 
Custom emoji reactions support

See merge request pleroma/pleroma!3845
 2023-03-16 08:00:00 +00:00
Haelwenn
c3600b6104 Merge branch 'feat/fields-rel-me-tag' into 'develop' 
feat: build rel me tags with profile fields

See merge request pleroma/pleroma!3850
 2023-03-16 07:53:27 +00:00
Alex Gleason
c64c4454d7
Prevent moderators from deleting admins 2023-03-15 19:20:36 -05:00
marcin mikołajczak
9af0657ec9 Merge branch 'show-reposted-replies' into 'develop' 
Display reposted replies with exclude_replies: true

See merge request soapbox-pub/rebased!241
 2023-03-15 20:21:40 +00:00
marcin mikołajczak
190fe4347e Display reposted replies with exclude_replies: true 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-03-15 20:24:11 +01:00
marcin mikołajczak
bda8589f16 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-03-15 19:39:24 +01:00
kPherox
83c7415803
fix: append field values to bio before parsing 2023-03-15 23:55:24 +09:00
tusooa
9145fd04f2 Merge branch 'remove-crypt' into 'develop' 
Remove crypt(3) support

Closes #3030 and #3062

See merge request pleroma/pleroma!3847
 2023-03-12 16:06:00 +00:00
tusooa
d18441e9c4 Indicate in changelog that removal of crypt is breaking 2023-03-12 16:04:43 +00:00
Alexander Tumin
2c2ea16b50 Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes 2023-03-12 11:39:17 +03:00
Haelwenn (lanodan) Monnier
ea07ec51ef Add support for Image objects 2023-03-09 14:21:12 +01:00
Haelwenn
f5c6e44731 Merge branch 'tusooa/block-rel' into 'develop' 
Allow with_relationships param for blocks

See merge request pleroma/pleroma!3843
 2023-03-09 13:13:14 +00:00