sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
14,415 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

14415 Commits

Author SHA1 Message Date
Your New SJW Waifu 87d6b9aeb0 Revert "Merge remote-tracking branch 'upstream/quote-post' into neckbeard" 
This reverts commit f7bd1bd5ff, reversing
changes made to b762792837.
 2022-01-24 08:16:23 -06:00
Your New SJW Waifu f7bd1bd5ff Merge remote-tracking branch 'upstream/quote-post' into neckbeard 2022-01-24 07:59:48 -06:00
Alex Gleason c04241eb4a
ActivityDraft: mix format, defensive actor ID 2022-01-23 16:03:46 -06:00
Alex Gleason d39ccd8372
ActivityDraft: mention the OP of a quoted post 2022-01-23 15:46:44 -06:00
Alex Gleason d903a6b85d
Return quote_url through the API, don't render quotes more than 1 level deep 2022-01-23 13:55:25 -06:00
Your New SJW Waifu b762792837 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-23 11:19:53 -06:00
Alex Gleason 7b87cac6cc Merge branch 'preserve-mentions-order' into 'develop' 
Preserve order of mentioned users

See merge request pleroma/pleroma!3617
 2022-01-23 15:23:56 +00:00
marcin mikołajczak 75c4fefb1c Add a test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 13:03:00 +01:00
marcin mikołajczak 1dba3bc4dc Preserve order of mentioned users 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 12:29:01 +01:00
Alex Gleason 4f51c41f9f
@context: add quoteUrl 2022-01-22 23:29:55 -06:00
Alex Gleason c22b354587
InstanceView: add "quote_posting" feature 2022-01-22 23:09:33 -06:00
Alex Gleason d293265b06
Fix typos 2022-01-22 23:02:44 -06:00
Alex Gleason c13ccb0f84
mix format 2022-01-22 22:57:42 -06:00
Alex Gleason 00b2dc7ecb
TransmogrifierTest: prepare an outgoing quote post 2022-01-22 22:41:57 -06:00
Alex Gleason bbd3433f5a
StatusControllerTest: test creating a quote post 2022-01-22 22:35:08 -06:00
Alex Gleason 4b2fe550de
BuilderTest: build quote post 2022-01-22 22:29:13 -06:00
Alex Gleason 69cab8da89
ActivityDraft: allow quoting 2022-01-22 22:15:54 -06:00
Alex Gleason 870023e286
ActivityDraft: create quote posts 2022-01-22 21:27:05 -06:00
Alex Gleason d4e9cb600d
StatusView: render the whole quoted status 2022-01-22 20:05:58 -06:00
Alex Gleason 0584a6f131
StatusView: show quoted posts through the API, probably 2022-01-22 19:47:08 -06:00
Alex Gleason 04709e1a27
Transmogrifier: fix quoteUrl here too 2022-01-22 19:14:39 -06:00
Alex Gleason fbdfeb326d
Transmogrifier: fetch quoted post 2022-01-22 18:46:58 -06:00
Alex Gleason 0f34eb60d4
ObjectValidators: improve quoteUrl compatibility 2022-01-22 18:03:22 -06:00
Alex Gleason 0453713c70
Quote post: add fixtures 2022-01-22 17:30:49 -06:00
Alex Gleason c6ff668b1d
ObjectValidators: accept "quoteUrl" field 2022-01-22 16:41:51 -06:00
Alex Gleason 9983799ccb Merge branch 'less_erratic_expiration_test' into 'develop' 
Make test less erratic by adding five second tolerance

See merge request pleroma/pleroma!3614
 2022-01-22 20:09:09 +00:00
NEETzsche 7a015b1fe2 Make test less erratic by adding five second tolerance 2022-01-22 12:07:54 -07:00
Alex Gleason 263b42a73d Merge branch 'apple_autofill_suggestions' into 'develop' 
Add autocompelete values suggested by Apple

