Ivan Tashkinov
89f38d94c7
[ #2409 ] Fixed before-action callback results persistence.
4 years ago
Ivan Tashkinov
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Ivan Tashkinov
2958a7d246
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
4 years ago
Haelwenn
28f8fcf8b0
Merge branch 'fix/follow-and-blocks-import' into 'develop'
...
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
4 years ago
Haelwenn
468cc977be
Merge branch 'bugfix/following-fix-status-code' into 'develop'
...
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
4 years ago
Haelwenn
238058ecae
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
...
Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415
4 years ago
Egor Kislitsyn
6db52c3b36
Fix Oban warning
...
Warning example:
[warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.
4 years ago
Egor Kislitsyn
e7771424a8
Fix blocks import
4 years ago
Egor Kislitsyn
88b82e5c3e
Fix follow import
4 years ago
lain
7a3a88a13e
Streamer: Stream boosts to the boosting user.
4 years ago
Haelwenn
1855c597c2
Merge branch 'feature/voters-count' into 'develop'
...
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
4 years ago
Haelwenn
2e73c19edc
Merge branch 'worker-messages' into 'develop'
...
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
4 years ago
Karol Kosek
452072ec95
static_fe: Add microformats2 classes
4 years ago
lain
5b39526198
AccountController: Use code 400 for self-follow.
4 years ago
lain
69ecc39038
Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
...
Fix migrate to db config
Closes #1689
See merge request pleroma/pleroma!2394
4 years ago
lain
5102468d0f
Polls: Persist and show voters' count
4 years ago
lain
923513b641
Federator: Return proper values for jobs
4 years ago
lain
f719a5b23a
WebPush: Return proper values for jobs.
4 years ago
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
4 years ago
rinpatch
e57c1b60e4
Merge branch 'accept-deletes' into 'develop'
...
Always accept deletions through SimplePolicy, add :reject_deletes group
See merge request pleroma/pleroma!2371
4 years ago
rinpatch
7e456ac7f6
Merge branch 'router-cleanup' into 'develop'
...
Cleanup and DRY the Router
See merge request pleroma/pleroma!2406
4 years ago
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
lain
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
4 years ago
Ilja
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
4 years ago
Egor Kislitsyn
258d897579
Cleanup and DRY the Router
4 years ago
rinpatch
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
4 years ago
Haelwenn
79445ae5d2
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes #1697
See merge request pleroma/pleroma!2403
4 years ago
Haelwenn
24f760c2f7
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
Haelwenn (lanodan) Monnier
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
4 years ago
Ivan Tashkinov
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
4 years ago
rinpatch
e0d7847bc5
Merge branch 'sideeffects-test' into 'develop'
...
SideEffects: Test for notification creation.
See merge request pleroma/pleroma!2399
4 years ago
lain
26d9c83316
SideEffects: Test for notification creation.
4 years ago
rinpatch
6936854878
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
4 years ago
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
4 years ago
Alexander Strizhakov
6cda360fea
don't restart postgrex
4 years ago
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
Haelwenn
d8142ee6fe
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
...
Fix for logger configuration
Closes #1694
See merge request pleroma/pleroma!2396
4 years ago
Haelwenn
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
4 years ago
Alexander Strizhakov
304ea09f4c
fix for logger configuration
4 years ago
rinpatch
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
4 years ago
rinpatch
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
4 years ago
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
4 years ago
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities
4 years ago
rinpatch
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
4 years ago
rinpatch
77ee64b993
user: remove blank?
4 years ago
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController
4 years ago