lain [Fri, 31 Jul 2020 14:43:33 +0000 (14:43 +0000)]
Merge branch 'mrf-silence-2' into 'develop'
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
lain [Fri, 31 Jul 2020 10:29:16 +0000 (10:29 +0000)]
Apply 1 suggestion(s) to 1 file(s)
lain [Fri, 31 Jul 2020 09:11:24 +0000 (09:11 +0000)]
Merge branch 'deactivate-gun-again' into 'develop'
Config: Default to Hackney again
See merge request pleroma/pleroma!2821
lain [Fri, 31 Jul 2020 08:50:45 +0000 (10:50 +0200)]
Config: Default to Hackney again
Gun is still acting up.
lain [Fri, 31 Jul 2020 07:57:30 +0000 (09:57 +0200)]
SimplePolicy: Fix problem with DM leaks.
feld [Thu, 30 Jul 2020 21:25:30 +0000 (21:25 +0000)]
Merge branch 'chore/fix-docs-typo' into 'develop'
Fix example json response
See merge request pleroma/pleroma!2819
Mark Felder [Thu, 30 Jul 2020 20:57:41 +0000 (15:57 -0500)]
Fix example json response
feld [Thu, 30 Jul 2020 20:28:28 +0000 (20:28 +0000)]
Merge branch 'fix/configdb-otp-instructions' into 'develop'
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
See merge request pleroma/pleroma!2817
Haelwenn [Thu, 30 Jul 2020 20:08:03 +0000 (20:08 +0000)]
Merge branch 'render-preview-cards-in-chats' into 'develop'
Render preview cards in chats
See merge request pleroma/pleroma!2816
Haelwenn [Thu, 30 Jul 2020 20:01:04 +0000 (20:01 +0000)]
Merge branch '1993-confirm-users-on-registration' into 'develop'
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
Mark Felder [Thu, 30 Jul 2020 18:04:49 +0000 (13:04 -0500)]
Merge branch 'develop' into fix/configdb-otp-instructions
lain [Thu, 30 Jul 2020 17:57:45 +0000 (19:57 +0200)]
ChatMessage schema: Add preview cards.
lain [Thu, 30 Jul 2020 17:57:26 +0000 (19:57 +0200)]
ChatMessageReferenceView: Display preview cards.
Mark Felder [Thu, 30 Jul 2020 17:37:56 +0000 (12:37 -0500)]
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
feld [Thu, 30 Jul 2020 17:29:31 +0000 (17:29 +0000)]
Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'
Attempt to fix markdown formatting
See merge request pleroma/pleroma!2815
Mark Felder [Thu, 30 Jul 2020 17:01:46 +0000 (12:01 -0500)]
Attempt to fix markdown formatting
lain [Thu, 30 Jul 2020 12:41:47 +0000 (12:41 +0000)]
Merge branch 'hide-reactions' into 'develop'
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
lain [Thu, 30 Jul 2020 12:29:00 +0000 (14:29 +0200)]
SimplePolicyTest: Add test for leaking DMs.
lain [Thu, 30 Jul 2020 08:41:46 +0000 (08:41 +0000)]
Merge branch 'feature/captcha-expose-timeout' into 'develop'
Expose seconds_valid in Pleroma Captcha API endpoint
Closes #1954
See merge request pleroma/pleroma!2812
lain [Thu, 30 Jul 2020 08:00:07 +0000 (08:00 +0000)]
Apply 1 suggestion(s) to 1 file(s)
lain [Thu, 30 Jul 2020 07:57:26 +0000 (07:57 +0000)]
Merge branch 'issue/1933-update-dependency' into 'develop'
[#1933] update dependency
See merge request pleroma/pleroma!2813
Maksim Pechnikov [Thu, 30 Jul 2020 06:23:35 +0000 (09:23 +0300)]
set versions
Maksim Pechnikov [Thu, 30 Jul 2020 06:12:42 +0000 (09:12 +0300)]
updated `cors_plug`
Maksim Pechnikov [Thu, 30 Jul 2020 06:08:50 +0000 (09:08 +0300)]
set `postgrex` version
Maksim Pechnikov [Thu, 30 Jul 2020 06:08:03 +0000 (09:08 +0300)]
set `web_push_encryption` version
Maksim Pechnikov [Thu, 30 Jul 2020 05:58:19 +0000 (08:58 +0300)]
updated `calendar` package
Maksim Pechnikov [Thu, 30 Jul 2020 05:52:13 +0000 (08:52 +0300)]
Merge branch 'develop' into issue/1933-update-dependency
Mark Felder [Wed, 29 Jul 2020 21:07:22 +0000 (16:07 -0500)]
Expose seconds_valid in Pleroma Captcha API endpoint
Alex Gleason [Wed, 29 Jul 2020 18:01:16 +0000 (13:01 -0500)]
Merge remote-tracking branch 'upstream/develop' into mrf-silence
Alex Gleason [Wed, 29 Jul 2020 17:58:08 +0000 (12:58 -0500)]
SimpleMRF: :silence --> :followers_only
Alex Gleason [Wed, 29 Jul 2020 17:50:11 +0000 (12:50 -0500)]
:show_reactions, refactor the other test
Alex Gleason [Wed, 29 Jul 2020 17:45:32 +0000 (12:45 -0500)]
:show_reactions, add CHANGELOG.md, refactor test
Alex Gleason [Wed, 29 Jul 2020 17:43:39 +0000 (12:43 -0500)]
Merge remote-tracking branch 'upstream/develop' into hide-reactions
lain [Wed, 29 Jul 2020 13:45:15 +0000 (13:45 +0000)]
Merge branch 'issue/1023' into 'develop'
[#1023] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
lain [Wed, 29 Jul 2020 12:42:09 +0000 (14:42 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
Haelwenn [Wed, 29 Jul 2020 12:20:04 +0000 (12:20 +0000)]
Merge branch '1996-dont-break-on-chatmessages' into 'develop'
EnsureRePrepended: Don't break on chat messages.
Closes #1996
See merge request pleroma/pleroma!2808
lain [Wed, 29 Jul 2020 12:16:20 +0000 (12:16 +0000)]
Merge branch 'bugfix/remote-user-atom' into 'develop'
feed/user_controller: Return 404 when the user is remote
Closes #1911
See merge request pleroma/pleroma!2811
Haelwenn (lanodan) Monnier [Wed, 29 Jul 2020 12:02:02 +0000 (14:02 +0200)]
feed/user_controller: Return 404 when the user is remote
lain [Wed, 29 Jul 2020 11:27:26 +0000 (11:27 +0000)]
Merge branch 'by-approval' into 'develop'
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
lain [Wed, 29 Jul 2020 09:47:03 +0000 (11:47 +0200)]
AccountController: Don't explicitly ask to keep users unconfirmed.
Confirmation is set in User.register_changeset based on the config
settings.
lain [Wed, 29 Jul 2020 08:53:08 +0000 (10:53 +0200)]
EnsureRePrepended: Don't break on chat messages.
Maksim Pechnikov [Wed, 29 Jul 2020 06:22:49 +0000 (09:22 +0300)]
update mogrify package
Maksim Pechnikov [Wed, 29 Jul 2020 04:23:06 +0000 (07:23 +0300)]
set http_signatures version
Maksim Pechnikov [Wed, 29 Jul 2020 04:13:59 +0000 (07:13 +0300)]
set `jason` version
Maksim Pechnikov [Wed, 29 Jul 2020 04:02:36 +0000 (07:02 +0300)]
updated `pot` package
Maksim Pechnikov [Wed, 29 Jul 2020 03:55:44 +0000 (06:55 +0300)]
updated the minor version packages
Maksim Pechnikov [Wed, 29 Jul 2020 03:50:00 +0000 (06:50 +0300)]
set swoosh version
Maksim Pechnikov [Wed, 29 Jul 2020 03:45:08 +0000 (06:45 +0300)]
updated dev & test packages
Alex Gleason [Wed, 29 Jul 2020 01:17:18 +0000 (20:17 -0500)]
SimpleMRF silence: optimize, work okay with nil values in addressing
Alex Gleason [Tue, 28 Jul 2020 23:55:29 +0000 (18:55 -0500)]
SimpleMRF: Let instances be silenced
rinpatch [Tue, 28 Jul 2020 21:16:45 +0000 (21:16 +0000)]
Merge branch 'fix/gun-pool-missing-cast' into 'develop'
gun ConnectionPool: Re-add a missing cast for remove_client
See merge request pleroma/pleroma!2805
rinpatch [Tue, 28 Jul 2020 20:48:41 +0000 (23:48 +0300)]
gun ConnectionPool: Re-add a missing cast for remove_client
Alex Gleason [Tue, 28 Jul 2020 19:49:49 +0000 (14:49 -0500)]
Let favourites and emoji reactions optionally be hidden
rinpatch [Tue, 28 Jul 2020 19:13:54 +0000 (19:13 +0000)]
Merge branch 'gun-replace-cast-with-call' into 'develop'
gun ConnectionPool: replace casts with calls
See merge request pleroma/pleroma!2803
rinpatch [Tue, 28 Jul 2020 17:49:48 +0000 (20:49 +0300)]
gun ConnectionPool: replace casts with calls
The slowdown from this is most likely immesurable, however it eliminates
possible false positives when tracking dead clients.
lain [Tue, 28 Jul 2020 17:32:18 +0000 (17:32 +0000)]
Merge branch 'chore/frontends-config-clarification' into 'develop'
Clarify location of frontends directory
See merge request pleroma/pleroma!2802
Mark Felder [Tue, 28 Jul 2020 17:10:04 +0000 (12:10 -0500)]
Clarify location of frontends directory
lain [Tue, 28 Jul 2020 16:45:21 +0000 (16:45 +0000)]
Merge branch 'frontend-bundles-redux' into 'develop'
Changeable frontends MVP
See merge request pleroma/pleroma!2801
lain [Tue, 28 Jul 2020 15:50:32 +0000 (17:50 +0200)]
Cheatsheet: Add even more info.
lain [Tue, 28 Jul 2020 15:48:35 +0000 (17:48 +0200)]
Cheatsheet: Add more info.
lain [Tue, 28 Jul 2020 15:46:37 +0000 (17:46 +0200)]
Docs: Add frontend info to cheat sheet.
Roman Chvanikov [Tue, 28 Jul 2020 15:40:21 +0000 (17:40 +0200)]
Add description for configuration.
lain [Tue, 28 Jul 2020 15:35:16 +0000 (17:35 +0200)]
FrontendStatic: Add plug to serve frontends based on configuration.
lain [Tue, 28 Jul 2020 13:44:47 +0000 (15:44 +0200)]
InstanceStatic: Refactor.
lain [Tue, 28 Jul 2020 08:40:20 +0000 (08:40 +0000)]
Merge branch 'issue/1986-earmark' into 'develop'
[#1986] locked the earmark version
See merge request pleroma/pleroma!2800
lain [Tue, 28 Jul 2020 07:41:44 +0000 (07:41 +0000)]
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
masto_fe_view: Remove @default_settings
See merge request pleroma/pleroma!2799
Maksim Pechnikov [Tue, 28 Jul 2020 04:00:02 +0000 (07:00 +0300)]
locked earmark version
Alex Gleason [Tue, 28 Jul 2020 01:36:31 +0000 (20:36 -0500)]
Fix User.registration_reason HTML sanitizing issues
Alex Gleason [Tue, 28 Jul 2020 00:19:14 +0000 (19:19 -0500)]
Lint, fix test
Haelwenn [Mon, 27 Jul 2020 21:20:52 +0000 (21:20 +0000)]
Merge branch 'embedded-object-federation' into 'develop'
Embedded object federation
Closes #1959
See merge request pleroma/pleroma!2794
Alex Gleason [Mon, 27 Jul 2020 20:24:20 +0000 (15:24 -0500)]
Add :registration_reason_length to description.exs
Alex Gleason [Mon, 27 Jul 2020 20:13:34 +0000 (15:13 -0500)]
Add configurable registration_reason limit
Alex Gleason [Mon, 27 Jul 2020 17:29:18 +0000 (12:29 -0500)]
Merge remote-tracking branch 'upstream/develop' into by-approval
lain [Mon, 27 Jul 2020 16:35:47 +0000 (16:35 +0000)]
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
Haelwenn (lanodan) Monnier [Mon, 27 Jul 2020 15:59:13 +0000 (17:59 +0200)]
masto_fe_view: Remove @default_settings
lain [Mon, 27 Jul 2020 14:39:50 +0000 (16:39 +0200)]
Pipeline: Unify embedded_object / object_data, move to validator.
lain [Mon, 27 Jul 2020 14:19:45 +0000 (16:19 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
lain [Mon, 27 Jul 2020 12:34:36 +0000 (12:34 +0000)]
Merge branch 'issue/1934-welcome-email' into 'develop'
[#1934] welcome email
See merge request pleroma/pleroma!2786
lain [Mon, 27 Jul 2020 12:24:41 +0000 (12:24 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Haelwenn [Mon, 27 Jul 2020 08:20:46 +0000 (08:20 +0000)]
Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'
ReverseProxy: Fix a gun connection leak when there is an error with no body
See merge request pleroma/pleroma!2798
Haelwenn [Mon, 27 Jul 2020 08:11:07 +0000 (08:11 +0000)]
Merge branch 'fix/update-types-in-link-formatter' into 'develop'
Update types in Pleroma.Formatter group in description.exs
See merge request pleroma/pleroma!2796
Alex Gleason [Sun, 26 Jul 2020 20:46:14 +0000 (15:46 -0500)]
Merge remote-tracking branch 'upstream/develop' into by-approval
rinpatch [Sun, 26 Jul 2020 17:44:26 +0000 (20:44 +0300)]
ReverseProxy tesla client: remove handling of old_conn
This is no longer relevant because we use a custom
FollowRedirects middleware now
rinpatch [Sun, 26 Jul 2020 16:38:57 +0000 (16:38 +0000)]
Merge branch 'patch-3' into 'develop'
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
See merge request pleroma/pleroma!2797
rinpatch [Sun, 26 Jul 2020 16:18:21 +0000 (19:18 +0300)]
ReverseProxy: Fix a gun connection leak when there is an error with no
body
- Modify `close/1` function to do the same thing it does for hackney,
which is - close the client rather than the whole connection
- Release the connection when there is no body to chunk
Alibek Omarov [Sun, 26 Jul 2020 13:59:46 +0000 (13:59 +0000)]
OpenAPI: remove accidentally pasted buffer data
Alibek Omarov [Sun, 26 Jul 2020 13:54:56 +0000 (13:54 +0000)]
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
lain [Sun, 26 Jul 2020 11:47:18 +0000 (11:47 +0000)]
Merge branch 'fix/mix-tasks' into 'develop'
Fix/mix tasks
Closes #1972 and #1970
See merge request pleroma/pleroma!2795
Angelina Filippova [Sat, 25 Jul 2020 22:48:50 +0000 (01:48 +0300)]
Update types in Pleroma.Formatter group
Maksim Pechnikov [Sat, 25 Jul 2020 04:09:09 +0000 (07:09 +0300)]
added migrate old settings to new
Mark Felder [Fri, 24 Jul 2020 17:06:56 +0000 (12:06 -0500)]
Ensure Oban is available during mix tasks.
Fixes: mix pleroma.user rm username
Mark Felder [Fri, 24 Jul 2020 17:05:42 +0000 (12:05 -0500)]
Fix mix tasks that make HTTP calls by starting the Gun connection pool
Lain Soykaf [Fri, 24 Jul 2020 12:54:13 +0000 (14:54 +0200)]
CommonAPI Tests: Check that undoing objects federates them as embeds.
Lain Soykaf [Fri, 24 Jul 2020 12:40:22 +0000 (14:40 +0200)]
Side Effects: On undoing, put information about the undone object.
Lain Soykaf [Fri, 24 Jul 2020 12:06:41 +0000 (14:06 +0200)]
Pipeline: Add embedded object federation.
Maksim Pechnikov [Fri, 24 Jul 2020 05:35:06 +0000 (08:35 +0300)]
remove duplicate module
feld [Thu, 23 Jul 2020 20:06:11 +0000 (20:06 +0000)]
Merge branch 'unblock-domain-via-query' into 'develop'
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
Mark Felder [Thu, 23 Jul 2020 17:59:40 +0000 (12:59 -0500)]
Support blocking via query parameters as well and document the change.
feld [Thu, 23 Jul 2020 17:23:18 +0000 (17:23 +0000)]
Merge branch 'feature/add-mrf-related-policies' into 'develop'
Add MRF related policies field to description.exs
See merge request pleroma/pleroma!2790
Haelwenn [Thu, 23 Jul 2020 16:58:36 +0000 (16:58 +0000)]
Merge branch '1976-status-view-fixes' into 'develop'
StatusView: Handle badly formatted emoji reactions.
Closes #1976
See merge request pleroma/pleroma!2788
projects / akkoma / log