Commit Graph

13704 Commits

Author SHA1 Message Date
Alex Gleason
e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation 2021-05-19 14:27:46 -05:00
Alex Gleason
ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers 2021-05-19 12:49:00 -05:00
Alex Gleason
07fed0fda2
Switch to aliasing Router.Helpers instead of importing 2021-05-18 17:45:30 -05:00
feld
8e9f032f25 Merge branch 'chore/changelog' into 'develop'
Clarify AttachmentMetadata changes

See merge request pleroma/pleroma!3408
2021-05-18 21:54:54 +00:00
Mark Felder
2d7f6ce6fb Clarify AttachmentMetadata changes 2021-05-18 16:46:51 -05:00
feld
0db436789d Merge branch 'blurhash' into 'develop'
Upload filter for media metadata (Support blurhash, get WxH)

See merge request pleroma/pleroma!3404
2021-05-18 21:41:34 +00:00
Mark Felder
c64cbee26c Fixed checking for Upload Filter required commands 2021-05-18 16:28:21 -05:00
Mark Felder
4ab3ef07d0 Check AnalyzeMetadata filter's required commands
eblurhash:magick uses "convert"
Fetching image metadata uses "mogrify"
2021-05-18 16:08:31 -05:00
Mark Felder
9b6b5ac196 Rename upload filter to AnalyzeMetadata 2021-05-18 15:33:33 -05:00
lain
44be498fe1 Merge branch 'optional-config' into 'develop'
Save ~10 minutes on source installation

See merge request pleroma/pleroma!3406
2021-05-17 18:41:12 +00:00
Alex Gleason
7ac4da8dd4
Merge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exs 2021-05-16 13:22:26 -05:00
Alex Gleason
230ad82dad
gitignore config/runtime.exs 2021-05-16 13:22:07 -05:00
Alex Gleason
32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config 2021-05-16 12:27:29 -05:00
Alex Gleason
b540fff908
Docs: use MIX_ENV=prod mix pleroma.instance gen 2021-05-16 12:26:51 -05:00
Alex Gleason
b22f54eb29
Make prod.secret.exs optional (with warning) 2021-05-16 12:26:32 -05:00
Alex Gleason
bcf6efce15
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash 2021-05-14 09:09:32 -05:00
Alex Gleason
543e9402d6
Support blurhash 2021-05-14 09:07:16 -05:00
Alex Gleason
5a57b025c7
Changelog: attachment meta 2021-05-12 20:15:33 -05:00
Alex Gleason
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta 2021-05-12 20:10:52 -05:00
Alex Gleason
6f0b42656d
Federate attachments as Links instead of Documents 2021-05-12 19:25:37 -05:00
Alex Gleason
02b9436494
Don't render media meta if nil 2021-05-12 16:16:10 -05:00
Alex Gleason
4c060ae733
Ingest remote attachment width/height 2021-05-12 15:38:49 -05:00
Alex Gleason
ab9eabdf20
Add SetMeta filter to store uploaded image sizes 2021-05-12 15:07:31 -05:00
faried nawaz
5be9d13981
a better query to delete from hashtags
old query:

Delete on hashtags  (cost=5089.81..5521.63 rows=6160 width=18)
   ->  Hash Semi Join  (cost=5089.81..5521.63 rows=6160 width=18)
         Hash Cond: (hashtags.id = ht.id)
         ->  Seq Scan on hashtags  (cost=0.00..317.28 rows=17528 width=14)
         ->  Hash  (cost=5012.81..5012.81 rows=6160 width=20)
               ->  Merge Anti Join  (cost=0.70..5012.81 rows=6160 width=20)
                     Merge Cond: (ht.id = hto.hashtag_id)
                     ->  Index Scan using hashtags_pkey on hashtags ht  (cost=0.29..610.53 rows=17528 width=14)
                     ->  Index Scan using hashtags_objects_pkey on hashtags_objects hto  (cost=0.42..3506.48 rows=68158 width=14)

new query:

