Commit graph

15050 commits

Author SHA1 Message Date
Alex Gleason
45f68d3f85
Merge remote-tracking branch 'origin/develop' into asdf 2021-05-16 16:46:25 -05:00
Alex Gleason
ba177d2a4b
Simplify mix pleroma.instance gen task 2021-05-16 16:46:21 -05:00
Alex Gleason
952c1f3a9c Merge branch 'gitignore-runtime-exs' into 'develop'
gitignore runtime.exs

See merge request soapbox-pub/soapbox!24
2021-05-16 18:39:54 +00:00
Alex Gleason
2a40aa9866 Merge branch 'optional-config' into 'develop'
Optional prod.secret.exs

See merge request soapbox-pub/soapbox!23
2021-05-16 18:36:20 +00:00
Alex Gleason
96183695bb
Merge remote-tracking branch 'origin/develop' into gitignore-runtime-exs 2021-05-16 13:28:43 -05: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
65d683f8bb
Merge remote-tracking branch 'origin/develop' into optional-config 2021-05-16 12:45:30 -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
28840d2f31
Update pleroma.service for asdf 2021-05-16 11:30:41 -05:00
Alex Gleason
43f1278654
Add .tool-versions for asdf 2021-05-15 11:16:42 -05:00
Alex Gleason
e1bb4a2020 Merge branch 'blurhash' into 'develop'
Blurhash

See merge request soapbox-pub/soapbox!21
2021-05-14 14:32:56 +00:00
Alex Gleason
0f60321a6d
CHANGELOG_soapbox: blurhash support 2021-05-14 09:12:51 -05:00
Alex Gleason
1c229364a5
Merge remote-tracking branch 'origin/develop' into blurhash 2021-05-14 09:12:41 -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
0ea5edc5dc Merge branch 'oembed-discovery' into 'develop'
Oembed discovery

See merge request soapbox-pub/soapbox!20
2021-05-13 22:02:01 +00:00
Alex Gleason
e674501017
Merge remote-tracking branch 'origin/develop' into oembed-discovery 2021-05-13 16:47:16 -05:00
Alex Gleason
faaca43acf
Fall back to discovery when OEmbed is invalid 2021-05-13 16:43:50 -05:00
Alex Gleason
7f2905bc77 Merge branch 'link-fixes' into 'develop'
Rich media: Link fixes

Closes #14 and #13

See merge request soapbox-pub/soapbox!19
2021-05-13 19:59:43 +00:00
Alex Gleason
c23aeb72df
CHANGELOG_soapbox: rich media links fixes 2021-05-13 14:41:09 -05:00
Alex Gleason
3bf56a6be4
Merge remote-tracking branch 'origin/develop' into link-fixes 2021-05-13 14:35:19 -05:00
Alex Gleason
1997473979
Rich media: have invalid Rich/Video fall back to Link 2021-05-13 14:22:50 -05:00
Alex Gleason
92eb248581
Parser: don't be so strict about validating Embeds (leave it up to the Card) 2021-05-13 14:03:53 -05:00
Alex Gleason
72cc7b3369
Rich media: merge URIs when needed 2021-05-13 13:13:17 -05:00
Alex Gleason
3b0da1ec29 Merge branch 'attachment-meta' into 'develop'
Attachment meta

See merge request soapbox-pub/soapbox!18
2021-05-13 01:22:52 +00: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
e6847289e1
CHANGELOG_soapbox: Attachment meta 2021-05-12 19:26:12 -05:00
Alex Gleason
674308079c
Soapbox: Set default upload filters 2021-05-12 19:26:11 -05:00
Alex Gleason
7f8396160c
Merge remote-tracking branch 'origin/develop' into attachment-meta 2021-05-12 19:26:05 -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
Alexander Strizhakov
b4a0f721fe
rebase fix 2021-05-11 17:57:05 +03:00
Alexander Strizhakov
e0246e0d59
docs update 2021-05-11 17:57:04 +03:00
Alexander Strizhakov
d510f3e645
XML WebFinger user representation correct domain 2021-05-11 17:57:03 +03:00
Alexander Strizhakov
fdf969cd17
docs & changelog 2021-05-11 17:56:34 +03:00
Alexander Strizhakov
7ee528925c
expanding WebFinger 2021-05-11 17:54:19 +03:00
Alex Gleason
feb264f55d Merge branch 'release-1.0' into 'develop'
Release v1.0

See merge request soapbox-pub/soapbox!17
2021-05-11 13:18:40 +00:00
Alex Gleason
589a2b4d16
Bump version 1.0.0, remove warning, delete extraneous install document 2021-05-10 17:03:41 -05:00
Alex Gleason
1c622c2faa Merge branch 'bundle-fe' into 'develop'
Bundle Soapbox FE, fixes #5

Closes #5

See merge request soapbox-pub/soapbox!16
2021-05-08 00:17:38 +00:00
Alex Gleason
d8954edf39
Bundle Soapbox FE, fixes #5 2021-05-07 19:02:26 -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