tusooa
530284e1b9
Add extracted pot
2023-05-02 16:32:33 -04:00
tusooa
85bdbb102e
Add extraction process for oauth scopes
2023-05-02 16:32:10 -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
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
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
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
Haelwenn
5cc23dc382
Merge branch 'fix/tag-feed-crashes' into 'develop'
...
fix: atom/rss feed issues
Closes #3045
See merge request pleroma/pleroma!3851
2023-03-06 22:55:24 +00:00
Haelwenn
0a042979b8
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-06 21:08:27 +00:00
faried nawaz
8241eff05b
remove static_fe pipeline for /users/:nickname/feed
2023-03-06 23:34:00 +05:00
faried nawaz
7b42ec5633
oops, remove unused import
2023-03-06 02:44:36 +05:00
faried nawaz
141146d1f1
use scrub_html_and_truncate instead of scrub_html for feed item title
...
Sometimes this truncated properly encoded HTML entities in the
wrong place. The new flow calls scrub_html, removes emojis,
decodes entities (a second time), truncates, and then re-encodes.
Fixes #3045 .
2023-03-06 02:38:02 +05:00
