Mark Felder
|
9b6b5ac196
|
Rename upload filter to AnalyzeMetadata
|
3 years ago |
|
lain
|
44be498fe1
|
Merge branch 'optional-config' into 'develop'
Save ~10 minutes on source installation
See merge request pleroma/pleroma!3406
|
3 years ago |
|
Alex Gleason
|
7ac4da8dd4
|
Merge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exs
|
3 years ago |
|
Alex Gleason
|
230ad82dad
|
gitignore `config/runtime.exs`
|
3 years ago |
|
Alex Gleason
|
32ae8f4906
|
Merge remote-tracking branch 'pleroma/develop' into optional-config
|
3 years ago |
|
Alex Gleason
|
b540fff908
|
Docs: use `MIX_ENV=prod mix pleroma.instance gen`
|
3 years ago |
|
Alex Gleason
|
b22f54eb29
|
Make prod.secret.exs optional (with warning)
|
3 years ago |
|
Alex Gleason
|
bcf6efce15
|
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
|
3 years ago |
|
Alex Gleason
|
543e9402d6
|
Support blurhash
|
3 years ago |
|
Alex Gleason
|
5a57b025c7
|
Changelog: attachment meta
|
3 years ago |
|
Alex Gleason
|
ff02511057
|
Merge remote-tracking branch 'upstream/develop' into attachment-meta
|
3 years ago |
|
Alex Gleason
|
6f0b42656d
|
Federate attachments as Links instead of Documents
|
3 years ago |
|
Alex Gleason
|
02b9436494
|
Don't render media `meta` if nil
|
3 years ago |
|
Alex Gleason
|
4c060ae733
|
Ingest remote attachment width/height
|
3 years ago |
|
Alex Gleason
|
ab9eabdf20
|
Add SetMeta filter to store uploaded image sizes
|
3 years ago |
|
Alex Gleason
|
cea44b6b3e
|
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
|
3 years ago |
|
feld
|
745375bdcf
|
Merge branch 'dont-crash-email-settings' into 'develop'
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
|
3 years ago |
|
feld
|
d5263bfcf3
|
Merge branch 'earmark' into 'develop'
Upgrade Earmark to v1.4.15
Closes #1942 and #2026
See merge request pleroma/pleroma!3076
|
3 years ago |
|
Alex Gleason
|
90770e0841
|
CHANGELOG: don't crash so hard when email settings are invalid
|
3 years ago |
|
Alex Gleason
|
c186b059a7
|
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
|
3 years ago |
|
Alex Gleason
|
c80b1aaf51
|
Don't crash when email settings are invalid
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
|
3 years ago |
|
Alex Gleason
|
dca87c5e7b
|
CHANGELOG: markdown
|
3 years ago |
|
Alex Gleason
|
20878c7f99
|
CHANGELOG: SimplePolicy embedded objects are now checked
|
3 years ago |
|
Alex Gleason
|
926a233cc4
|
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
|
3 years ago |
|
Alex Gleason
|
c16c7fdb87
|
SimplePolicy: filter string Objects
|
3 years ago |
|
Alex Gleason
|
3d742c3c1a
|
SimplePolicy: filter nested objects
|
3 years ago |
|
Alex Gleason
|
52fc59f125
|
Merge remote-tracking branch 'upstream/develop' into earmark
|
3 years ago |
|
Alex Gleason
|
a8fa00ef66
|
Fix failing remote mentions test, valid TLDs
|
3 years ago |
|
Alex Gleason
|
53760d2cda
|
Delete obsolete EarmarkRendereTests (moved to UtilsTest)
|
3 years ago |
|
Alex Gleason
|
6727a3659f
|
Remove Pleroma.Formatter.minify/2
|
3 years ago |
|
Alex Gleason
|
004bcedb07
|
Upgrade Earmark 1.4.15
|
3 years ago |
|
feld
|
377f84f367
|
Merge branch 'oauth-token-id' into 'develop'
Return token's primary key with POST /oauth/token
See merge request pleroma/pleroma!3380
|
3 years ago |
|
Alex Gleason
|
6bc8ab225d
|
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
|
3 years ago |
|
feld
|
2fe3bd8178
|
Merge branch 'maybe-fix-ci' into 'develop'
CI: Purge pleroma build directory between runs
See merge request pleroma/pleroma!3399
|
3 years ago |
|
Alex Gleason
|
b5ae826898
|
CI: Purge pleroma build directory between runs
|
3 years ago |
|
Alex Gleason
|
8c1d6e8839
|
CHANGELOG: Return OAuth token `id`
|
3 years ago |
|
Alex Gleason
|
e7ac15905e
|
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
|
3 years ago |
|
Haelwenn
|
115673bce7
|
Merge branch 'gitlab-ci-mix-lock' into 'develop'
Cache GitLab CI based on mix.lock
See merge request pleroma/pleroma!3398
|
3 years ago |
|
Alex Gleason
|
b9a99ac0d4
|
Cache gitlab-ci based on mix.lock
|
3 years ago |
|
Haelwenn
|
d9e782c180
|
Merge branch 'fix/delete_activities_timeout' into 'develop'
Fix pleroma.user delete_activities mix task
See merge request pleroma/pleroma!3394
|
3 years ago |
|
Mark Felder
|
d7a71a275a
|
Fixed pleroma.user delete_activities mix task.
|
3 years ago |
|
Mark Felder
|
959dc6e6fc
|
Cleanup and ensure we obey custom Repo timeout
|
3 years ago |
|
Mark Felder
|
99fd9c5e38
|
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval
|
3 years ago |
|
Mark Felder
|
9f711ddcf8
|
Try to set query timeout intelligently
|
3 years ago |
|
Mark Felder
|
9bc69196d5
|
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task
|
3 years ago |
|
Mark Felder
|
0effcd2cfe
|
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.
|
3 years ago |
|
feld
|
b050adb5e2
|
Merge branch 'fix/docs' into 'develop'
Docs: Fix incorrect shell command
See merge request pleroma/pleroma!3396
|
3 years ago |
|
Mark Felder
|
7eded72189
|
Fix incorrect shell command
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
|
3 years ago |
|
feld
|
8defbe431e
|
Merge branch 'feature/opt-out-of-google-floc' into 'develop'
Add opting out of Google FLoC to HTTPSecurityPlug headers
Closes #2630
See merge request pleroma/pleroma!3393
|
3 years ago |
|
Sean King
|
2780cdd4e7
|
Add CHANGELOG entry
|
3 years ago |