See merge request pleroma/pleroma!3612
 2022-01-22 18:38:03 +00:00
Alex Gleason 78c6aeee1b Merge branch 'erratic-filter-test' into 'develop' 
FilterTest: tag erratic test

See merge request pleroma/pleroma!3613
 2022-01-22 18:32:34 +00:00
Alex Gleason f5d4ef50b4
FilterTest: tag erratic test 2022-01-22 12:13:09 -06:00
Finn Behrens 8328289619 Add autocompelete values suggested by Apple 
Link: https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element
 2022-01-22 10:00:43 +01:00
Alex Gleason 6ffe43af70 Merge branch 'private-pins' into 'develop' 
Support private pinned posts from Mastodon

See merge request pleroma/pleroma!3611
 2022-01-20 23:18:24 +00:00
Alex Gleason 560bcd58ab Merge branch 'from/develop/tusooa/add-glitch-lily' into 'develop' 
Add glitch-lily to clients.md

See merge request pleroma/pleroma!3610
 2022-01-20 23:11:35 +00:00
Alex Gleason 00523bdf5e
Test pinned private statuses in AccountController 2022-01-20 16:54:43 -06:00
marcin mikołajczak 88c21b9282 Support private pinned posts from Mastodon 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-20 12:35:32 +01:00
Tusooa Zhu 9faac1094f
Add glitch-lily to clients.md 2022-01-19 23:56:57 -05:00
rinpatch 787a02c4b1 Merge branch 'feat/force-mentions-mrf' into 'develop' 
Add ForceMentionsInContentPolicy

See merge request pleroma/pleroma!3609
 2022-01-20 00:27:29 +00:00
rinpatch a02cfd7f52 Add ForceMentionsInContentPolicy 
Even though latest PleromaFE supports displaying these properly, mobile
apps still exist, so I think we should offer a workaround to those who
want it.
 2022-01-19 21:04:57 +03:00
Alex Gleason 70fbd1f09e Merge branch 'document-oauth-tokens' into 'develop' 
Docs: PleromaAPI oauth_tokens endpoints

See merge request pleroma/pleroma!3607
 2022-01-18 17:18:00 +00:00
Alex Gleason 1dfb67f1e0
Docs: PleromaAPI oauth_tokens endpoints 2022-01-18 11:02:23 -06:00
Alex Gleason 69b089c894 Merge branch 'erratic-allow-failure' into 'develop' 
unit-testing-erratic: allow failure

See merge request pleroma/pleroma!3606
 2022-01-18 14:56:26 +00:00
Alex Gleason 72d5e29117 Merge branch 'hakabahitoyo-develop-patch-44025' into 'develop' 
[Document] Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`.

See merge request pleroma/pleroma!3604
 2022-01-18 13:18:36 +00:00
Alex Gleason ac434f83c3
unit-testing-erratic: allow failure 2022-01-15 13:35:22 -06:00
Alex Gleason ecdc81b37a Merge branch 'linkify-0.5.2' into 'develop' 
Upgrade Linkify to v0.5.2

Closes #2376, #2386, and #2485

See merge request pleroma/pleroma!3605
 2022-01-15 19:13:56 +00:00
Alex Gleason 39c5ebb1f6
mix format 2022-01-15 12:55:12 -06:00
Alex Gleason cd8f1aac47
CHANGELOG: hashtags markdown fix 2022-01-15 12:36:33 -06:00
Alex Gleason 31148c1857
FormatterTest: fix nesting in expected output 2022-01-15 12:31:36 -06:00
Alex Gleason db90c9e3b0
Merge remote-tracking branch 'mkfain/test-for-breaking-markdown' into linkify-0.5.2 2022-01-15 12:27:42 -06:00
Alex Gleason d5eb44e8b3
Upgrade Linkify to v0.5.2 2022-01-15 12:27:16 -06:00
Hakaba Hitoyo 790081540d Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`. 2022-01-15 12:26:33 +00:00