sadposter [Mon, 6 Apr 2020 13:44:26 +0000 (14:44 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
lain [Mon, 6 Apr 2020 12:51:35 +0000 (12:51 +0000)]
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
lain [Mon, 6 Apr 2020 12:49:17 +0000 (12:49 +0000)]
Merge branch 'improving-test-coverage' into 'develop'
Tests for emoji mix task
See merge request pleroma/pleroma!2350
lain [Mon, 6 Apr 2020 11:59:01 +0000 (11:59 +0000)]
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
lain [Mon, 6 Apr 2020 11:53:24 +0000 (13:53 +0200)]
ObjectID Validator: Refactor.
lain [Mon, 6 Apr 2020 11:46:34 +0000 (13:46 +0200)]
Transmogrifier: Refactoring / Renaming.
Alexander Strizhakov [Mon, 6 Apr 2020 11:27:20 +0000 (14:27 +0300)]
using another fn for file deletion
Alexander Strizhakov [Mon, 6 Apr 2020 07:45:25 +0000 (10:45 +0300)]
tests for emoji mix task
feld [Thu, 2 Apr 2020 19:36:55 +0000 (19:36 +0000)]
Merge branch 'fix/docs-markdown' into 'develop'
Fix formatting in documentation
See merge request pleroma/pleroma!2348
Egor Kislitsyn [Thu, 2 Apr 2020 19:01:29 +0000 (23:01 +0400)]
Fix formatting in documentation
feld [Thu, 2 Apr 2020 16:48:47 +0000 (16:48 +0000)]
Merge branch '2323-accounts-relationships-hotfix' into 'develop'
[#2323] Fixed /accounts/relationships
Closes pleroma-fe#820
See merge request pleroma/pleroma!2347
Ivan Tashkinov [Thu, 2 Apr 2020 16:23:30 +0000 (19:23 +0300)]
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
feld [Wed, 1 Apr 2020 17:12:59 +0000 (17:12 +0000)]
Merge branch 'update/adminfe-
20200331' into 'develop'
Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343
feld [Wed, 1 Apr 2020 17:05:09 +0000 (17:05 +0000)]
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
lain [Wed, 1 Apr 2020 14:10:17 +0000 (16:10 +0200)]
Validators: Correct ObjectID filename
rinpatch [Wed, 1 Apr 2020 12:55:52 +0000 (12:55 +0000)]
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
Alexander Strizhakov [Wed, 1 Apr 2020 06:55:05 +0000 (09:55 +0300)]
restrict remote users from indexing
Haelwenn [Wed, 1 Apr 2020 03:44:47 +0000 (03:44 +0000)]
Merge branch 'ops/fix-ci' into 'develop'
Ops/fix ci
See merge request pleroma/pleroma!2340
jp [Wed, 1 Apr 2020 02:16:36 +0000 (22:16 -0400)]
remove testing `only:` in docker build
jp [Wed, 1 Apr 2020 01:31:23 +0000 (21:31 -0400)]
add imagemagick and update inherited container to alpine:3.11
feld [Tue, 31 Mar 2020 22:32:48 +0000 (22:32 +0000)]
Merge branch 'fix/docker-mogrify' into 'develop'
Remove problematic --cache-from argument
See merge request pleroma/pleroma!2338
Mark Felder [Tue, 31 Mar 2020 22:28:41 +0000 (17:28 -0500)]
Remove problematic --cache-from argument
Haelwenn [Tue, 31 Mar 2020 22:04:02 +0000 (22:04 +0000)]
Merge branch 'bugfix/funkwhale-channel' into 'develop'
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
Haelwenn (lanodan) Monnier [Mon, 30 Mar 2020 00:01:09 +0000 (02:01 +0200)]
Provide known-good user.uri, remove User.profile_url/1
Haelwenn (lanodan) Monnier [Sun, 29 Mar 2020 20:30:50 +0000 (22:30 +0200)]
User: Fix use of source_data in profile_url/1
Haelwenn (lanodan) Monnier [Sun, 29 Mar 2020 20:01:49 +0000 (22:01 +0200)]
Initial failing test statement against funkwhale channels
feld [Tue, 31 Mar 2020 19:36:04 +0000 (19:36 +0000)]
Merge branch 'fix/docker-mogrify' into 'develop'
Fix/docker mogrify
Closes #1644
See merge request pleroma/pleroma!2337
Mark Felder [Tue, 31 Mar 2020 19:29:43 +0000 (14:29 -0500)]
Add imagemagick to Docker image to fix broken mogrify plugin
Mark Felder [Tue, 31 Mar 2020 18:05:16 +0000 (13:05 -0500)]
Update AdminFE build in preparation for Pleroma 2.0.2
lain [Tue, 31 Mar 2020 17:33:41 +0000 (19:33 +0200)]
Transmogrifier: Fix BAD code by RINPATCH
lain [Tue, 31 Mar 2020 17:28:18 +0000 (17:28 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
lain [Tue, 31 Mar 2020 17:16:45 +0000 (19:16 +0200)]
Transmogrifier: Only add context if it really is onne.
lain [Tue, 31 Mar 2020 17:06:08 +0000 (19:06 +0200)]
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
lain [Tue, 31 Mar 2020 17:00:55 +0000 (17:00 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
lain [Tue, 31 Mar 2020 17:00:48 +0000 (17:00 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
lain [Tue, 31 Mar 2020 15:56:05 +0000 (17:56 +0200)]
CommonAPI: DRY up a bit.
lain [Tue, 31 Mar 2020 15:47:34 +0000 (17:47 +0200)]
Validator Test: Small refactor.
Alexander Strizhakov [Tue, 31 Mar 2020 15:30:19 +0000 (18:30 +0300)]
updating docs
Alexander Strizhakov [Tue, 31 Mar 2020 15:22:25 +0000 (18:22 +0300)]
test for default features and changelog entry
lain [Tue, 31 Mar 2020 14:11:38 +0000 (16:11 +0200)]
Validators: ObjectID is an http uri.
lain [Tue, 31 Mar 2020 12:55:25 +0000 (12:55 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
lain [Mon, 30 Mar 2020 14:48:00 +0000 (14:48 +0000)]
Merge branch 'benchmark-improvements' into 'develop'
Benchmark improvements
See merge request pleroma/pleroma!2308
rinpatch [Mon, 30 Mar 2020 12:38:21 +0000 (12:38 +0000)]
Merge branch 'removing-grouped-reports' into 'develop'
Removing grouped reports endpoint
See merge request pleroma/pleroma!2335
Alexander Strizhakov [Mon, 30 Mar 2020 10:50:00 +0000 (13:50 +0300)]
removing grouped reports admin api endpoint
Alexander Strizhakov [Mon, 30 Mar 2020 09:47:12 +0000 (12:47 +0300)]
updating gun with bug fix
https://github.com/ninenines/gun/issues/222
Alexander Strizhakov [Mon, 30 Mar 2020 09:16:45 +0000 (12:16 +0300)]
changelog fix
Alexander Strizhakov [Mon, 30 Mar 2020 09:15:23 +0000 (12:15 +0300)]
Merge branch 'develop' into gun
Alexander Strizhakov [Mon, 30 Mar 2020 08:59:14 +0000 (11:59 +0300)]
use in timelines benchmark new user generator
Alexander Strizhakov [Tue, 17 Mar 2020 10:47:13 +0000 (13:47 +0300)]
fix
Alexander Strizhakov [Tue, 18 Feb 2020 09:19:10 +0000 (12:19 +0300)]
sync with develop
Alexander Strizhakov [Tue, 14 Jan 2020 11:42:30 +0000 (14:42 +0300)]
activities generation tasks
sadposter [Sun, 29 Mar 2020 19:57:38 +0000 (20:57 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Haelwenn [Sun, 29 Mar 2020 19:18:22 +0000 (19:18 +0000)]
Merge branch 'feature/funkwhale-audio' into 'develop'
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
lain [Fri, 27 Mar 2020 19:14:46 +0000 (19:14 +0000)]
Merge branch 'relations-preloading-for-statuses-rendering' into 'develop'
Performance improvements (timeline / statuses / notifications / accounts rendering)
See merge request pleroma/pleroma!2323
Ivan Tashkinov [Fri, 27 Mar 2020 05:01:03 +0000 (08:01 +0300)]
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
Ivan Tashkinov [Thu, 26 Mar 2020 18:54:01 +0000 (21:54 +0300)]
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
lain [Thu, 26 Mar 2020 16:24:10 +0000 (17:24 +0100)]
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
lain [Thu, 26 Mar 2020 14:45:28 +0000 (14:45 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
lain [Thu, 26 Mar 2020 14:44:14 +0000 (15:44 +0100)]
Validators: Use correct type for IDs.
lain [Thu, 26 Mar 2020 14:37:42 +0000 (15:37 +0100)]
Bump copyright dates.
lain [Thu, 26 Mar 2020 14:33:10 +0000 (15:33 +0100)]
Refactors.
lain [Thu, 26 Mar 2020 14:24:06 +0000 (15:24 +0100)]
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
lain [Thu, 26 Mar 2020 14:23:19 +0000 (14:23 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
lain [Thu, 26 Mar 2020 14:16:54 +0000 (15:16 +0100)]
ActivityPub: Small refactor.
Ivan Tashkinov [Thu, 26 Mar 2020 06:43:58 +0000 (09:43 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
# Conflicts:
# lib/pleroma/thread_mute.ex
rinpatch [Wed, 25 Mar 2020 18:06:00 +0000 (18:06 +0000)]
Merge branch 'benchmark_timeline' into 'develop'
Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325
rinpatch [Wed, 25 Mar 2020 18:00:24 +0000 (18:00 +0000)]
Merge branch '1364-notifications-sending-control' into 'develop'
[#1364] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
Ivan Tashkinov [Wed, 25 Mar 2020 17:41:17 +0000 (20:41 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
Ivan Tashkinov [Wed, 25 Mar 2020 17:33:34 +0000 (20:33 +0300)]
Further preloading (more endpoints), refactoring, tests.
lain [Wed, 25 Mar 2020 15:48:15 +0000 (15:48 +0000)]
Apply suggestion to benchmarks/load_testing/generator.ex
Haelwenn [Wed, 25 Mar 2020 14:57:19 +0000 (14:57 +0000)]
Merge branch 'add-test-update_credentials' into 'develop'
Add a test for accounts/update_credentials
See merge request pleroma/pleroma!2330
Egor Kislitsyn [Wed, 25 Mar 2020 14:46:17 +0000 (18:46 +0400)]
Add a test for accounts/update_credentials
Ivan Tashkinov [Wed, 25 Mar 2020 14:01:45 +0000 (17:01 +0300)]
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
Ivan Tashkinov [Wed, 25 Mar 2020 10:05:00 +0000 (13:05 +0300)]
[#1364] Minor improvements / comments.
Further fixes of incorrect usage of "relations" as a short form of "relationships".
Ivan Tashkinov [Wed, 25 Mar 2020 06:05:17 +0000 (09:05 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
Ivan Tashkinov [Wed, 25 Mar 2020 06:04:00 +0000 (09:04 +0300)]
Fixed incorrect usage of "relations" as a short form of "relationships".
Haelwenn (lanodan) Monnier [Tue, 24 Mar 2020 19:39:19 +0000 (20:39 +0100)]
node_info_test: Bump default features list
Haelwenn (lanodan) Monnier [Tue, 24 Mar 2020 19:32:49 +0000 (20:32 +0100)]
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
Haelwenn (lanodan) Monnier [Tue, 24 Mar 2020 19:21:27 +0000 (20:21 +0100)]
node_info_test.exs: Add test on the default feature list
Ivan Tashkinov [Tue, 24 Mar 2020 19:15:37 +0000 (22:15 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
Ivan Tashkinov [Tue, 24 Mar 2020 19:14:26 +0000 (22:14 +0300)]
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
feld [Tue, 24 Mar 2020 19:10:32 +0000 (19:10 +0000)]
Merge branch 'fix/activity-deletion' into 'develop'
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
rinpatch [Tue, 24 Mar 2020 18:37:53 +0000 (18:37 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
lain [Tue, 24 Mar 2020 18:24:09 +0000 (18:24 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
lain [Tue, 24 Mar 2020 18:20:58 +0000 (18:20 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
lain [Tue, 24 Mar 2020 17:34:13 +0000 (17:34 +0000)]
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
Egor Kislitsyn [Tue, 24 Mar 2020 13:38:18 +0000 (17:38 +0400)]
Fix activity deletion
rinpatch [Mon, 23 Mar 2020 19:32:01 +0000 (19:32 +0000)]
Merge branch 'bugfix/profile-bio-newline' into 'develop'
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
lain [Mon, 23 Mar 2020 17:56:01 +0000 (18:56 +0100)]
Benchmarks: Add timeline benchmark
lain [Mon, 23 Mar 2020 14:58:55 +0000 (15:58 +0100)]
Home timeline tests: Add failing test for relationships
Ivan Tashkinov [Mon, 23 Mar 2020 11:34:58 +0000 (14:34 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
rinpatch [Mon, 23 Mar 2020 10:43:20 +0000 (10:43 +0000)]
Merge branch 'support-emoji-staticfe' into 'develop'
Add emoji support in statuses in staticfe
Closes #1453
See merge request pleroma/pleroma!2324
Egor Kislitsyn [Mon, 23 Mar 2020 10:03:31 +0000 (14:03 +0400)]
Add emoji support in statuses in staticfe
Ivan Tashkinov [Mon, 23 Mar 2020 09:01:11 +0000 (12:01 +0300)]
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
Ivan Tashkinov [Sun, 22 Mar 2020 18:51:44 +0000 (21:51 +0300)]
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
Haelwenn (lanodan) Monnier [Sun, 22 Mar 2020 15:38:12 +0000 (16:38 +0100)]
AccountView: fix for other forms of <br> in bio
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
rinpatch [Sun, 22 Mar 2020 14:32:40 +0000 (14:32 +0000)]
Merge branch 'fix/ecto_ssl_option' into 'develop'
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
Haelwenn [Sun, 22 Mar 2020 14:25:11 +0000 (14:25 +0000)]
Merge branch 'relationship-remove-outdated-hack' into 'develop'
Mastodon API Account view: Remove an outdated hack
See merge request pleroma/pleroma!2321
rinpatch [Sun, 22 Mar 2020 14:10:37 +0000 (17:10 +0300)]
Mastodon API Account view: Remove an outdated hack
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
Alexander Strizhakov [Fri, 20 Mar 2020 17:58:47 +0000 (20:58 +0300)]
updating clear_config
projects / akkoma / log