Delete on hashtags ht  (cost=0.70..5012.81 rows=6160 width=12)
   ->  Merge Anti Join  (cost=0.70..5012.81 rows=6160 width=12)
         Merge Cond: (ht.id = hto.hashtag_id)
         ->  Index Scan using hashtags_pkey on hashtags ht  (cost=0.29..610.53 rows=17528 width=14)
         ->  Index Scan using hashtags_objects_pkey on hashtags_objects hto  (cost=0.42..3506.48 rows=68158 width=14)
2021-05-08 02:00:43 +05:00
faried nawaz
a0c9a2b4cc
mix prune_objects: remove unused hashtags after pruning remote objects 2021-05-08 02:00:42 +05:00
faried nawaz
22b2451edd
migration: add on_delete: :delete_all to hashtags object_id fk 2021-05-08 02:00:34 +05:00
Alex Gleason
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak 2021-05-07 12:40:45 -05:00
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
2021-05-04 13:30:00 +00:00
feld
d5263bfcf3 Merge branch 'earmark' into 'develop'
Upgrade Earmark to v1.4.15

Closes #1942 and #2026

See merge request pleroma/pleroma!3076
2021-05-04 13:29:14 +00:00
Alex Gleason
90770e0841
CHANGELOG: don't crash so hard when email settings are invalid 2021-05-03 14:43:34 -05:00
Alex Gleason
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings 2021-05-03 14:43:28 -05:00
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
2021-05-03 14:43:14 -05:00
Alex Gleason
dca87c5e7b
CHANGELOG: markdown 2021-05-01 11:28:06 -05:00
Alex Gleason
20878c7f99
CHANGELOG: SimplePolicy embedded objects are now checked 2021-04-30 14:22:02 -05:00
Alex Gleason
926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak 2021-04-30 14:21:17 -05:00
Alex Gleason
c16c7fdb87
SimplePolicy: filter string Objects 2021-04-30 14:20:54 -05:00
Alex Gleason
3d742c3c1a
SimplePolicy: filter nested objects 2021-04-30 14:20:37 -05:00
Alex Gleason
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark 2021-04-30 13:17:03 -05:00
Alex Gleason
a8fa00ef66
Fix failing remote mentions test, valid TLDs 2021-04-30 12:55:43 -05:00
Alex Gleason
53760d2cda
Delete obsolete EarmarkRendereTests (moved to UtilsTest) 2021-04-30 12:51:18 -05:00
Alex Gleason
6727a3659f
Remove Pleroma.Formatter.minify/2 2021-04-30 12:27:06 -05:00
Alex Gleason
004bcedb07
Upgrade Earmark 1.4.15 2021-04-30 12:23:11 -05:00
feld
377f84f367 Merge branch 'oauth-token-id' into 'develop'
Return token's primary key with POST /oauth/token

See merge request pleroma/pleroma!3380
2021-04-29 19:13:50 +00:00
Alex Gleason
6bc8ab225d
Merge remote-tracking branch 'upstream/develop' into oauth-token-id 2021-04-29 14:06:12 -05:00
feld
2fe3bd8178 Merge branch 'maybe-fix-ci' into 'develop'
CI: Purge pleroma build directory between runs

See merge request pleroma/pleroma!3399
2021-04-29 18:56:28 +00:00
Alex Gleason
b5ae826898
CI: Purge pleroma build directory between runs 2021-04-29 13:15:48 -05:00
Alex Gleason
8c1d6e8839
CHANGELOG: Return OAuth token id 2021-04-29 12:20:46 -05:00
Alex Gleason
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id 2021-04-29 12:19:10 -05:00
Haelwenn
115673bce7 Merge branch 'gitlab-ci-mix-lock' into 'develop'
Cache GitLab CI based on mix.lock

See merge request pleroma/pleroma!3398
2021-04-28 04:53:25 +00:00
Alex Gleason
b9a99ac0d4
Cache gitlab-ci based on mix.lock 2021-04-27 11:54:28 -05:00