Commit Graph

5139 Commits

Author SHA1 Message Date
Egor Kislitsyn e07e7888d7
Fix credo warning 2020-01-29 18:53:43 +04:00
Egor Kislitsyn 2bd4d6289b
Make the warning more scarier 2020-01-29 18:43:23 +04:00
Alexander Strizhakov e7fee0d6fa
emoji api error on not writable dir 2020-01-29 15:31:34 +03:00
lain b3a877d6c9 Emoji Reactions: Correctly handle deleted users 2020-01-29 11:43:36 +01:00
lain a802e07241 Emoji Reactions: Add `reacted` field to emoji reactions 2020-01-29 11:39:06 +01:00
Alexander Strizhakov 1f4fbe9d98
title parse improvement 2020-01-29 11:13:34 +03:00
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
lain cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect 2020-01-28 17:52:42 +01:00
lain 12b6fcdb8c Merge branch 'features/task-test-email' into 'develop'
Create pleroma.email mix task

Closes #1061

See merge request pleroma/pleroma!2118
2020-01-28 16:42:57 +00:00
lain 2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop'
Meta tags parser respects first title tag

Closes #1524

See merge request pleroma/pleroma!2157
2020-01-28 16:38:14 +00:00
Alexander Strizhakov 7bd4c14581
meta tag parser respect first title header 2020-01-28 19:29:27 +03:00
lain d385789a45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed 2020-01-28 17:06:36 +01:00
Haelwenn 271935953a Merge branch 'whole-db-removal' into 'develop'
Remove `whole_db` parameter everywhere, it's not used anymore

See merge request pleroma/pleroma!2152
2020-01-28 15:51:45 +00:00
Haelwenn (lanodan) Monnier 4eb935be78
Create pleroma.email mix task
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
lain 77f24525ca Streamer: Correctly handle reblog mutes 2020-01-28 16:40:44 +01:00
Egor Kislitsyn 6302b40791
Warn if HTTPSecurityPlug is disabled 2020-01-28 19:14:09 +04:00
feld d9cb8acd3e Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url

See merge request pleroma/pleroma!2154
2020-01-28 14:52:57 +00:00
Roman Chvanikov d18a2e4e36 Add test for custom base_url when deleting an attachment 2020-01-28 17:22:24 +03:00
Roman Chvanikov 804a702f97 Fix base_url string trimming 2020-01-28 17:07:46 +03:00
Roman Chvanikov dea968463d Add logging 2020-01-28 16:52:20 +03:00
lain 46915207b6 Remove `whole_db` parameter everywhere, it's not used anymore 2020-01-28 14:40:40 +01:00
lain e3fae3380e Apply suggestion to lib/pleroma/web/feed/tag_controller.ex 2020-01-28 13:38:49 +00:00
Roman Chvanikov 7f78bd7e37 Fix __MODULE__ usage 2020-01-28 16:38:44 +03:00
lain 95afcae194 Merge branch 'support/update_ecto' into 'develop'
updated ecto and fixed warning

See merge request pleroma/pleroma!2150
2020-01-28 12:49:22 +00:00
lain 4f004ab92e Merge branch 'fix/attachments-cleanup' into 'develop'
Fix/attachments cleanup

See merge request pleroma/pleroma!2148
2020-01-28 12:40:00 +00:00
Maksim Pechnikov 02c3dd2e3d update ecto 2020-01-28 10:43:47 +03:00
Roman Chvanikov eb4870e1cd Remove unused var 2020-01-28 03:54:54 +03:00
Roman Chvanikov 52e08ec9fd explicitly describe perform op in AttachmentsClenupWorker 2020-01-28 03:52:50 +03:00
Maksim Pechnikov bcffa662dc Merge branch 'develop' into feature/tag_feed 2020-01-27 21:13:13 +03:00
Hakaba Hitoyo dabd535e43 Remove user recommendation by third party engine 2020-01-27 13:21:50 +00:00
Maksim Pechnikov bfc70fdf29 Merge branch 'develop' into issue/1383 2020-01-27 08:48:19 +03:00
Roman Chvanikov 86c4b76bf0 Fix typo 2020-01-27 04:01:50 +03:00
feld 36838b516f Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config

