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
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 6b3842cf506b1282a829
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
Sean King
dafcf896d9
Merge more stuff from upstream develop branch
2021-12-30 14:25:45 -07: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
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
Alex Gleason
5c80d4087d
PleromaAPI.AppView: add test
2021-12-27 18:52:34 -06:00
Alex Gleason
7704a722c0
AppController: remove unnecessary require Logger
2021-12-27 18:30:16 -06:00
Alex Gleason
cb2a072e62
Apps: add test for get_user_apps/1
2021-12-27 18:29:03 -06:00
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user
2021-12-27 18:14:15 -06:00
Alex Gleason
fa35e24a5e
Apps: add user_id index
2021-12-27 18:05:35 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
2021-12-27 18:01:25 -06:00
Alex Gleason
138f5a4517
EnsureStaffPrivilegedPlug: don't let non-moderators through
2021-12-27 17:18:26 -06:00
