moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,272 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

14272 Commits

Author SHA1 Message Date
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
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
NEETzsche 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
Alex Gleason 86e692aeb1 Merge branch 'erratic-streamer-test' into 'develop' 
StreamerTest: tag erratic test

See merge request pleroma/pleroma!3590
 2021-12-31 16:40:14 +00:00
Alex Gleason 2ae867842b
StreamerTest: tag erratic test 2021-12-31 10:29:50 -06:00
Sean King dafcf896d9 Merge more stuff from upstream develop branch 2021-12-30 14:25:45 -07:00
lain e25af3f2d8 Merge branch 'more-efficient-ci' into 'develop' 
CI: Use own package as base

See merge request pleroma/pleroma!3577
 2021-12-30 15:53:33 +00:00
Sean King ffeae7ef2c
Fix merge conflict in CHANGELOG.md 2021-12-29 18:08:50 -07:00
lain 84420d9439 Merge branch 'chore/user-relationships-target-id-rel-type-index' into 'develop' 
Added index on [:target_id, :relationship_type] to :user_relationships

See merge request pleroma/pleroma!3588
 2021-12-29 13:06:47 +00:00
Ivan Tashkinov a7bdefc208 `mix format` 2021-12-29 11:44:33 +03:00
Ivan Tashkinov 0c7fb520bf Added index on [:target_id, :relationship_type] to :user_relationships (speeds up `Notification.exclude_blockers/_`). 2021-12-29 11:41:21 +03:00
Alex Gleason a61ed5c488 Merge branch 'changelog' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma!3586
 2021-12-28 21:42:39 +00:00
Alex Gleason 5f87472cdf
Update CHANGELOG.md 2021-12-28 15:14:09 -06:00
Alex Gleason b5b98f9e10 Merge branch 'mastodon-lookup' into 'develop' 
MastoAPI: Add `GET /api/v1/accounts/lookup`

See merge request pleroma/pleroma!3584
 2021-12-28 21:00:09 +00:00
marcin mikołajczak 1657db656c AccountController.lookup: skip auth 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 20:02:59 +01:00
marcin mikołajczak 0dd1caa841 AccountController.lookup: skip visibility check 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 18:24:48 +01:00
marcin mikołajczak 9032d065e6 wip 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 18:07:19 +01:00
marcin mikołajczak 746c9daa62 Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 16:27:27 +01:00
marcin mikołajczak f734579965 MastoAPI: Add `GET /api/v1/accounts/lookup` 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 16:11:17 +01:00
Alex Gleason de7f84deb3 Merge branch 'apps-api-endpoint' into 'develop' 
Apps API endpoint

See merge request pleroma/pleroma!3583
 2021-12-28 14:38:02 +00:00
Alex Gleason 52a3f0f08b Merge branch 'ensure-staff-privileged-strict' into 'develop' 
EnsureStaffPrivilegedPlug: don't let non-moderators through

See merge request pleroma/pleroma!3582
 2021-12-28 00:53:11 +00:00