limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
14316 commits 27 branches 107 tags 315 MiB
Commit graph

14316 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Gleason
99e9c2c668 Merge branch 'birth-dates' into 'develop' 
Fix show_birthday

See merge request pleroma/pleroma!3621
 2022-01-25 16:59:07 +00:00
Alex Gleason
65b4d2ce84
ForceMentionsInContent: fix order of mentions 2022-01-25 10:42:34 -06:00
marcin mikołajczak
ab12a05a43 AccountView: Add test for show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-25 17:34:36 +01:00
marcin mikołajczak
c1ae35ff2c Fix show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-25 17:04:41 +01:00
Alex Gleason
dd7977bb68 Merge branch 'birth-dates' into 'develop' 
Birth dates

See merge request pleroma/pleroma!3608
 2022-01-25 15:35:47 +00:00
marcin mikołajczak
249fe88d12 Birthdays: users_birthday_month_day_index 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-25 11:49:42 +01:00
Alex Gleason
267184b70e
ForceMentionsInContentTest: return mentions in a not terrible format 2022-01-24 20:03:43 -06:00
Alex Gleason
c5a20c80c4
ForceMentionsInContent: simplify finding users 2022-01-24 19:44:44 -06:00
Alex Gleason
d5644a52aa
ForceMentionsInContent: wrap inline mentions with span tag 2022-01-24 19:11:45 -06:00
Alex Gleason
1bbc701a3a
ForceMentionsInContent: use to instead of tag 2022-01-24 19:11:14 -06:00
Alex Gleason
19d557c870 Merge branch 'revert-6e27fc9c' into 'develop' 
Revert "Merge branch 'log-slow-queries' into 'develop'"

See merge request pleroma/pleroma!3619
 2022-01-24 19:06:33 +00:00
Alex Gleason
53de3a9d44 Revert "Merge branch 'log-slow-queries' into 'develop'" 
This reverts merge request !3553
 2022-01-24 18:54:43 +00: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
marcin mikołajczak
61bae9a407 Create index for show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 12:07:05 +01:00
marcin mikołajczak
e3d394eef6 Birthdays: Fix tests, add test for misskey 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 09:41:21 +01:00
marcin mikołajczak
0266bc3c96 Birthdays: hide_birthday -> show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 09:13:33 +01:00
Alex Gleason
aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates 2022-01-22 14:24:50 -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
Alex Gleason
98ce239ebc
Update description.exs 2022-01-22 13:28:00 -06:00
Alex Gleason
66e8c6f90f
Birthdays: birth_date --> birthday 2022-01-22 13:21:55 -06: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
marcin mikołajczak
74cf0f0355 Update changelog 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-19 23:52:46 +01: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
marcin mikołajczak
c180f9276f check if remote bday is valid 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-19 17:19:28 +01:00
marcin mikołajczak
dfb2808535 Birth dates: Add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-18 23:15:31 +01:00
marcin mikołajczak
397f67fef8 Format code, expose instance configuration related to birth dates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-18 18:18:38 +01: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
marcin mikołajczak
b108b05650 Birth dates, birthday reminders API, allow instance admins to require minimum age 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-18 14:57:48 +01: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