Commit graph

13247 commits

Author SHA1 Message Date
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
Alex Gleason
e1996d7b96
Fix RichMedia.HelpersTest 2021-05-04 17:18:20 -05:00
Alex Gleason
359c1d9f1f
Fix ParserTest 2021-05-04 17:13:28 -05:00
Alex Gleason
6b2fa5f0bb
Let :oembed_providers_enabled be configurable 2021-05-04 16:28:14 -05:00
Alex Gleason
8e2ff7669a
Add Parser.CardTest 2021-05-04 16:16:42 -05:00
Alex Gleason
95196fb5ac
Handle invalid cards 2021-05-04 15:54:24 -05:00
Alex Gleason
ebeb9c6bc9
Refactor rich media parser to store %Embed{} instead of %Card{} 2021-05-04 15:42:24 -05:00
Alex Gleason
8c4599c1dd
Fix TwitterCard tests 2021-05-04 14:15:41 -05:00
Alex Gleason
63af654688
Update TwitterCard tests and add Parser.MetaTags 2021-05-04 13:32:31 -05:00
Alex Gleason
b045dc6058
Make OEmbed discovery work 2021-05-04 11:06:10 -05:00
Alex Gleason
765bdfca7d
Get basic embed working 2021-05-04 02:24:30 -05:00
Alex Gleason
c3a00e1ad2 Merge branch 'dont-crash-email-settings' into 'develop'
Don't crash when email settings are invalid

Closes #4

See merge request soapbox-pub/soapbox!12
2021-05-03 20:22:21 +00:00
Alex Gleason
5614fc7e69
CHANGELOG_soapbox: invalid email settings crash fix 2021-05-03 14:45:02 -05:00
Alex Gleason
fc3af26898
Merge remote-tracking branch 'origin/develop' into dont-crash-email-settings 2021-05-03 14:44:51 -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
447322ecf5
Add README warning 2021-04-30 17:27:40 -05:00
Alex Gleason
1d0d5a8963 Merge branch 'simplepolicy-announce-leak' into 'develop'
Fix reposts leaking through from blocked domains

See merge request soapbox-pub/soapbox!11
2021-04-30 19:56:33 +00:00
Alex Gleason
64c6dd27b9
Merge remote-tracking branch 'origin/develop' into simplepolicy-announce-leak 2021-04-30 14:44:14 -05:00
Alex Gleason
fe7e03e6dc Merge branch 'earmark' into 'develop'
Upgrade Earmark to 1.4.15

See merge request soapbox-pub/soapbox!10
2021-04-30 19:40:50 +00:00
Alex Gleason
fd07fb9a73
CHANGELOG: fixed reposts in domain blocks 2021-04-30 14:30:25 -05:00
Alex Gleason
ea1f72c751
Merge commit 'c16c7fdb8794df8558cf8fbe4231d8f9ec01bb6d' into simplepolicy-announce-leak 2021-04-30 14:27:32 -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
b861721c62
CHANGELOG: earmark updates 2021-04-30 14:17:38 -05:00
Alex Gleason
d4cb9fd9b7
Merge branch 'develop' of gitlab.com:soapbox-pub/soapbox into earmark 2021-04-30 14:15:18 -05:00
Alex Gleason
c5ae620451
Merge commit 'a8fa00ef666f574aec8048626aed78a7d62e6915' into earmark 2021-04-30 14:12:53 -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
Alex Gleason
7c75439644 Merge branch 'blockers-visible' into 'develop'
Configurable block visibility

See merge request soapbox-pub/soapbox!9
2021-04-29 19:46:19 +00:00
Alex Gleason
9aae9b0ede
Add Soapbox default config and CHANGELOG_soapbox.md 2021-04-29 14:14:41 -05:00
Alex Gleason
01c220b722
Merge commit 'b7b05a074867c1444dd539d6d2331f6d5504f6e6' into blockers-visible 2021-04-29 13:52:36 -05:00
Alex Gleason
28f26e680e Merge branch 'readme' into 'develop'
Update README, add installation guide

See merge request soapbox-pub/soapbox!7
2021-04-28 20:21:03 +00:00
Alex Gleason
2d0e7262f9
Update README, add installation guide 2021-04-28 15:08:20 -05:00
Alex Gleason
b398480e0f Merge branch 'version-again' into 'develop'
Add soapbox version to /api/v1/instance (again)

See merge request soapbox-pub/soapbox!6
2021-04-28 18:09:47 +00:00