Commit graph

13282 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
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
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
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
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
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
Alex Gleason
625642f297 Merge branch 'changelog-links' into 'develop'
CHANGELOG_soapbox: add links to MRs

See merge request soapbox-pub/soapbox!15
2021-05-05 20:35:15 +00:00
Alex Gleason
58d50f58b1
CHANGELOG_soapbox: add links to MRs 2021-05-05 15:22:14 -05:00
Alex Gleason
9fc07ecbbd Merge branch 'notice-routes' into 'develop'
Add notice compatibility routes for other frontends

See merge request soapbox-pub/soapbox!14
2021-05-05 20:03:30 +00:00
Alex Gleason
838446ddf6
CHANGELOG_soapbox: notice routes 2021-05-05 14:50:34 -05:00
Alex Gleason
6614b52a17
Merge remote-tracking branch 'origin/develop' into notice-routes 2021-05-05 14:50:30 -05:00
Alex Gleason
50e3750758
Add notice compatibility routes for other frontends
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785
2021-05-05 14:50:10 -05:00
Alex Gleason
3c69941a09 Merge branch 'rich-media-redux' into 'develop'
Rich media embeds

See merge request soapbox-pub/soapbox!13
2021-05-05 19:44:01 +00:00
Alex Gleason
887ecf32b6
CHANGELOG_soapbox: rich media embeds 2021-05-05 12:39:07 -05:00
Alex Gleason
b00d3bafa6
Merge remote-tracking branch 'origin/develop' into rich-media-redux 2021-05-05 12:38:58 -05:00
Alex Gleason
9fbea2df6e
Fall back to OEmbed "url" for Photo types 2021-05-05 12:38:43 -05:00
Alex Gleason
0ebf3b3afd
Add rich type back but sanitize HTML better 2021-05-04 19:27:16 -05:00
Alex Gleason
d2260bde45
Reject "rich" type embeds for now 2021-05-04 18:53:22 -05:00
Alex Gleason
8b9ff5dab2
Sanitize rich media HTML 2021-05-04 18:29:25 -05:00
Alex Gleason
3a4ad366d5
Fix existing tests 2021-05-04 18:21:43 -05:00
Alex Gleason
0afa091e6c
Fix MastodonAPI.StatusViewTest 2021-05-04 17:46:42 -05:00