sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
14935 commits 2 branches 40 tags 290 MiB
Commit graph

14935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn
143676f58c Merge branch 'tusooa/allow-lang' into 'develop' 
Allow lang attribute

See merge request pleroma/pleroma!3882
 2023-05-17 15:28:32 +00:00
tusooa
163e82bab1
Allow lang attribute 2023-05-09 19:27:32 -04:00
tusooa
248f914e6e Merge branch 'list-installed-frontends' into 'develop' 
List installed frontend refs in admin API

See merge request pleroma/pleroma!3862
 2023-04-27 02:56:19 +00:00
tusooa
ddf57596be Merge branch 'bugfix/content-disposition' into 'develop' 
UploadedMedia: Add missing disposition_type to Content-Disposition

Closes #3114

See merge request pleroma/pleroma!3873
 2023-04-26 15:39:20 +00:00
Haelwenn
286b9bb66c Merge branch 'tusooa/no-more-needs' into 'develop' 
Do not use needs: in pipeline yaml

See merge request pleroma/pleroma!3878
 2023-04-26 14:23:47 +00:00
tusooa
d5e8345946
Do not use needs: in pipeline yaml 2023-04-26 09:14:49 -04:00
lain
d97425d49e Merge branch 'duponin/remove-ssh' into 'develop' 
Remove SSH/BBS feature from core

Closes #932, #2389, and #2931

See merge request pleroma/pleroma!3872
 2023-04-26 12:19:46 +00:00
Haelwenn
18913c4cd8 Merge branch 'tusooa/combine-login' into 'develop' 
Work around docker login needing daemon

See merge request pleroma/pleroma!3877
 2023-04-26 11:43:46 +00:00
tusooa
1a50db36d3
Skip changelog entry for 3877 2023-04-26 07:20:35 -04:00
tusooa
a946917206
Work around docker login needing daemon 2023-04-26 07:19:30 -04:00
Haelwenn
3b2d7cc67f Merge branch 'tusooa/kaniko' into 'develop' 
Add ELIXIR_IMG arg to latest

See merge request pleroma/pleroma!3876
 2023-04-26 02:59:13 +00:00
tusooa
47e95fe9f5
Add changelog for 3876 2023-04-25 21:40:28 -04:00
tusooa
9c7b036401
Add ELIXIR_IMG arg to latest 2023-04-25 21:39:15 -04:00
Haelwenn
6bd0df1357 Merge branch 'tusooa/kaniko' into 'develop' 
Use kaniko to build docker images

See merge request pleroma/pleroma!3870
 2023-04-25 23:14:21 +00:00
tusooa
c5ffdd0609
Use self-built elixir image for arm 2023-04-24 20:03:59 -04:00
tusooa
2736c3f294
Use --custom-platform to replace the deprecated one 2023-04-24 19:57:32 -04:00
tusooa
66d23713e9
Do not use nested levels for arch 2023-04-24 19:56:54 -04:00
duponin
af38c6104e add changelog entry for BBS/SSH feature remove 2023-04-23 10:58:50 +02:00
duponin
b2dc9ad9d8 fix test after removing esshd/SSH feature 2023-04-23 10:47:17 +02:00
duponin
0231a09310 Remove SSH/BBS feature from core 
And link to sshocial, the replacement client for this removed feature
 2023-04-23 10:47:07 +02:00
Haelwenn (lanodan) Monnier
2148ef5e2f UploadedMedia: Increase readability via ~s sigil 2023-04-18 00:12:42 +02:00
Haelwenn (lanodan) Monnier
8f0f58e28b UploadedMedia: Add missing disposition_type to Content-Disposition 
Set it to `inline` because the vast majority of what's sent is multimedia
content while `attachment` would have the side-effect of triggering a
download dialog.

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3114
 2023-04-18 00:09:19 +02:00
Haelwenn
3867b52aef Merge branch 'tusooa/3027-dedupe-poll' into 'develop' 
Dedupe poll options

Closes #3027

See merge request pleroma/pleroma!3860
 2023-04-13 08:40:04 +00:00
Haelwenn
cf1ba77b9e Merge branch '2023-04-mix-deps-update' into 'develop' 
mix: Update all dependencies

See merge request pleroma/pleroma!3867
 2023-04-13 08:36:35 +00:00
tusooa
23bca0c4b3
Skip changelog entry 2023-04-12 12:40:26 -04:00
tusooa
b37a90caa3
Combine images of different platforms into one 2023-04-12 12:38:47 -04:00
tusooa
7997ba0abe
Build images with kaniko 2023-04-12 11:49:33 -04: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
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
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
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
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
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