Beefox/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
14327 commits 19 branches 57 tags 305 MiB
Commit graph

14327 commits

This branch
This branch
All branches
Author SHA1 Message Date
sadposter
aa4c73e233 Merge remote-tracking branch 'newroma/develop' into develop 2022-05-03 14:18:16 +01:00
floatingghost
099b2a5267 Merge pull request '[Document] Update cheatsheet.md. Add Pleroma.Web.ActivityPub.MRF.KeywordPolicy.' (#41) from hakabahitoyo/newroma:doc/update-cheatsheet-for-mrf-keyword-policy into develop 
Reviewed-on: https://codeberg.org/newroma-dev/newroma/pulls/41
Reviewed-by: floatingghost <floatingghost@noreply.codeberg.org>
 2022-02-19 00:15:37 +01:00
Hakaba Hitoyo
8102d842ec Merge branch 'develop' into doc/update-cheatsheet-for-mrf-keyword-policy 2022-02-19 08:10:17 +09:00
floatingghost
a0a0198ad2 Merge pull request 'Fix blurhash' (#42) from ilja/newroma:fix_blurhash into develop 
Reviewed-on: https://codeberg.org/newroma-dev/newroma/pulls/42
Reviewed-by: floatingghost <floatingghost@noreply.codeberg.org>
 2022-02-18 11:15:52 +01:00
Ilja
d7fbabe209 Fix blurhash 
The blurhash gave an error message while returning :ok
    * {:ok, "/bin/sh: line 1: /opt/pleroma/pleroma/_build/dev/lib/eblurhash/priv/blurhash: cannot execute binary file: Exec format error"}
I updated the dependency and made the test for blurhash more explicit so a similar problem will be detected in the future
 2022-02-14 12:39:13 +01:00
Hakaba Hitoyo
5393d441c4 Update cheatsheet.md. Add Pleroma.Web.ActivityPub.MRF.KeywordPolicy. 2022-02-13 11:33:59 +09:00
floatingghost
0dd02e1947 Merge pull request 'Change/add issue and PR templates' (#34) from ilja/newroma:issue_and_pull_request_template into develop 
Reviewed-on: https://codeberg.org/newroma-dev/newroma/pulls/34
Reviewed-by: floatingghost <floatingghost@noreply.codeberg.org>
 2022-01-31 16:12:56 +01:00
Ilja
18097ea4f0 Change/add issue and PR templates 
First draft for default templates for issues and PR's
 2022-01-29 15:28:44 +01:00
floatingghost
4d30ffed3e Merge pull request 'Elixir 1.13 fixes' (#8) from bugfix/elixir-1.13 into develop 
Reviewed-on: https://codeberg.org/newroma-dev/newroma/pulls/8
Reviewed-by: floatingghost <floatingghost@noreply.codeberg.org>
 2022-01-29 14:11:41 +01:00
Haelwenn (lanodan) Monnier
a4b8a1150e Fix tests matching on "warn" 
Moving it to "warning" would break tests on 1.12.x
 2022-01-25 14:48:39 +01:00
rinpatch
0a1527c008 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-25 14:48:39 +01:00
lanodan
9fdf0720cf Merge pull request 'Cherry-Picked Merges from Alex Gleason' (#5) from features/cherry-pick-merges into develop 
Reviewed-on: https://codeberg.org/newroma-dev/newroma/pulls/5
Reviewed-by: floatingghost <floatingghost@noreply.codeberg.org>
 2022-01-24 19:15:31 +01:00
FloatingGhost
6a19fbac2f add copyright notice for forked files 2022-01-20 12:48:16 +00:00
FloatingGhost
e3214cdfe3 Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:48:10 +00:00
FloatingGhost
d884087e7c re-add mastofe_settings column 2022-01-08 21:47:52 +00:00
FloatingGhost
0f6bece60d Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:45:12 +00:00
FloatingGhost
0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'" 
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
 2022-01-08 21:44:37 +00: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
FloatingGhost
8cc6359a85 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop 2022-01-07 20:23:53 +00:00
FloatingGhost
25b4395830 just drop unknown tags 2022-01-07 20:14:04 +00:00
Alex Gleason
e8b340aaa7
Docs: fix various Pleroma API endpoints paths, fix MFA response 2022-01-07 12:51:54 -06:00
FloatingGhost
34780cf182 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop 2022-01-07 17:36:21 +00:00
FloatingGhost
2cc6b1e1bd Allow for varying name fields 2022-01-07 17:35:56 +00:00
FloatingGhost
5c48fe1138 make credo happy 2022-01-07 17:31:13 +00:00
FloatingGhost
92d3742072 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop 2022-01-07 17:21:44 +00:00
FloatingGhost
9ee27fb5ec add bookwyrm entity tests 2022-01-07 17:17:18 +00:00
FloatingGhost
680c5d8d89 Add compatibility with bookwyrm's weird entities 2022-01-07 16:51:04 +00: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
FloatingGhost
9542709f72 update linkify 2021-12-30 20:01:25 +00:00
FloatingGhost
3252ed0f54 format 2021-12-30 18:05:44 +00:00
FloatingGhost
4e7e95a17e don't error out 2021-12-30 18:05:44 +00:00
FloatingGhost
4e8ee48cff delete activities 2021-12-30 18:05:44 +00:00
FloatingGhost
12a171844b Merge remote-tracking branch 'upstream/develop' into develop 2021-12-30 18:05:22 +00: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
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
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