Commit graph

13917 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
01c220b722
Merge commit 'b7b05a074867c1444dd539d6d2331f6d5504f6e6' into blockers-visible 2021-04-29 13:52:36 -05: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
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
Alex Gleason
5d56dfce6a
Merge remote-tracking branch 'origin/develop' into version-again 2021-04-28 12:57:36 -05:00
Alex Gleason
75eb0f3965 Merge branch 'gitlab-ci-again' into 'develop'
Speed up GitLab CI, skip failing tests

See merge request soapbox-pub/soapbox!5
2021-04-28 17:57:04 +00:00
Alex Gleason
99b9106a50
soapbox version --> 0.0.99 2021-04-28 12:41:49 -05:00
Alex Gleason
8f698d081c
Add soapbox version to /api/v1/instance 2021-04-28 12:41:43 -05:00
Alex Gleason
3f693bff37
Speed up GitLab CI, skip failing tests 2021-04-28 12:31:22 -05:00