Commit graph

14678 commits

Author SHA1 Message Date
1b3de39996 lint pipeline 2022-06-11 16:41:15 +01:00
24bf8c3977 mix format 2022-06-11 16:14:31 +01:00
32fbd2e4e3 fix all tests 2022-06-11 16:14:22 +01:00
c3ed86cd1e fix emoji controller tests 2022-06-11 14:21:50 +01:00
142646426e fix emoji tests 2022-06-11 14:08:54 +01:00
71f4281850 fix quoting of custom emoji
Fixes #3
2022-06-11 14:08:13 +01:00
8dd7daf5ee add release file 2022-06-10 17:40:01 +01:00
8c967311b3 format 2022-06-10 14:25:51 +01:00
c07fcdbf2b just test 1.13 2022-06-10 14:20:47 +01:00
caa7f54239 remove defunct copy 2022-06-10 13:45:48 +01:00
ed58a6b070 run mix format 2022-06-10 13:41:08 +01:00
ff8922f292 Add CI 2022-06-10 13:37:41 +01:00
801f2b0fc5 Add capabilities for emoji reactions
Patch from helene@p.helene.moe
2022-06-09 12:56:34 +01:00
0f2bfeaea7 Enable mediaproxy by default 2022-06-08 17:19:42 +01:00
f225db8596 update pleroma-fe 2022-06-08 15:16:32 +01:00
e910f21d8d allow undoing 2022-06-08 13:27:25 +01:00
e724da2a42 remove io.inspects 2022-06-08 12:58:12 +01:00
c5467d04e4 add outbound reacts 2022-06-08 12:36:38 +01:00
ad0b8c095c add custom emoji reaction support 2022-06-08 02:42:44 +01:00
f19c93cdaa use tls1.3 2022-06-07 12:24:40 +01:00
6a19fbac2f add copyright notice for forked files 2022-01-20 12:48:16 +00:00
e3214cdfe3 Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:48:10 +00:00
d884087e7c re-add mastofe_settings column 2022-01-08 21:47:52 +00:00
0f6bece60d Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:45:12 +00:00
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
8cc6359a85 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop 2022-01-07 20:23:53 +00:00
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
34780cf182 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop 2022-01-07 17:36:21 +00:00
2cc6b1e1bd Allow for varying name fields 2022-01-07 17:35:56 +00:00
5c48fe1138 make credo happy 2022-01-07 17:31:13 +00:00
92d3742072 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop 2022-01-07 17:21:44 +00:00
9ee27fb5ec add bookwyrm entity tests 2022-01-07 17:17:18 +00:00
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
9542709f72 update linkify 2021-12-30 20:01:25 +00:00
3252ed0f54 format 2021-12-30 18:05:44 +00:00
4e7e95a17e don't error out 2021-12-30 18:05:44 +00:00
4e8ee48cff delete activities 2021-12-30 18:05:44 +00:00
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