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 16:18:27 +0000 (20:18 +0400)]
Support pagination in conversations
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
Alexander Strizhakov [Fri, 20 Mar 2020 17:47:54 +0000 (20:47 +0300)]
Merge branch 'develop' into gun
lain [Fri, 20 Mar 2020 16:57:51 +0000 (16:57 +0000)]
Merge branch 'fix-feed-pagination' into 'develop'
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
lain [Fri, 20 Mar 2020 16:54:55 +0000 (16:54 +0000)]
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management
See merge request pleroma/pleroma!2312
Ivan Tashkinov [Fri, 20 Mar 2020 15:33:00 +0000 (18:33 +0300)]
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
Ivan Tashkinov [Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
lain [Fri, 20 Mar 2020 14:40:08 +0000 (14:40 +0000)]
Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'
restrict_unauthenticated setting
Closes #1206
See merge request pleroma/pleroma!2318
lain [Fri, 20 Mar 2020 14:00:28 +0000 (15:00 +0100)]
NotificationController: Fix test.
lain [Fri, 20 Mar 2020 13:52:58 +0000 (14:52 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
Alexander Strizhakov [Fri, 20 Mar 2020 10:04:37 +0000 (13:04 +0300)]
restrict_unauthenticated setting
lain [Fri, 20 Mar 2020 13:27:29 +0000 (13:27 +0000)]
Merge branch 'feature/1635-notifications-include-types' into 'develop'
include_types parameter in /api/v1/notifications
Closes #1635
See merge request pleroma/pleroma!2311
Alexander Strizhakov [Wed, 18 Mar 2020 14:37:54 +0000 (17:37 +0300)]
include_types parameter in /api/v1/notifications
Haelwenn (lanodan) Monnier [Thu, 19 Mar 2020 18:25:50 +0000 (19:25 +0100)]
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
lain [Thu, 19 Mar 2020 18:10:39 +0000 (18:10 +0000)]
Merge branch 'fix-testing' into 'develop'
Fix CI by temporarily removing federated testing
See merge request pleroma/pleroma!2314
Haelwenn (lanodan) Monnier [Thu, 19 Mar 2020 18:10:03 +0000 (19:10 +0100)]
transmogrifier.ex: rework fix_attachment for better IR
lain [Thu, 19 Mar 2020 17:16:12 +0000 (18:16 +0100)]
Fix linting.
lain [Thu, 19 Mar 2020 17:00:55 +0000 (18:00 +0100)]
Merge branch 'remake-remodel' into develop
stwf [Thu, 19 Mar 2020 16:25:36 +0000 (12:25 -0400)]
remove federated testing
Mark Felder [Thu, 19 Mar 2020 15:08:11 +0000 (10:08 -0500)]
Add emoji reactions to features in nodeinfo
Haelwenn (lanodan) Monnier [Thu, 19 Mar 2020 14:08:49 +0000 (15:08 +0100)]
WIP
Ivan Tashkinov [Wed, 18 Mar 2020 17:30:31 +0000 (20:30 +0300)]
Improved in-test config management functions.
Alexander Strizhakov [Wed, 18 Mar 2020 11:08:40 +0000 (14:08 +0300)]
Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun
Alexander Strizhakov [Wed, 18 Mar 2020 11:08:21 +0000 (14:08 +0300)]
Merge branch 'develop' into gun
rinpatch [Wed, 18 Mar 2020 10:12:50 +0000 (10:12 +0000)]
Merge branch 'feature/1530-removing-with_move' into 'develop'
Feature/1530 removing with move
Closes #1530
See merge request pleroma/pleroma!2306
Haelwenn (lanodan) Monnier [Tue, 17 Mar 2020 12:02:10 +0000 (13:02 +0100)]
activity_pub_controller_test.exs: test posting with AP C2S uploaded media
Cevado [Tue, 17 Mar 2020 01:02:01 +0000 (22:02 -0300)]
Fix ssl option on Ecto config breaking release
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
Mark Felder [Mon, 16 Mar 2020 20:39:34 +0000 (15:39 -0500)]
Enable Gun adapter by default
We need devs to dogfood this before we merge it into the 2.1 release
Ivan Tashkinov [Mon, 16 Mar 2020 18:58:10 +0000 (21:58 +0300)]
[#1364] Improved notification-related tests.
eugenijm [Fri, 31 Jan 2020 18:07:46 +0000 (21:07 +0300)]
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
Haelwenn [Mon, 16 Mar 2020 17:42:10 +0000 (17:42 +0000)]
Merge branch 'docs/mrf_object_age' into 'develop'
Improve documentation of mrf_object_age
See merge request pleroma/pleroma!2305
eugenijm [Tue, 28 Jan 2020 06:47:59 +0000 (09:47 +0300)]
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
Alexander Strizhakov [Mon, 16 Mar 2020 17:05:21 +0000 (20:05 +0300)]
removing with_move parameter
Mark Felder [Mon, 16 Mar 2020 16:44:53 +0000 (11:44 -0500)]
Improve documentation of mrf_object_age
Ivan Tashkinov [Mon, 16 Mar 2020 14:58:42 +0000 (17:58 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
rinpatch [Mon, 16 Mar 2020 14:32:23 +0000 (14:32 +0000)]
Merge branch 'feat/templates' into 'develop'
gitlab: create templates for bug reports and release MRs
See merge request pleroma/pleroma!2304
rinpatch [Mon, 16 Mar 2020 14:26:28 +0000 (17:26 +0300)]
gitlab: create templates for bug reports and release MRs
Alexander Strizhakov [Mon, 16 Mar 2020 13:23:49 +0000 (16:23 +0300)]
fix
Alexander Strizhakov [Mon, 16 Mar 2020 12:47:25 +0000 (15:47 +0300)]
temp fix for `:gun.info` MatchError
Alexander Strizhakov [Mon, 16 Mar 2020 11:35:27 +0000 (14:35 +0300)]
Merge branch 'develop' into gun
rinpatch [Mon, 16 Mar 2020 11:27:10 +0000 (11:27 +0000)]
Merge branch 'fix-warnings-in-tests' into 'develop'
Warnings fix
See merge request pleroma/pleroma!2303
Alexander Strizhakov [Mon, 16 Mar 2020 11:25:55 +0000 (14:25 +0300)]
Merge branch 'develop' into gun
Alexander Strizhakov [Mon, 16 Mar 2020 11:19:36 +0000 (14:19 +0300)]
warnings fix
rinpatch [Mon, 16 Mar 2020 11:08:06 +0000 (11:08 +0000)]
Merge branch 'removing-deprecated' into 'develop'
Removing from descriptions.exs deprecated settings
See merge request pleroma/pleroma!2302
Alexander Strizhakov [Mon, 16 Mar 2020 11:01:35 +0000 (14:01 +0300)]
removing from descriptions.exs deprecated settings
Alexander Strizhakov [Fri, 13 Mar 2020 14:58:14 +0000 (17:58 +0300)]
fix for content-type header for tag feed
Alexander Strizhakov [Fri, 13 Mar 2020 14:41:26 +0000 (17:41 +0300)]
adding rss for user feed
Alexander Strizhakov [Tue, 10 Mar 2020 15:11:48 +0000 (18:11 +0300)]
fix for feed page pagination
rinpatch [Sun, 15 Mar 2020 20:04:31 +0000 (20:04 +0000)]
Merge branch 'bugfix/earmark_renderer_test' into 'develop'
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300
rinpatch [Sun, 15 Mar 2020 19:53:52 +0000 (19:53 +0000)]
Merge branch 'features/staticfe-sanitization' into 'develop'
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 16:00:54 +0000 (17:00 +0100)]
static_fe: Sanitize HTML in users
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 14:58:26 +0000 (15:58 +0100)]
mix.lock: [minor] last hash appended
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 14:45:57 +0000 (15:45 +0100)]
static_fe: Sanitize HTML in posts
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
lain [Sun, 15 Mar 2020 19:15:20 +0000 (19:15 +0000)]
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
[#1560] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
Ivan Tashkinov [Sun, 15 Mar 2020 18:00:12 +0000 (21:00 +0300)]
[#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
Haelwenn [Sun, 15 Mar 2020 16:14:54 +0000 (16:14 +0000)]
Merge branch 'f' into 'develop'
rip out fetch_initial_posts
Closes #1422 and #1595
See merge request pleroma/pleroma!2297
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 16:07:08 +0000 (17:07 +0100)]
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
Wasn't in the test suite otherwise
Haelwenn [Sun, 15 Mar 2020 14:22:10 +0000 (14:22 +0000)]
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes #1620
See merge request pleroma/pleroma!2296
rinpatch [Sat, 14 Mar 2020 12:39:58 +0000 (15:39 +0300)]
rip out fetch_initial_posts
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
rinpatch [Sun, 15 Mar 2020 12:47:39 +0000 (12:47 +0000)]
Merge branch 'bugfix/pleroma_conversation_api' into 'develop'
pleroma_api_controller.ex: Improve conversations error reporting
See merge request pleroma/pleroma!2264
projects / akkoma / log