See merge request pleroma/pleroma!2143
2020-01-26 17:35:21 +00:00
Mark Felder d770cffce0 Merge branch 'develop' into issue/1280 2020-01-26 11:23:05 -06:00
Alexander Strizhakov e93cc561cd
restarting pleroma from outside application 2020-01-25 18:42:04 +03:00
Ivan Tashkinov 86e4d23acb [#1505] Background fetching of incoming activities' `replies` collections. 2020-01-25 10:47:30 +03:00
Alexander Strizhakov de4102b247
can be changed in runtime 2020-01-25 10:39:10 +03:00
Maksim Pechnikov 99c0a11c58 added atom feed 2020-01-24 22:12:23 +03:00
Maksim Pechnikov 055edd3d72 Merge branch 'develop' into feature/tag_feed 2020-01-24 21:46:57 +03:00
rinpatch 8533b63d1f Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom

Closes #1532

See merge request pleroma/pleroma!2139
2020-01-24 11:33:02 +00:00
rinpatch 0fceeb44b3 Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache

See merge request pleroma/pleroma!2132
2020-01-24 11:32:25 +00:00
lain 347f3ed2c6 Emoji reactions: Change api format once more 2020-01-24 10:52:24 +01:00
Alexander Strizhakov 6a0f0ac4a2
fix for non existing atom 2020-01-24 12:22:26 +03:00
Maksim Pechnikov 293281fcbd Merge branch 'develop' into feature/tag_feed 2020-01-24 08:58:07 +03:00
Alexander Strizhakov 6cd2e851d9
parsing Swoosh modules 2020-01-23 18:21:29 +03:00
Maksim Pechnikov 8589632d09 fixed delete ScheduledActivity 2020-01-23 17:18:23 +03:00
lain 34fc0ca053 Emoji reactions: Add sanity checks for the cache 2020-01-23 12:34:34 +01:00
Maksim Pechnikov 2cfe1b9385 Merge branch 'develop' into feature/tag_feed 2020-01-23 11:42:10 +03:00
Maksim Pechnikov 5fc2fa8908 Merge branch 'develop' into issue/1383 2020-01-23 11:11:18 +03:00
Maksim Pechnikov ce7c887a27 removed try/rescue 2020-01-23 11:05:08 +03:00
Maksim 6f77b77428 Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex 2020-01-23 05:49:00 +00:00
Haelwenn dddebee047 Merge branch 'emoji-notifications' into 'develop'
Emoji notifications

See merge request pleroma/pleroma!2130
2020-01-23 02:12:03 +00:00
Mark Felder e151dea276 Merge branch 'develop' into feature/new-registrations-digest 2020-01-22 15:59:24 -06:00
Mark Felder ae78059ff4 Merge branch 'develop' into features/remote-follow-userpage-redirect 2020-01-22 15:05:39 -06:00
lain 615b72238e Notifications: Add emoji reaction notifications 2020-01-22 20:06:12 +01:00
Ivan Tashkinov cf96c40057 [#1505] Added Mastodon-compatible `replies` collection to Note federated representation. 2020-01-22 21:10:17 +03:00
rinpatch 6e6f1ead31 Merge branch 'no-error-404' into 'develop'
Log at debug level for object deletion, not error.

See merge request pleroma/pleroma!2066
2020-01-22 17:55:49 +00:00
Maksim Pechnikov cf19bf3c7c Merge branch 'develop' into issue/1383 2020-01-22 20:20:39 +03:00
minibikini 7c0ac54437 Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex 2020-01-22 17:18:55 +00:00
Egor Kislitsyn 5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest 2020-01-22 21:18:27 +04:00
feld be27777156 Merge branch 'admin-be' into 'develop'
Config api for admin-fe

Closes #1406

See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
Egor Kislitsyn b6f5b326e7
Fix credo warnings 2020-01-22 20:59:58 +04:00
Egor Kislitsyn aa0f0d4edd
Disable NewUsersDigestEmail by default 2020-01-22 20:53:06 +04:00
Egor Kislitsyn df0b8f1d08
Add new users digest email 2020-01-22 20:31:42 +04:00
rinpatch 34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop'
Emoji Reactions: In the API, sort them by first emoji insertion date

See merge request pleroma/pleroma!2126
2020-01-22 14:11:01 +00:00
lain dd3fc50ea4 Emoji reactions: Change cache and reply format 2020-01-22 13:57:42 +01:00
Alexander Strizhakov d5f8a88a37
support for updating env after settings deletion 2020-01-22 15:14:11 +03:00
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be 2020-01-22 11:22:31 +03:00
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383 2020-01-22 09:30:30 +03:00
Maksim Pechnikov 5ea8596448 Merge branch 'develop' into feature/tag_feed 2020-01-21 20:56:49 +03:00
Roman Chvanikov 22e94bb2c7 Merge branch 'develop' into fix/attachments-cleanup 2020-01-21 19:45:13 +03:00
Haelwenn (lanodan) Monnier 7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-21 16:46:16 +01:00
Alexander Strizhakov f01ab6cd29
some refactor and tests 2020-01-21 18:42:00 +03:00
rinpatch 04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`

See merge request pleroma/pleroma!2120
2020-01-21 13:13:17 +00:00
Alexander Strizhakov 503d966e9f
Merge branch 'develop' into admin-be 2020-01-21 10:32:27 +03:00
Alexander Strizhakov dcae5914d1
fix for db key 2020-01-21 10:14:48 +03:00
Maksim Pechnikov 41e2332007 Merge branch 'develop' into feature/tag_feed 2020-01-21 09:23:35 +03:00
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results 2020-01-21 07:40:13 +03:00
lain 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions 2020-01-20 18:10:55 +01:00
rinpatch 00d08c9231 Merge branch 'favoritng-responses' into 'develop'
Mastodon API: Align favoriting / repeating behavior with Mastodon

See merge request pleroma/pleroma!2119
2020-01-20 16:31:43 +00:00
Alexander Strizhakov 8023fa48db
merge fix 2020-01-20 18:25:00 +03:00
lain 4c5b5f14dc StatusView: Add `emoji_reactions` 2020-01-20 16:24:20 +01:00
lain 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5

See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
lain 42ea480e95 Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
Pleroma API: `emoji_reactions_by` does not need authorization

See merge request pleroma/pleroma!2117
2020-01-20 13:49:06 +00:00
lain 510776ba31 CommonAPI: Don't error out on double favs/repeats 2020-01-20 14:27:59 +01:00
lain c814f22030 Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update

See merge request pleroma/pleroma!2087
2020-01-20 12:07:12 +00:00
lain 5fddf988ea Pleroma API: `emoji_reactions_by` does not need authorization 2020-01-20 13:05:35 +01:00
Haelwenn e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks

See merge request pleroma/pleroma!2116
2020-01-20 11:26:07 +00:00
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
rinpatch 9367b70f37 Merge branch 'features/cleanup-incoming-actor' into 'develop'
transmogrifier.ex: simplify handle_incoming of actors

See merge request pleroma/pleroma!2114
2020-01-20 10:25:17 +00:00
rinpatch dc0498ab2b Check for unapplied migrations on startup
Closes #1328
2020-01-20 12:20:26 +03:00
Roman Chvanikov cde828ff7d Fix credo warning 2020-01-19 22:09:47 +03:00
Roman Chvanikov d6a532bf0f Delete attachments asynchronously 2020-01-19 19:45:20 +03:00
Haelwenn (lanodan) Monnier 6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors 2020-01-19 07:06:15 +01:00
Alexander Strizhakov efb8ef5abe
releases support 2020-01-18 17:14:50 +03:00
Alexander Strizhakov e699861690
full update for some subkeys 2020-01-18 12:25:56 +03:00
Roman Chvanikov 81133702d4 Delete attachments after object and cache cleanup 2020-01-17 20:20:37 +03:00
Alexander Strizhakov 89e93fb33f
return db key on update requests 2020-01-17 18:15:41 +03:00
Alexander Strizhakov 7676ed8239
some clean up 2020-01-17 16:28:44 +03:00
Maksim Pechnikov 108a39c876 updated error messages for authentication process 2020-01-17 15:01:37 +03:00
Alexander Strizhakov 58e8963824
fix for config loader 2020-01-17 11:54:22 +03:00
Alexander Strizhakov 60ba2339a2
saving to DB only added by user settings 2020-01-17 11:45:44 +03:00
Alexander Strizhakov 29155137fd
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00
Maksim Pechnikov a5db044e57 Merge branch 'develop' into feature/tag_feed 2020-01-15 19:11:13 +03:00
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 2020-01-15 18:12:08 +03:00
lain aa9fe3a712 Merge branch 'develop' into 'feature/tag_feed'
# Conflicts:
#   CHANGELOG.md
2020-01-15 14:29:56 +00:00
Alexander Strizhakov 59ba5c80b9
little cleanup 2020-01-15 17:10:33 +03:00
Egor Kislitsyn 3849053c6a
Merge branch 'develop' into notifications-from-account 2020-01-15 16:49:45 +04:00
Ivan Tashkinov 76c1948880 [#1478] Adjusted AdminAPIController admin subscope requirements. 2020-01-15 12:11:23 +03:00
Maksim Pechnikov c9f45edeac Merge branch 'develop' into feature/tag_feed 2020-01-14 21:29:14 +03:00
Roman Chvanikov 0709757e47 Check if object->data is array when looking up attachment objects to delete 2020-01-14 19:53:28 +03:00
lain 2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags 2020-01-14 17:24:26 +01:00
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be 2020-01-14 14:52:00 +03:00
Maksim Pechnikov b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +03:00
Roman Chvanikov 88f0eed0f2 Delete attachments when status is deleted 2020-01-12 18:48:58 +00:00
feld 8b4d81609d Merge branch 'updated-at-on-conversation-read' into 'develop'
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)

See merge request pleroma/pleroma!2080
2020-01-12 18:37:52 +00:00
feld bb5862ea2f Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow

See merge request pleroma/pleroma!2079
2020-01-12 18:20:31 +00:00
Mark Felder 2f5b8fbeb3 Merge branch 'develop' into issue/1354 2020-01-12 12:12:15 -06:00
feld ea4a462858 Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear  HTML entities after scrub html and truncate

See merge request pleroma/pleroma!2090
2020-01-12 17:25:25 +00:00
Hakaba Hitoyo 0c9c62509d Remove MDII uploader 2020-01-11 17:19:54 +00:00
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be 2020-01-11 12:15:42 +03:00
Alexander Strizhakov d933fd3d61
more renamings 2020-01-10 19:51:32 +03:00
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Alexander Strizhakov 958d0452e4
fix for pleroma assets group update 2020-01-10 18:18:09 +03:00
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
#	lib/pleroma/user.ex
2020-01-10 16:18:32 +03:00
lain 05ca420c09 Merge branch 'issue/1490' into 'develop'
[#1490] fixed create  service user   (relay, internal.fetch)

See merge request pleroma/pleroma!2092
2020-01-10 13:14:20 +00:00
Alexander Strizhakov 88a16bb9fc
deep merge in config update 2020-01-10 15:52:02 +03:00
Alexander c841174de8
flag for delete fix 2020-01-10 15:52:02 +03:00
Alexander 0b02040327
little fixes and typos fix 2020-01-10 15:52:02 +03:00
Alexander 9c1f3bfeff
fixes for logger backends 2020-01-10 15:52:01 +03:00
Alexander cda2c1fc63
fix for subgroup tuple
added settings for swoosh adapters local
2020-01-10 15:52:01 +03:00
Alexander 063ab6d911
logger backends fix 2020-01-10 15:52:01 +03:00
Alexander 583cee4607
parsing proxy url setting 2020-01-10 15:52:01 +03:00
Alexander a71393dd29
fix for endpoints after env update 2020-01-10 15:52:00 +03:00
Alexander fea734ca70
errors on endpoints 2020-01-10 15:52:00 +03:00
Alexander 5cacb988b9
partially settings update 2020-01-10 15:52:00 +03:00
Alex S 2753285b77
config editing through database 2020-01-10 15:51:59 +03:00
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests. 2020-01-10 10:52:21 +03:00
Maksim Pechnikov 70410dfafd fix create service actor 2020-01-08 16:40:49 +03:00
eugenijm 0b6d1292d2 Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list 2020-01-05 17:38:51 +03:00
Maksim Pechnikov fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate 2020-01-03 16:28:13 +03:00
Ivan Tashkinov badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests 2020-01-02 13:03:33 +03:00
Maksim Pechnikov 933dc12043 added code of mr#2067 2019-12-25 15:12:43 +03:00
Maksim Pechnikov 385356aad0 fix oauth scopes for AdminApi#reports_update 2019-12-24 20:51:52 +03:00
Maksim Pechnikov bdd71669da update test 2019-12-22 21:21:31 +03:00
Maksim 4c505bc615 Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex 2019-12-22 17:58:54 +00:00
Maksim c9a44ec4a6 Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex 2019-12-22 17:58:45 +00:00
Maksim Pechnikov 5b84156013 moved remote follow in separate controller 2019-12-21 21:27:42 +03:00
Maksim Pechnikov 54c9db38c8 Merge branch 'develop' into issue/1383 2019-12-21 20:38:59 +03:00
rinpatch c51e93978e Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime

Closes #1448

See merge request pleroma/pleroma!2039
2019-12-21 11:56:24 +00:00
Maxim Filippov e71a13ad57 Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
2019-12-21 11:41:19 +00:00
Mark Felder 06ae56a3ae Posts without media attachments should get the Summary TwitterCard 2019-12-20 16:32:04 -06:00
feld a54aa5af43 Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope

See merge request pleroma/pleroma!2076
2019-12-20 16:30:26 +00:00
Maksim Pechnikov 7bd0bca2ab fixed remote follow 2019-12-20 16:33:44 +03:00
Maxim Filippov 5fc84552d3 Fix all count 2019-12-19 19:52:55 +03:00
Ivan Tashkinov ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests 2019-12-19 17:24:08 +03:00
Ivan Tashkinov 455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests. 2019-12-19 17:23:27 +03:00
Egor Kislitsyn 34d85f8a54
Return 404 if account to filter notifications from is not found 2019-12-19 20:45:44 +07:00
Egor Kislitsyn 775212121c
Verify HTTP signatures only when request accepts "activity+json" type 2019-12-19 20:17:18 +07:00
Egor Kislitsyn 432b3067d4
Do not crash when remote user follower and following counters are hidden 2019-12-19 19:26:46 +07:00
Maxim Filippov 404a9ccb9a Stats: return status counts by scope 2019-12-18 23:17:34 +03:00
Maksim Pechnikov b53573a837 add tag feeds 2019-12-18 09:19:37 +03:00
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
Egor Kislitsyn 6c39fa20b1
Add support for `account_id` param to filter notifications by the account 2019-12-17 17:00:46 +07:00
Maxim Filippov 45180d4c60 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost 2019-12-17 12:36:56 +03:00
Egor Kislitsyn 8f79f433bc
Hide follower counter when hiding is activated 2019-12-17 13:34:07 +07:00
Maksim Pechnikov a879c396bb Merge branch 'develop' into feature/tag_feed 2019-12-17 09:24:08 +03:00
Egor Kislitsyn b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules 2019-12-16 22:34:21 +07:00
Egor Kislitsyn a12b6454bb
Add an option to require fetches to be signed 2019-12-16 22:24:03 +07:00
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. 2019-12-15 22:32:42 +03:00
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44:10 +03:00
Maxim Filippov eb11c60289 Disable rate limiter for socket/localhost (unless RemoteIp is enabled) 2019-12-14 03:06:43 +03:00
Phil Hagelberg 02c3031e99 Don't log when users or objects are deleted. 2019-12-13 12:05:53 -08:00
rinpatch bcd16676a7 Publisher: check out a connection for inserting publish_one jobs
Related to #1474, federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
2019-12-13 14:27:10 +03:00
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-13 01:51:52 +07:00
lain 2f31cef71f Merge branch 'feature/native-captcha' into 'develop'
Add native captcha and enable it by default.

Closes #1017 and #1405

See merge request pleroma/pleroma!2060
2019-12-12 18:43:21 +00:00
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
2019-12-12 16:00:06 +03:00
Egor Kislitsyn e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
AdminAPI: Merge account views for list instance statuses

See merge request pleroma/pleroma!2054
2019-12-12 09:28:27 +00:00
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411 2019-12-11 15:02:53 -06:00
Maxim Filippov 82fae3e23f AdminAPI: Merge account views for list instance statuses 2019-12-11 18:57:36 +03:00
Egor Kislitsyn ee6805850c Set log level to debug for not important messages 2019-12-11 17:47:19 +07:00
rinpatch 72f3b22134 Merge branch 'domain-block-precedence' into 'develop'
make follows take precedence over domain blocks

See merge request pleroma/pleroma!2019
2019-12-11 09:57:00 +00:00
Sadposter 1ad96d667a remove single-step pipe 2019-12-11 09:08:20 +00:00
lain 1f498ba2bb Merge branch '1427-oauth-admin-scopes' into 'develop'
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests

Closes #1427

See merge request pleroma/pleroma!2053
2019-12-11 08:50:43 +00:00
Ivan Tashkinov 3920244be5 [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests. 2019-12-11 11:42:02 +03:00
Sadposter 457821adb0 Apply suggestion to lib/pleroma/user.ex 2019-12-10 18:49:41 +00:00
feld 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop'
Do not apply http signature pipeline to the unsubscribe route

See merge request pleroma/pleroma!2052
2019-12-10 17:25:56 +00:00
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
#   lib/pleroma/user.ex
2019-12-10 16:54:25 +00:00
Sadposter 25f774f7c1 format activity_pub.ex 2019-12-10 16:41:43 +00:00
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities 2019-12-10 16:40:12 +00:00
Egor Kislitsyn 75b419d7c8 Do not apply http signature pipeline to the unsubscribe route 2019-12-10 22:36:03 +07:00
minibikini 43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules'
# Conflicts:
#   CHANGELOG.md
2019-12-10 13:38:25 +00:00
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
#   CHANGELOG.md
2019-12-10 13:34:54 +00:00
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type 2019-12-10 13:19:26 +00:00
Egor Kislitsyn a37bd5c255 Change log level 2019-12-10 15:08:57 +07:00
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
#	CHANGELOG.md
2019-12-10 08:55:14 +03:00
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
status search: prefer the status fetched by url over other results

See merge request pleroma/pleroma!2050
2019-12-09 17:55:48 +00:00
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results 2019-12-09 20:45:04 +03:00