lain [Tue, 4 Aug 2020 13:10:36 +0000 (15:10 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
lain [Tue, 4 Aug 2020 11:00:30 +0000 (11:00 +0000)]
Merge branch 'email-blacklist' into 'develop'
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
lain [Tue, 4 Aug 2020 10:49:56 +0000 (12:49 +0200)]
Changelog: Add info about email blacklist
Alex Gleason [Tue, 4 Aug 2020 03:20:49 +0000 (22:20 -0500)]
Email blacklist: Update phrasing again
Alex Gleason [Tue, 4 Aug 2020 00:57:53 +0000 (19:57 -0500)]
Email blacklist: Update response phrasing
lain [Mon, 3 Aug 2020 21:01:56 +0000 (21:01 +0000)]
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
Ilja [Mon, 3 Aug 2020 18:13:43 +0000 (20:13 +0200)]
Improved WelcomeChatMessageTest
* Checks if message is the same using ==/2 instead of =~/2
Ilja [Mon, 3 Aug 2020 16:44:56 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
lain [Mon, 3 Aug 2020 16:23:26 +0000 (18:23 +0200)]
Changelog: Update with frontend mix task.
lain [Mon, 3 Aug 2020 15:50:53 +0000 (17:50 +0200)]
Docs: Add info about installing from a local path.
lain [Mon, 3 Aug 2020 15:44:59 +0000 (17:44 +0200)]
Docs: Document installation of frontends
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
lain [Mon, 3 Aug 2020 14:39:01 +0000 (16:39 +0200)]
Description: Add new fields for frontend configuration.
lain [Mon, 3 Aug 2020 14:22:11 +0000 (14:22 +0000)]
Merge branch 'follower-mrf-again' into 'develop'
Follower mrf again
See merge request pleroma/pleroma!2833
lain [Mon, 3 Aug 2020 13:00:14 +0000 (15:00 +0200)]
AccountControllerTest: Add test for message returned.
lain [Mon, 3 Aug 2020 12:50:29 +0000 (12:50 +0000)]
Merge branch 'config/default_ok_oldage' into 'develop'
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
lain [Mon, 3 Aug 2020 12:50:10 +0000 (12:50 +0000)]
Merge branch 'object-age-fix' into 'develop'
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
lain [Mon, 3 Aug 2020 12:12:32 +0000 (14:12 +0200)]
MRF Object Age Policy: Don't break on messages without cc/to
lain [Mon, 3 Aug 2020 11:37:55 +0000 (11:37 +0000)]
Merge branch 'indigenous-client' into 'develop'
Add indigenous to clients
See merge request pleroma/pleroma!2835
lain [Mon, 3 Aug 2020 09:55:56 +0000 (09:55 +0000)]
Merge branch 'reportnote-test' into 'develop'
ReportNote test
Closes #2014
See merge request pleroma/pleroma!2839
Alex Gleason [Sun, 2 Aug 2020 21:37:33 +0000 (16:37 -0500)]
Add ReportNote test
Alex Gleason [Sun, 2 Aug 2020 21:36:55 +0000 (16:36 -0500)]
Factory: Add report_activity_factory
Alex Gleason [Sun, 2 Aug 2020 19:53:42 +0000 (14:53 -0500)]
Add email blacklist, fixes #1404
swentel [Sun, 2 Aug 2020 17:33:22 +0000 (19:33 +0200)]
Add indigenous to clients
Ilja [Sun, 2 Aug 2020 13:54:59 +0000 (15:54 +0200)]
Add welcome chatmessages
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
Alex Gleason [Sat, 1 Aug 2020 21:08:29 +0000 (16:08 -0500)]
SimpleMRF: Add missing :followers_only to config.exs
lain [Sat, 1 Aug 2020 15:58:17 +0000 (15:58 +0000)]
Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'
[#1985] Prevented force login on registration if account approval and/or email confirmation needed
Closes #1985
See merge request pleroma/pleroma!2823
rinpatch [Sat, 1 Aug 2020 15:17:41 +0000 (15:17 +0000)]
Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'
ConnectionPool: fix gun open errors being returned without an error tuple
Closes #2008
See merge request pleroma/pleroma!2832
rinpatch [Sat, 1 Aug 2020 14:59:50 +0000 (17:59 +0300)]
ConnectionPool: fix gun open errors being returned without an error tuple
When gun shuts down due to the host being unreachable, the worker
process shuts down with the same shutdown reason since they are linked.
Gun doesn't have error tuples in it's shutdown reason though, so we need
to handle it in get_conn.
Closes #2008
rinpatch [Sat, 1 Aug 2020 10:49:35 +0000 (10:49 +0000)]
Merge branch 'fix/gun-limiter' into 'develop'
Fix ConnecitonPool deadlocking after reaching the connection limit
Closes #1977
See merge request pleroma/pleroma!2830
rinpatch [Sat, 1 Aug 2020 09:16:06 +0000 (12:16 +0300)]
Fix ConnecitonPool deadlocking after reaching the connection limit
The issue was with ConcurrentLimiter not decrementing counters on
overload. It was fixed in the latest commit, but concurrentlimiter
version wasn't updated in Pleroma for some reason.
Closes #1977
rinpatch [Sat, 1 Aug 2020 07:25:32 +0000 (07:25 +0000)]
Merge branch 'fix/user-agent-overriding' into 'develop'
Don't override user-agent header if it's been set
Closes #1923
See merge request pleroma/pleroma!2829
Roman Chvanikov [Sat, 1 Aug 2020 07:04:25 +0000 (10:04 +0300)]
Don't override user-agent header if it's been set
lain [Fri, 31 Jul 2020 15:58:50 +0000 (17:58 +0200)]
Frontend mix task: Support installation from local file.
lain [Fri, 31 Jul 2020 15:18:04 +0000 (15:18 +0000)]
Revert "Merge branch 'revert-
1ac0969c' into 'develop'"
This reverts merge request !2825
lain [Fri, 31 Jul 2020 15:17:33 +0000 (15:17 +0000)]
Merge branch 'revert-
1ac0969c' into 'develop'
Revert "Merge branch 'mrf-silence-2' into 'develop'"
See merge request pleroma/pleroma!2825
lain [Fri, 31 Jul 2020 15:17:09 +0000 (15:17 +0000)]
Revert "Merge branch 'mrf-silence-2' into 'develop'"
This reverts merge request !2820
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
Ivan Tashkinov [Fri, 31 Jul 2020 11:13:38 +0000 (14:13 +0300)]
[#1985] Prevented force login on registration if account approval and/or email confirmation needed.
Refactored login code in OAuthController, reused in AccountController. Added tests.
lain [Fri, 31 Jul 2020 10:29:16 +0000 (10:29 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Haelwenn (lanodan) Monnier [Thu, 30 Jul 2020 16:49:48 +0000 (18:49 +0200)]
Default MRF to ObjectAgePolicy, 7 days threshold
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 12:17:58 +0000 (14:17 +0200)]
Config: Add kenoma as available frontend.
lain [Thu, 30 Jul 2020 12:14:58 +0000 (14:14 +0200)]
Config: Add frontend information.
lain [Thu, 30 Jul 2020 12:12:41 +0000 (14:12 +0200)]
Mix tasks: Add frontend task to download and install frontends.
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
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 14:27:11 +0000 (16:27 +0200)]
Descriptions: Update with admin frontend info
lain [Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
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 11:09:42 +0000 (13:09 +0200)]
Changelog: Include frontend information.
lain [Wed, 29 Jul 2020 11:06:51 +0000 (13:06 +0200)]
Cheatsheet: Update frontends information.
lain [Wed, 29 Jul 2020 11:04:29 +0000 (13:04 +0200)]
Config: Update frontend config example
lain [Wed, 29 Jul 2020 11:03:04 +0000 (13:03 +0200)]
Endpoint: Serve a dynamically configured admin interface
lain [Wed, 29 Jul 2020 11:02:48 +0000 (13:02 +0200)]
FrontendStatic: Work correctly for other frontend types.
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
projects / akkoma / log