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
1a50db36d3
Skip changelog entry for 3877
2023-04-26 07:20:35 -04:00
a946917206
Work around docker login needing daemon
2023-04-26 07:19:30 -04:00
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
47e95fe9f5
Add changelog for 3876
2023-04-25 21:40:28 -04:00
9c7b036401
Add ELIXIR_IMG arg to latest
2023-04-25 21:39:15 -04:00
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
c5ffdd0609
Use self-built elixir image for arm
2023-04-24 20:03:59 -04:00
2736c3f294
Use --custom-platform to replace the deprecated one
2023-04-24 19:57:32 -04:00
66d23713e9
Do not use nested levels for arch
2023-04-24 19:56:54 -04:00
af38c6104e
add changelog entry for BBS/SSH feature remove
2023-04-23 10:58:50 +02:00
b2dc9ad9d8
fix test after removing esshd/SSH feature
2023-04-23 10:47:17 +02:00
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
ae8f359f22
Skip changelog check for automated MRs
2023-04-22 21:07:18 -04:00
30bc37c3ca
Explain changelog.d in merge request templates
2023-04-22 21:02:13 -04:00
c1aa83069d
Skip changelog
2023-04-22 20:45:27 -04:00
e13b331762
Fetch upstream in the repo
2023-04-22 20:42:59 -04:00
50e237759a
Use git diff to search for changelog entry
2023-04-22 20:31:48 -04:00
2148ef5e2f
UploadedMedia: Increase readability via ~s sigil
2023-04-18 00:12:42 +02:00
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
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
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
23bca0c4b3
Skip changelog entry
2023-04-12 12:40:26 -04:00
b37a90caa3
Combine images of different platforms into one
2023-04-12 12:38:47 -04:00
7997ba0abe
Build images with kaniko
2023-04-12 11:49:33 -04:00
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
686c3e03bd
Fix counting
2023-04-04 12:24:45 -04:00
89a40b867d
Allow more than 1 changelog entry
2023-04-04 16:20:46 +00:00
ce16ff7ae8
mix: Update all dependencies
2023-04-04 11:19:38 +02:00
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
e5f36f9f8d
Update contact information for Whalebird and Fedistar
2023-04-02 01:07:07 +09:00
17f1b8d133
Remove Roma from docs
...
Because this app is no longer maintained
2023-04-02 01:03:15 +09:00
81e1d6d9d0
Add Fedistar as a desktop client in docs
2023-04-02 01:02:22 +09:00
6a63dced4a
Fix tests for frontend installation
2023-03-30 19:25:35 +03:00
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
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
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
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
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
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
3037d2780c
Also list frontends that are not in the config file
2023-03-30 11:16:40 +03:00
d3b27d45a9
List installed frontend refs in admin API
2023-03-29 23:23:06 +03:00
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
c5d946bc92
Fix emoji reactions for legacy 2-tuple formats
2023-03-26 15:12:40 -04:00
67d1897c6e
Fix existing tests
2023-03-26 11:19:44 -04:00
10930f7507
Dedupe poll options
2023-03-25 23:20:07 -04:00
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
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
f463b7570e
Set background worker timeout to 15 minutes
2023-03-23 23:14:52 -07:00
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