Alexander Strizhakov [Fri, 17 Jan 2020 13:28:44 +0000 (16:28 +0300)]
some clean up
Alexander Strizhakov [Fri, 17 Jan 2020 12:13:24 +0000 (15:13 +0300)]
revert non needable
Alexander Strizhakov [Fri, 17 Jan 2020 12:06:42 +0000 (15:06 +0300)]
configure only console backend
Alexander Strizhakov [Fri, 17 Jan 2020 12:00:20 +0000 (15:00 +0300)]
compile fix
Alexander Strizhakov [Fri, 17 Jan 2020 08:54:22 +0000 (11:54 +0300)]
fix for config loader
Alexander Strizhakov [Fri, 17 Jan 2020 08:45:44 +0000 (11:45 +0300)]
saving to DB only added by user settings
Alexander Strizhakov [Thu, 16 Jan 2020 05:50:27 +0000 (08:50 +0300)]
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
Alexander Strizhakov [Wed, 15 Jan 2020 14:10:33 +0000 (17:10 +0300)]
little cleanup
Alexander Strizhakov [Wed, 15 Jan 2020 14:08:45 +0000 (17:08 +0300)]
don't migrate Pleroma.Web.EndPoint settings
don't set Logger level to all tasks
Alexander Strizhakov [Tue, 14 Jan 2020 16:56:33 +0000 (19:56 +0300)]
Merge branch 'develop' into admin-be
lain [Tue, 14 Jan 2020 16:11:36 +0000 (16:11 +0000)]
Merge branch 'warnings-fix' into 'develop'
compilation warnings fix
See merge request pleroma/pleroma!2102
Alexander Strizhakov [Tue, 14 Jan 2020 12:49:52 +0000 (15:49 +0300)]
compilation warnings fix
Alexander Strizhakov [Tue, 14 Jan 2020 12:00:38 +0000 (15:00 +0300)]
short labels and fixes for typos
Alexander Strizhakov [Tue, 14 Jan 2020 11:52:00 +0000 (14:52 +0300)]
Merge branch 'develop' into admin-be
lain [Mon, 13 Jan 2020 15:25:41 +0000 (15:25 +0000)]
Merge branch 'feature/ci-registry' into 'develop'
Update Dockerfile with labels. Update gitlab-ci for registry usage
See merge request pleroma/pleroma!2098
feld [Sun, 12 Jan 2020 18:48:59 +0000 (18:48 +0000)]
Merge branch 'feature/attachments-cleanup' into 'develop'
Delete attachments when status is deleted
See merge request pleroma/pleroma!2036
Roman Chvanikov [Sun, 12 Jan 2020 18:48:58 +0000 (18:48 +0000)]
Delete attachments when status is deleted
feld [Sun, 12 Jan 2020 18:37:52 +0000 (18:37 +0000)]
Merge branch 'updated-at-on-conversation-read' into 'develop'
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
feld [Sun, 12 Jan 2020 18:31:10 +0000 (18:31 +0000)]
Merge branch 'config/benchmark' into 'develop'
Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057
feld [Sun, 12 Jan 2020 18:20:31 +0000 (18:20 +0000)]
Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow
See merge request pleroma/pleroma!2079
Mark Felder [Sun, 12 Jan 2020 18:14:09 +0000 (12:14 -0600)]
Assign token that can write to follows
Mark Felder [Sun, 12 Jan 2020 18:12:15 +0000 (12:12 -0600)]
Merge branch 'develop' into issue/1354
feld [Sun, 12 Jan 2020 17:25:25 +0000 (17:25 +0000)]
Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
rinpatch [Sat, 11 Jan 2020 17:38:12 +0000 (17:38 +0000)]
Merge branch 'patch-1' into 'develop'
docs: API: update Mastodon API link
See merge request pleroma/pleroma!2100
rinpatch [Sat, 11 Jan 2020 17:19:54 +0000 (17:19 +0000)]
Merge branch 'remove/remove-mdii-uploader' into 'develop'
Remove MDII uploader
See merge request pleroma/pleroma!2099
Hakaba Hitoyo [Sat, 11 Jan 2020 17:19:54 +0000 (17:19 +0000)]
Remove MDII uploader
Alexander Strizhakov [Sat, 11 Jan 2020 09:15:42 +0000 (12:15 +0300)]
Merge branch 'develop' into admin-be
Alibek Omarov [Sat, 11 Jan 2020 05:06:40 +0000 (05:06 +0000)]
docs: API: update Mastodon API link
jp [Fri, 10 Jan 2020 19:09:14 +0000 (14:09 -0500)]
Update Dockerfile with labels. Update gitlab-ci for registry usage
Alexander Strizhakov [Fri, 10 Jan 2020 18:24:06 +0000 (21:24 +0300)]
don't migrate prometheus settings
Alexander Strizhakov [Fri, 10 Jan 2020 16:49:40 +0000 (19:49 +0300)]
more renamings
Alexander Strizhakov [Fri, 10 Jan 2020 16:44:30 +0000 (19:44 +0300)]
don't migrate configurable_from_database setting
Alexander Strizhakov [Fri, 10 Jan 2020 16:34:19 +0000 (19:34 +0300)]
dynamic_configuration renaming
and moving it from instance settings
Alexander Strizhakov [Fri, 10 Jan 2020 15:18:09 +0000 (18:18 +0300)]
fix for pleroma assets group update
Alexander Strizhakov [Fri, 10 Jan 2020 14:54:54 +0000 (17:54 +0300)]
syncing new setting to descriptions.exs
lain [Fri, 10 Jan 2020 13:14:20 +0000 (13:14 +0000)]
Merge branch 'issue/1490' into 'develop'
[#1490] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
lain [Fri, 10 Jan 2020 13:07:20 +0000 (13:07 +0000)]
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework
See merge request pleroma/pleroma!2068
Alexander Strizhakov [Fri, 10 Jan 2020 12:38:53 +0000 (15:38 +0300)]
Update AdminFE build
Alexander Strizhakov [Mon, 6 Jan 2020 11:05:32 +0000 (14:05 +0300)]
deep merge in config update
Alexander [Thu, 26 Dec 2019 07:05:30 +0000 (10:05 +0300)]
flag for delete fix
Alexander [Wed, 25 Dec 2019 12:31:51 +0000 (15:31 +0300)]
little fixes and typos fix
Alexander [Sat, 21 Dec 2019 10:54:22 +0000 (13:54 +0300)]
fixes for logger backends
Alexander [Fri, 20 Dec 2019 07:22:53 +0000 (10:22 +0300)]
fix for subgroup tuple
added settings for swoosh adapters local
Alexander [Thu, 19 Dec 2019 07:19:56 +0000 (10:19 +0300)]
logger backends fix
Alexander [Tue, 17 Dec 2019 16:51:01 +0000 (19:51 +0300)]
parsing proxy url setting
Alexander [Mon, 16 Dec 2019 15:13:22 +0000 (18:13 +0300)]
suggestions fix
Alexander [Thu, 12 Dec 2019 13:44:24 +0000 (16:44 +0300)]
typo fix
Alexander [Tue, 10 Dec 2019 09:16:19 +0000 (12:16 +0300)]
adapter children
Alexander [Tue, 10 Dec 2019 09:00:40 +0000 (12:00 +0300)]
fix for endpoints after env update
Alexander [Tue, 10 Dec 2019 06:54:10 +0000 (09:54 +0300)]
test fixes after rebase
Alexander [Fri, 6 Dec 2019 14:50:53 +0000 (17:50 +0300)]
errors on endpoints
Alexander [Fri, 6 Dec 2019 12:12:56 +0000 (15:12 +0300)]
partially settings update
Alexander [Fri, 6 Dec 2019 05:21:30 +0000 (08:21 +0300)]
tests for setttings without an explicit key
Alex S [Sun, 29 Sep 2019 08:17:38 +0000 (11:17 +0300)]
config editing through database
lain [Fri, 10 Jan 2020 11:09:07 +0000 (11:09 +0000)]
Merge branch 'fix/captcha-time' into 'develop'
Fix captcha time, which was meant to be 5 minutes
See merge request pleroma/pleroma!2094
Mark Felder [Thu, 9 Jan 2020 21:45:46 +0000 (15:45 -0600)]
Fix captcha time, which was meant to be 5 minutes
feld [Thu, 9 Jan 2020 18:35:17 +0000 (18:35 +0000)]
Merge branch 'update/adminfe-
20201019' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2093
Mark Felder [Thu, 9 Jan 2020 16:00:15 +0000 (10:00 -0600)]
Update AdminFE build
Maksim Pechnikov [Wed, 8 Jan 2020 13:40:38 +0000 (16:40 +0300)]
fix create service actor
rinpatch [Tue, 7 Jan 2020 11:43:22 +0000 (11:43 +0000)]
Merge branch 'bugfix/smtp-config-examples' into 'develop'
Fix SMTP mailer example
See merge request pleroma/pleroma!2091
lain [Mon, 6 Jan 2020 14:10:07 +0000 (14:10 +0000)]
Update CHANGELOG.md
RX14 [Sun, 5 Jan 2020 19:00:48 +0000 (19:00 +0000)]
Fix SMTP mailer example
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
eugenijm [Fri, 20 Dec 2019 13:38:21 +0000 (16:38 +0300)]
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
Maksim Pechnikov [Fri, 3 Jan 2020 13:21:52 +0000 (16:21 +0300)]
fixed Metadata.Utils.scrub_html_and_truncate
Ivan Tashkinov [Thu, 2 Jan 2020 10:03:33 +0000 (13:03 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
rinpatch [Sat, 28 Dec 2019 12:57:21 +0000 (12:57 +0000)]
Merge branch 'update-captcha' into 'develop'
Update `captcha` dependency
Closes #1492
See merge request pleroma/pleroma!2088
Egor Kislitsyn [Sat, 28 Dec 2019 12:48:54 +0000 (19:48 +0700)]
Update `captcha` dependency
Maksim Pechnikov [Wed, 25 Dec 2019 12:12:43 +0000 (15:12 +0300)]
added code of mr#2067
Haelwenn [Tue, 24 Dec 2019 19:57:41 +0000 (19:57 +0000)]
Merge branch 'feat/doc-improvements' into 'develop'
Documentation imrpovements
See merge request pleroma/pleroma!2084
lain [Mon, 23 Dec 2019 16:31:15 +0000 (16:31 +0000)]
Merge branch 'increase-captcha-expiry-time' into 'develop'
Increase CAPTCHA expiration time to 5 minutes
Closes #1491
See merge request pleroma/pleroma!2086
Egor Kislitsyn [Mon, 23 Dec 2019 08:14:46 +0000 (15:14 +0700)]
Increase CAPTCHA expiration time to 5 minutes
Maksim Pechnikov [Sun, 22 Dec 2019 18:17:19 +0000 (21:17 +0300)]
update test
Maksim [Sun, 22 Dec 2019 17:58:54 +0000 (17:58 +0000)]
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
Maksim [Sun, 22 Dec 2019 17:58:45 +0000 (17:58 +0000)]
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
Maksim Pechnikov [Fri, 20 Dec 2019 13:34:14 +0000 (16:34 +0300)]
moved remote follow in separate controller
rinpatch [Sat, 21 Dec 2019 11:56:24 +0000 (11:56 +0000)]
Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
rinpatch [Sat, 21 Dec 2019 11:49:35 +0000 (11:49 +0000)]
Merge branch 'revert-
a54aa5af' into 'develop'
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
Closes #1488
See merge request pleroma/pleroma!2083
Maxim Filippov [Sat, 21 Dec 2019 11:41:19 +0000 (11:41 +0000)]
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
feld [Fri, 20 Dec 2019 22:40:52 +0000 (22:40 +0000)]
Merge branch 'fix/twitter-card-without-attachments' into 'develop'
Posts without media attachments should get the Summary TwitterCard
See merge request pleroma/pleroma!2082
Mark Felder [Fri, 20 Dec 2019 22:32:04 +0000 (16:32 -0600)]
Posts without media attachments should get the Summary TwitterCard
feld [Fri, 20 Dec 2019 16:30:26 +0000 (16:30 +0000)]
Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
feld [Fri, 20 Dec 2019 16:30:00 +0000 (16:30 +0000)]
Merge branch 'fix/remote-user-no-follower-counter' into 'develop'
Do not crash when remote user follower and following counters are hidden
See merge request pleroma/pleroma!2077
Maksim Pechnikov [Fri, 20 Dec 2019 13:33:44 +0000 (16:33 +0300)]
fixed remote follow
Haelwenn [Fri, 20 Dec 2019 13:24:24 +0000 (13:24 +0000)]
Merge branch 'remove-outdated-doc' into 'develop'
Remove `/api/account/register` documentation from pleroma_api.md
Closes #1486
See merge request pleroma/pleroma!2078
Egor Kislitsyn [Fri, 20 Dec 2019 12:47:44 +0000 (19:47 +0700)]
Remove `/api/account/register` documentation from pleroma_api.md
Mark Felder [Thu, 19 Dec 2019 18:16:53 +0000 (12:16 -0600)]
Instead allow a dedicated benchmark config
Mark Felder [Thu, 19 Dec 2019 18:16:33 +0000 (12:16 -0600)]
Merge branch 'develop' into config/benchmark
Maxim Filippov [Thu, 19 Dec 2019 16:52:55 +0000 (19:52 +0300)]
Fix all count
Maxim Filippov [Thu, 19 Dec 2019 16:47:36 +0000 (19:47 +0300)]
Expose issue via failing test
Ivan Tashkinov [Thu, 19 Dec 2019 14:24:08 +0000 (17:24 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
Ivan Tashkinov [Thu, 19 Dec 2019 14:23:27 +0000 (17:23 +0300)]
[#2068] Introduced proper OAuth tokens usage to controller tests.
Egor Kislitsyn [Thu, 19 Dec 2019 12:25:23 +0000 (19:25 +0700)]
Do not crash when remote user follower and following counters are hidden
Maxim Filippov [Wed, 18 Dec 2019 20:11:42 +0000 (23:11 +0300)]
Stats: return status counts by scope
rinpatch [Tue, 17 Dec 2019 15:31:10 +0000 (15:31 +0000)]
Merge branch 'feature/add-event-support' into 'develop'
Add ActivityPub Object Event type support
See merge request pleroma/pleroma!2075
rinpatch [Tue, 17 Dec 2019 15:29:38 +0000 (15:29 +0000)]
Merge branch 'ci/rum-testing-no-recompilation' into 'develop'
CI: Add a cache policy for test jobs and fix rum tests recompiling everything
See merge request pleroma/pleroma!2074
rinpatch [Tue, 17 Dec 2019 15:24:16 +0000 (18:24 +0300)]
CI: Add a cache policy for test jobs and fix rum tests recompiling
everything
Thomas Citharel [Tue, 17 Dec 2019 15:16:21 +0000 (16:16 +0100)]
Add ActivityPub Object Event type support
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Haelwenn [Tue, 17 Dec 2019 06:43:15 +0000 (06:43 +0000)]
Merge branch 'hide-followers-count' into 'develop'
Hide follower counter when hiding is activated
Closes #1450
See merge request pleroma/pleroma!2072
Egor Kislitsyn [Tue, 17 Dec 2019 06:34:07 +0000 (13:34 +0700)]
Hide follower counter when hiding is activated
lain [Mon, 16 Dec 2019 17:07:13 +0000 (17:07 +0000)]
Merge branch 'fix/remove-useless-sleep' into 'develop'
Remove useless sleeping/reduce it
See merge request pleroma/pleroma!2069
projects / akkoma / log