Haelwenn [Sat, 30 May 2020 15:51:19 +0000 (15:51 +0000)]
Merge branch 'chore/bump-hackney' into 'develop'
mix.lock: update hackney to 1.16.0
Closes #1612
See merge request pleroma/pleroma!2614
lain [Sat, 30 May 2020 14:03:43 +0000 (14:03 +0000)]
Merge branch 'test/fix-config-setting-in-user-test' into 'develop'
Fix config setting to not affect other tests
See merge request pleroma/pleroma!2615
Roman Chvanikov [Sat, 30 May 2020 13:47:09 +0000 (16:47 +0300)]
Fix config setting to not affect other tests
rinpatch [Sat, 30 May 2020 10:59:04 +0000 (13:59 +0300)]
hackney adapter helper: support tlsv1.3 and remove custom opts
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
lain [Sat, 30 May 2020 10:02:37 +0000 (10:02 +0000)]
Merge branch 'conversation-pagination' into 'develop'
Conversation pagination
See merge request pleroma/pleroma!2601
Steven Fuchs [Sat, 30 May 2020 10:02:37 +0000 (10:02 +0000)]
Conversation pagination
rinpatch [Fri, 29 May 2020 21:23:49 +0000 (21:23 +0000)]
Merge branch 'bugfix/csp-unproxied' into 'develop'
http_security_plug.ex: Fix non-proxied media
See merge request pleroma/pleroma!2610
rinpatch [Fri, 29 May 2020 21:20:36 +0000 (21:20 +0000)]
Merge branch 'media-docs' into 'develop'
Docs: Attachement limitations in MastoAPI differences
See merge request pleroma/pleroma!2607
rinpatch [Fri, 29 May 2020 21:18:17 +0000 (00:18 +0300)]
mix.lock: update hackney to 1.16.0
Closes #1612
rinpatch [Fri, 29 May 2020 21:15:07 +0000 (21:15 +0000)]
Apply suggestion to lib/pleroma/plugs/http_security_plug.ex
lain [Fri, 29 May 2020 20:31:07 +0000 (20:31 +0000)]
Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'
fix unused var warning in streamer test
See merge request pleroma/pleroma!2612
Roman Chvanikov [Fri, 29 May 2020 20:05:03 +0000 (23:05 +0300)]
fix unused var warning
rinpatch [Fri, 29 May 2020 19:26:54 +0000 (19:26 +0000)]
Merge branch 'connect-src' into 'develop'
Add blob: to connect-src CSP, fixes #1827
Closes #1827
See merge request pleroma/pleroma!2608
Alex Gleason [Fri, 29 May 2020 15:33:31 +0000 (10:33 -0500)]
Add blob: to connect-src CSP
lain [Fri, 29 May 2020 15:42:43 +0000 (15:42 +0000)]
Merge branch 'fix-streaming' into 'develop'
Fix argument error in streamer
See merge request pleroma/pleroma!2609
feld [Fri, 29 May 2020 15:33:35 +0000 (15:33 +0000)]
Merge branch 'mix/database-vacuum-options' into 'develop'
Database vacuum mix task
See merge request pleroma/pleroma!2599
kPherox [Fri, 29 May 2020 12:08:09 +0000 (21:08 +0900)]
Add test for stream boosts of mastodon user
kPherox [Mon, 25 May 2020 14:21:43 +0000 (23:21 +0900)]
Fix argument error in streamer
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
Haelwenn (lanodan) Monnier [Fri, 29 May 2020 15:17:02 +0000 (17:17 +0200)]
http_security_plug.ex: Fix non-proxied media
Mark Felder [Fri, 29 May 2020 15:17:06 +0000 (10:17 -0500)]
Document new database vacuum tasks
lain [Fri, 29 May 2020 10:42:49 +0000 (10:42 +0000)]
Merge branch 'fix-relay-repeat-notification' into 'develop'
Fix relay repeat notification
See merge request pleroma/pleroma!2590
kPherox [Wed, 27 May 2020 05:24:36 +0000 (05:24 +0000)]
Use `User.is_internal_user?` instead
kPherox [Tue, 26 May 2020 11:32:05 +0000 (11:32 +0000)]
Don't make relay announce notification
rinpatch [Fri, 29 May 2020 09:46:31 +0000 (09:46 +0000)]
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
rinpatch [Fri, 29 May 2020 09:32:48 +0000 (12:32 +0300)]
HTTP Security plug: make starting csp string generation more readable
Alex Gleason [Thu, 28 May 2020 21:10:06 +0000 (16:10 -0500)]
Docs: Attachement limitations in MastoAPI differences
lain [Thu, 28 May 2020 17:08:30 +0000 (17:08 +0000)]
Merge branch 'fix/1557-gets-local-pack' into 'develop'
get-packs for local generated pack
Closes #1557
See merge request pleroma/pleroma!2604
lain [Thu, 28 May 2020 16:58:28 +0000 (16:58 +0000)]
Merge branch 'feature/1792-update-actor-type' into 'develop'
Validate actor type
See merge request pleroma/pleroma!2593
lain [Thu, 28 May 2020 16:54:09 +0000 (16:54 +0000)]
Merge branch 'update-install-guides' into 'develop'
Update installation guides
See merge request pleroma/pleroma!2603
Alexander Strizhakov [Thu, 28 May 2020 16:41:34 +0000 (19:41 +0300)]
get-packs for local generated pack
Egor Kislitsyn [Thu, 28 May 2020 15:32:56 +0000 (19:32 +0400)]
Update installation guides
rinpatch [Thu, 28 May 2020 11:38:35 +0000 (11:38 +0000)]
Merge branch 'chore/fix-spelling' into 'develop'
Fix minor spelling error
See merge request pleroma/pleroma!2598
Mark Felder [Wed, 27 May 2020 22:17:06 +0000 (17:17 -0500)]
Alpha sort
Mark Felder [Wed, 27 May 2020 21:40:51 +0000 (16:40 -0500)]
Abstract out the database maintenance. I'd like to use this from AdminFE too.
Mark Felder [Wed, 27 May 2020 21:31:37 +0000 (16:31 -0500)]
Make clearer that this is time and resource consuming
Mark Felder [Wed, 27 May 2020 21:27:29 +0000 (16:27 -0500)]
Make it obvious a full vacuum can take a while
Mark Felder [Wed, 27 May 2020 21:27:07 +0000 (16:27 -0500)]
Permit easy access to vaccum full and analyze via a mix task
Mark Felder [Wed, 27 May 2020 19:34:37 +0000 (14:34 -0500)]
Fix minor spelling error
rinpatch [Wed, 27 May 2020 19:22:53 +0000 (19:22 +0000)]
Merge branch 'bundle/adminfe-
20200527' into 'develop'
Update AdminFE build, re-enables emoji packs
See merge request pleroma/pleroma!2597
Mark Felder [Wed, 27 May 2020 18:50:24 +0000 (13:50 -0500)]
Update AdminFE build, re-enables emoji packs
rinpatch [Wed, 27 May 2020 18:01:36 +0000 (21:01 +0300)]
HTTP security plug: Harden img-src and media-src when MediaProxy is enabled
rinpatch [Wed, 27 May 2020 17:27:30 +0000 (20:27 +0300)]
HTTP Security plug: rewrite &csp_string/0
- Directives are now separated with ";" instead of " ;",
according to https://www.w3.org/TR/CSP2/#policy-parsing
the space is optional
- Use an IO list, which at the end gets converted to a binary as
opposed to ++ing a bunch of arrays with binaries together and joining
them to a string. I doubt it gives any significant real world advantage,
but the code is cleaner and now I can sleep at night.
- The static part of csp is pre-joined to a single binary at compile time.
Same reasoning as the last point.
rinpatch [Wed, 27 May 2020 16:35:35 +0000 (19:35 +0300)]
AccountView: Use mediaproxy URLs for emojis
Also use atom keys in emoji maps instead of binaries
Closes #1810
rinpatch [Wed, 27 May 2020 16:34:56 +0000 (19:34 +0300)]
MediaProxy test: use config macros instead of directly putting values
They were not properly cleaned later and caused trouble for another tests
kPherox [Tue, 26 May 2020 09:47:03 +0000 (09:47 +0000)]
Exclude post actor from to of relay announce
rinpatch [Wed, 27 May 2020 14:17:12 +0000 (14:17 +0000)]
Merge branch 'refactor-add-mention-step-one' into 'develop'
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
rinpatch [Wed, 27 May 2020 13:45:14 +0000 (13:45 +0000)]
Merge branch 'notification-fixes' into 'develop'
Notification performance fixes
See merge request pleroma/pleroma!2595
lain [Wed, 27 May 2020 10:56:15 +0000 (12:56 +0200)]
Migrations: Make user_id index on notifications better for query.
Alexander Strizhakov [Wed, 27 May 2020 10:55:42 +0000 (10:55 +0000)]
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
lain [Wed, 27 May 2020 10:41:06 +0000 (12:41 +0200)]
Notification: Actually preload objects.
lain [Wed, 27 May 2020 08:02:00 +0000 (08:02 +0000)]
Merge branch 'fav-speedup' into 'develop'
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
lain [Wed, 27 May 2020 07:46:12 +0000 (09:46 +0200)]
ActivityPub: Change ordering to `nulls last` in favorites query
This makes it use our existing index and speeds up the query.
Alexander Strizhakov [Wed, 27 May 2020 06:42:28 +0000 (09:42 +0300)]
validate actor type
rinpatch [Tue, 26 May 2020 16:33:13 +0000 (16:33 +0000)]
Merge branch 'fav-speedup' into 'develop'
Fix favorites query performance
See merge request pleroma/pleroma!2591
rinpatch [Tue, 26 May 2020 15:57:01 +0000 (15:57 +0000)]
Merge branch '1808-pleroma-sucks' into 'develop'
Resolve "Don't fail message ingestions when we can't update a user"
Closes #1808
See merge request pleroma/pleroma!2576
rinpatch [Tue, 26 May 2020 15:56:23 +0000 (15:56 +0000)]
Merge branch 'apps-index' into 'develop'
Migrations: Add index on client_id and client_secret for apps.
See merge request pleroma/pleroma!2589
rinpatch [Tue, 26 May 2020 15:55:09 +0000 (15:55 +0000)]
Merge branch '1813-throttling' into 'develop'
Mastodon API Controllers: Use the correct params for rate limiting.
Closes #1813
See merge request pleroma/pleroma!2586
lain [Tue, 26 May 2020 15:46:16 +0000 (17:46 +0200)]
Activity.Queries: Use correct actor restriction.
lain [Tue, 26 May 2020 14:46:57 +0000 (16:46 +0200)]
Migrations: Add index on client_id and client_secret for apps.
Greatly speeds up app lookup.
lain [Tue, 26 May 2020 14:17:54 +0000 (14:17 +0000)]
Merge branch 'restore-new-image' into 'develop'
Config: Restore old new background image
See merge request pleroma/pleroma!2588
lain [Tue, 26 May 2020 14:00:56 +0000 (16:00 +0200)]
Config: Restore old new background image
Became lost in a settings restructure
lain [Tue, 26 May 2020 12:41:46 +0000 (12:41 +0000)]
Merge branch 'fix/oban-warnings' into 'develop'
Fix Oban warnings
See merge request pleroma/pleroma!2587
Egor Kislitsyn [Tue, 26 May 2020 12:11:42 +0000 (16:11 +0400)]
Fix Oban warnings
lain [Tue, 26 May 2020 11:45:54 +0000 (13:45 +0200)]
Mastodon API Controllers: Use the correct params for rate limiting.
lain [Tue, 26 May 2020 10:56:40 +0000 (10:56 +0000)]
Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'
[#1501] Made user feed contain public and unlisted activities
Closes #1501
See merge request pleroma/pleroma!2584
lain [Tue, 26 May 2020 08:32:13 +0000 (08:32 +0000)]
Merge branch 'skip-crypt-test' into 'develop'
Skip failing `:crypt` test on mac
See merge request pleroma/pleroma!2583
Ivan Tashkinov [Mon, 25 May 2020 20:27:47 +0000 (23:27 +0300)]
[#1501] Made user feed contain public and unlisted activities.
Egor Kislitsyn [Mon, 25 May 2020 19:01:37 +0000 (23:01 +0400)]
Skip failing `:crypt` test on mac
lain [Mon, 25 May 2020 17:45:40 +0000 (17:45 +0000)]
Merge branch '1471-tuning-advice' into 'develop'
Docs: Document reasonable Postgres settings.
See merge request pleroma/pleroma!2581
lain [Mon, 25 May 2020 17:26:07 +0000 (19:26 +0200)]
Docs: sql -> SQL
lain [Mon, 25 May 2020 17:11:35 +0000 (17:11 +0000)]
Apply suggestion to docs/installation/otp_en.md
lain [Mon, 25 May 2020 13:53:14 +0000 (15:53 +0200)]
Docs: Document reasonable Postgres settings.
lain [Mon, 25 May 2020 13:08:43 +0000 (15:08 +0200)]
Transmogrifier: Use a simpler way to get mentions.
lain [Mon, 25 May 2020 13:06:35 +0000 (15:06 +0200)]
User: Change signature of get_users_from_set
lain [Mon, 25 May 2020 12:01:16 +0000 (14:01 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
lain [Mon, 25 May 2020 12:00:53 +0000 (12:00 +0000)]
Merge branch 'flaky-tests' into 'develop'
Flaky tests
See merge request pleroma/pleroma!2578
lain [Mon, 25 May 2020 12:00:18 +0000 (14:00 +0200)]
StealEmojiPolicyTest: Clean up.
lain [Mon, 25 May 2020 11:48:47 +0000 (13:48 +0200)]
StealEmojiPolicyTest: Fix flaky test.
lain [Mon, 25 May 2020 11:48:47 +0000 (13:48 +0200)]
StealEmojiPolicyTest: Fix flaky test.
lain [Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)]
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
lain [Mon, 25 May 2020 10:59:42 +0000 (12:59 +0200)]
Factory: Set users to be ap_enabled by default.
lain [Mon, 25 May 2020 10:49:38 +0000 (12:49 +0200)]
UserTest: Add test for user refreshing.
lain [Mon, 25 May 2020 10:46:14 +0000 (12:46 +0200)]
User: Don't error out if we want to refresh a user but can't
rinpatch [Sun, 24 May 2020 19:05:57 +0000 (19:05 +0000)]
Merge branch 'mastodon-migration-compat' into 'develop'
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
lain [Fri, 22 May 2020 17:20:23 +0000 (17:20 +0000)]
Merge branch 'priv-warning' into 'develop'
priv/static: Add a warning discouraging admins from modifying the static files directly
See merge request pleroma/pleroma!2571
lain [Fri, 22 May 2020 16:05:35 +0000 (16:05 +0000)]
Merge branch 'feature/configure-filename-truncate' into 'develop'
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
Roman Chvanikov [Fri, 22 May 2020 15:44:10 +0000 (15:44 +0000)]
Apply suggestion to lib/pleroma/web/common_api/utils.ex
Roman Chvanikov [Fri, 22 May 2020 15:30:13 +0000 (18:30 +0300)]
Update CHANGELOG and docs
Roman Chvanikov [Fri, 22 May 2020 15:19:25 +0000 (18:19 +0300)]
Add filename_display_max_length config
lain [Fri, 22 May 2020 15:13:09 +0000 (17:13 +0200)]
Add Changelog
lain [Fri, 22 May 2020 15:11:59 +0000 (17:11 +0200)]
OStatusController: Add Mastodon activity compat route.
lain [Fri, 22 May 2020 15:06:12 +0000 (17:06 +0200)]
ActivityPubController: Add Mastodon activity compat route.
lain [Fri, 22 May 2020 14:47:22 +0000 (16:47 +0200)]
OStatusController: Add Mastodon compatibility route for objects.
rinpatch [Fri, 22 May 2020 14:36:08 +0000 (14:36 +0000)]
Merge branch 'emoji-react-better-errors' into 'develop'
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
rinpatch [Fri, 22 May 2020 14:35:13 +0000 (14:35 +0000)]
Merge branch 'fix/notifications-api' into 'develop'
Fix notifications mark as read API
Closes #1800
See merge request pleroma/pleroma!2570
rinpatch [Fri, 22 May 2020 14:33:19 +0000 (17:33 +0300)]
priv/static: Add a warning discouraging admins from modifying the static files directly
Egor Kislitsyn [Fri, 22 May 2020 14:15:36 +0000 (18:15 +0400)]
Fix notifications mark as read API
lain [Fri, 22 May 2020 14:15:29 +0000 (16:15 +0200)]
ActivityPubController: Add Mastodon compatibility route.
lain [Fri, 22 May 2020 12:38:28 +0000 (14:38 +0200)]
EmojiReactionController: Return more appropriate error.
Haelwenn [Fri, 22 May 2020 05:47:53 +0000 (05:47 +0000)]
Merge branch 'announce-validator' into 'develop'
Announce validator
See merge request pleroma/pleroma!2567
projects / akkoma / log