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
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
790081540d
Update cheatsheet.md. Add Pleroma.Web.ActivityPub.MRF.KeywordPolicy
.
2022-01-15 12:26:33 +00:00
Alex Gleason
71baa713bc
Merge branch 'show_blockers_visible' into 'develop'
...
Add blockers_visible to features list when it's enabled
See merge request pleroma/pleroma!3603
2022-01-14 23:08:34 +00:00
6284353025
Add blockers_visible to features list when it's enabled
2022-01-14 23:08:33 +00:00
rinpatch
8b5a658991
Merge branch 'mergeback' into 'develop'
...
Merge stable back into develop
Closes #2753
See merge request pleroma/pleroma!3602
2022-01-14 22:15:10 +00:00
Alex Gleason
a4436bcc3f
Merge remote-tracking branch 'origin/stable' into mergeback
2022-01-14 12:37:00 -06:00
Alex Gleason
84dcb55b0f
Merge branch 'account-endorsements' into 'develop'
...
Account endorsements
See merge request pleroma/pleroma!3601
2022-01-13 19:02:21 +00:00
marcin mikołajczak
eedf551eed
Add more tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 22:41:34 +01:00
marcin mikołajczak
0f90fd5805
WIP account endorsements
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 18:15:10 +01:00
rinpatch
62a45747d9
Merge branch 'release/2.4.2' into 'stable'
...
2.4.2 Release
See merge request pleroma/pleroma!3599
2022-01-11 20:47:02 +00:00
Lain Soykaf
b34f0a6e51
CI: Conservatively update release images so they keep building.
2022-01-11 13:59:53 +03:00
Lain Soykaf
e4cfdfd701
CI: Upload the image for all platforms
...
For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.
2022-01-11 13:59:28 +03:00
rinpatch
a98a127718
Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdf
2022-01-11 13:49:06 +03:00
rinpatch
ea204dbca1
mix.lock: sync with mix.exs
...
hackney version was bumped in mix.exs, but mix.lock was not updated
2022-01-11 13:48:33 +03:00
rinpatch
f4bc2f5975
Add 2.4.2 changelog entry and bump mix version
2022-01-11 13:39:23 +03:00
Alex Gleason
cd3175c7fe
Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'
...
Escape unicode RTL overrides in rich media parser tests
See merge request pleroma/pleroma!3598
2022-01-11 13:39:23 +03:00
lain
bf0b32c9aa
Merge branch 'pleroma-result-1_13' into 'develop'
...
move result into with guard
See merge request pleroma/pleroma!3557
2022-01-11 13:39:23 +03:00
marcin mikołajczak
4f249b2397
Merge remote-tracking branch 'origin/develop' into account-endorsements
2022-01-10 20:04:14 +01:00
Alex Gleason
753a9b3f32
Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'
...
Escape unicode RTL overrides in rich media parser tests
See merge request pleroma/pleroma!3598
2022-01-10 15:07:09 +00:00
rinpatch
fd043b0ab3
Escape unicode RTL overrides in rich media parser tests
...
Elixir 1.13 does not allow them in raw form anymore, resulting in errors
like this when running the test:
== Compilation error in file test/pleroma/web/rich_media/parser_test.exs ==
** (SyntaxError) test/pleroma/web/rich_media/parser_test.exs:136:45: invalid bidirectional formatting character in string: \u202C. If you want to use such character, use it in its escaped \u202C form instead
2022-01-10 17:51:53 +03:00
lain
991b26f494
Merge branch 'update-hackney' into 'develop'
...
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
2022-01-10 17:40:31 +03:00
Alex Gleason
2451d65bd8
Merge branch 'api-docs-fixes' into 'develop'
...
Docs: fix various Pleroma API endpoints paths, fix MFA response
See merge request pleroma/pleroma!3596
2022-01-07 20:29:28 +00:00
Alex Gleason
e8b340aaa7
Docs: fix various Pleroma API endpoints paths, fix MFA response
2022-01-07 12:51:54 -06:00
Alex Gleason
a3094b64df
Merge branch 'change/web-push-encryption-dep' into 'develop'
...
Upgrade web_push_encryption to 0.3.1
See merge request pleroma/pleroma!3592
2022-01-02 15:41:56 +00:00
Sean King
bf995a7770
Upgrade web_push_encryption to 0.3.1
2022-01-01 21:02:09 -07:00
Alex Gleason
c8026fe492
Merge branch 'change/concurrent-limiter-dep' into 'develop'
...
Change concurrent_limiter to version 0.1.1
See merge request pleroma/pleroma!3591
2022-01-01 22:15:08 +00:00
Sean King
91ea394cd0
Change concurrent_limiter to Hex PM version 0.1.1
2022-01-01 14:49:57 -07:00