Egor Kislitsyn [Wed, 5 Feb 2020 17:13:56 +0000 (21:13 +0400)]
Remove AutoLinker `scheme` option from the config
rinpatch [Thu, 30 Jan 2020 19:24:04 +0000 (19:24 +0000)]
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
rinpatch [Thu, 30 Jan 2020 19:16:55 +0000 (22:16 +0300)]
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
lain [Thu, 30 Jan 2020 18:47:44 +0000 (18:47 +0000)]
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
lain [Thu, 30 Jan 2020 18:28:28 +0000 (18:28 +0000)]
Apply suggestion to docs/configuration/cheatsheet.md
lain [Thu, 30 Jan 2020 18:27:13 +0000 (18:27 +0000)]
Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop'
Emoji Reactions: Actually use the validation.
See merge request pleroma/pleroma!2166
lain [Thu, 30 Jan 2020 15:26:45 +0000 (16:26 +0100)]
Emoji Reactions: Add fixtures
lain [Thu, 30 Jan 2020 15:07:37 +0000 (16:07 +0100)]
Emoji Reactions: Actually use the validation.
feld [Thu, 30 Jan 2020 14:13:40 +0000 (14:13 +0000)]
Merge branch 'emoji-api-errors' into 'develop'
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
feld [Thu, 30 Jan 2020 14:11:29 +0000 (14:11 +0000)]
Merge branch 'http-security-warning' into 'develop'
Warn if HTTPSecurityPlug is disabled
Closes #1528
See merge request pleroma/pleroma!2155
feld [Thu, 30 Jan 2020 14:09:41 +0000 (14:09 +0000)]
Update emoji_api_controller.ex
feld [Thu, 30 Jan 2020 14:07:41 +0000 (14:07 +0000)]
Update http_security_plug.ex
rinpatch [Thu, 30 Jan 2020 13:24:24 +0000 (13:24 +0000)]
Apply suggestion to docs/configuration/cheatsheet.md
rinpatch [Thu, 30 Jan 2020 13:16:04 +0000 (13:16 +0000)]
Merge branch 'emoji-reactions-reacted' into 'develop'
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
rinpatch [Wed, 29 Jan 2020 20:59:27 +0000 (23:59 +0300)]
RemoteIp: only trust X-Forwarded-For
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
rinpatch [Wed, 29 Jan 2020 20:59:00 +0000 (23:59 +0300)]
cheatsheet: improve rate limiter docs and add new limiters
rinpatch [Wed, 29 Jan 2020 20:58:15 +0000 (23:58 +0300)]
config.exs: Re-enable rate limiter and enable remote ip
Haelwenn [Wed, 29 Jan 2020 20:21:32 +0000 (20:21 +0000)]
Merge branch 'fix-streaming-reblog' into 'develop'
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
lain [Wed, 29 Jan 2020 16:32:06 +0000 (16:32 +0000)]
Merge branch 'changelog-update' into 'develop'
Update confusing changelog message for attachments cleanup
See merge request pleroma/pleroma!2163
Roman Chvanikov [Wed, 29 Jan 2020 15:53:25 +0000 (18:53 +0300)]
Update confusing changelog message for attachments cleanup
Egor Kislitsyn [Wed, 29 Jan 2020 14:53:43 +0000 (18:53 +0400)]
Fix credo warning
Egor Kislitsyn [Wed, 29 Jan 2020 14:43:23 +0000 (18:43 +0400)]
Make the warning more scarier
Alexander Strizhakov [Wed, 29 Jan 2020 10:51:17 +0000 (13:51 +0300)]
emoji api error on not writable dir
lain [Wed, 29 Jan 2020 10:52:24 +0000 (11:52 +0100)]
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
lain [Wed, 29 Jan 2020 10:50:49 +0000 (11:50 +0100)]
Streamer Tests: code readability improvements
lain [Wed, 29 Jan 2020 10:43:36 +0000 (11:43 +0100)]
Emoji Reactions: Correctly handle deleted users
lain [Wed, 29 Jan 2020 10:40:57 +0000 (11:40 +0100)]
Emoji Reactions: Document changes
lain [Wed, 29 Jan 2020 10:39:06 +0000 (11:39 +0100)]
Emoji Reactions: Add `reacted` field to emoji reactions
lain [Wed, 29 Jan 2020 10:07:26 +0000 (10:07 +0000)]
Merge branch 'meta-tags-parser' into 'develop'
Title parsing improvement
See merge request pleroma/pleroma!2159
Alexander Strizhakov [Wed, 29 Jan 2020 08:13:34 +0000 (11:13 +0300)]
title parse improvement
lain [Tue, 28 Jan 2020 17:39:32 +0000 (17:39 +0000)]
Merge branch 'frontend-refresh-
c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop'
Update frontend to
c54111797ae1058e59931b2d1f12e6ab6a6f96a9
See merge request pleroma/pleroma!2158
lain [Tue, 28 Jan 2020 17:37:03 +0000 (18:37 +0100)]
lain [Tue, 28 Jan 2020 16:51:29 +0000 (16:51 +0000)]
Merge branch 'linkify-test-expansion' into 'develop'
Formatter: Add a test for domain / username clashes
See merge request pleroma/pleroma!2151
lain [Tue, 28 Jan 2020 16:42:57 +0000 (16:42 +0000)]
Merge branch 'features/task-test-email' into 'develop'
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
lain [Tue, 28 Jan 2020 16:38:14 +0000 (16:38 +0000)]
Merge branch 'fix/1524-link_preview' into 'develop'
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
Alexander Strizhakov [Tue, 28 Jan 2020 16:29:27 +0000 (19:29 +0300)]
meta tag parser respect first title header
lain [Tue, 28 Jan 2020 16:14:23 +0000 (16:14 +0000)]
Merge branch 'feature/tag_feed' into 'develop'
[#1452] Atom feeds for hashtags
See merge request pleroma/pleroma!2040
lain [Tue, 28 Jan 2020 16:06:36 +0000 (17:06 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
Haelwenn [Tue, 28 Jan 2020 15:51:45 +0000 (15:51 +0000)]
Merge branch 'whole-db-removal' into 'develop'
Remove `whole_db` parameter everywhere, it's not used anymore
See merge request pleroma/pleroma!2152
Haelwenn (lanodan) Monnier [Mon, 20 Jan 2020 12:23:21 +0000 (13:23 +0100)]
Create pleroma.email mix task
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
lain [Tue, 28 Jan 2020 15:42:05 +0000 (15:42 +0000)]
Update streamer_test.exs
lain [Tue, 28 Jan 2020 15:40:44 +0000 (16:40 +0100)]
Streamer: Correctly handle reblog mutes
Egor Kislitsyn [Tue, 28 Jan 2020 14:04:13 +0000 (18:04 +0400)]
Warn if HTTPSecurityPlug is disabled
feld [Tue, 28 Jan 2020 14:52:57 +0000 (14:52 +0000)]
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
lain [Tue, 28 Jan 2020 14:30:34 +0000 (14:30 +0000)]
Merge branch 'fix-elixir-v1.10' into 'develop'
Fix compatibility with Elixir v1.10
See merge request pleroma/pleroma!2153
Egor Kislitsyn [Tue, 28 Jan 2020 14:23:59 +0000 (18:23 +0400)]
Fix compatibility with Elixir v1.10
Roman Chvanikov [Tue, 28 Jan 2020 14:22:24 +0000 (17:22 +0300)]
Add test for custom base_url when deleting an attachment
Roman Chvanikov [Tue, 28 Jan 2020 14:07:46 +0000 (17:07 +0300)]
Fix base_url string trimming
Roman Chvanikov [Tue, 28 Jan 2020 13:52:20 +0000 (16:52 +0300)]
Add logging
lain [Tue, 28 Jan 2020 13:40:40 +0000 (14:40 +0100)]
Remove `whole_db` parameter everywhere, it's not used anymore
lain [Tue, 28 Jan 2020 13:38:49 +0000 (13:38 +0000)]
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
Roman Chvanikov [Tue, 28 Jan 2020 13:38:44 +0000 (16:38 +0300)]
Fix __MODULE__ usage
lain [Tue, 28 Jan 2020 13:26:28 +0000 (13:26 +0000)]
Merge branch 'translation/errors-french' into 'develop'
Translation/errors french
See merge request pleroma/pleroma!1457
lain [Tue, 28 Jan 2020 12:57:07 +0000 (12:57 +0000)]
Merge branch 'docs_introduction' into 'develop'
DOCS General update for the "Introduction to Pleroma" section
See merge request pleroma/pleroma!2101
Ilja [Tue, 28 Jan 2020 12:57:06 +0000 (12:57 +0000)]
DOCS General update for the "Introduction to Pleroma" section
* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check)
* Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check)
* Added a newline above the bulletpoints because otherwise they are broken on docs-develop
* Remove the :smile: thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis
* Add a link to fediverse.network
* Update to add new stuff and fix things that aren't correct (any more)
lain [Tue, 28 Jan 2020 12:49:22 +0000 (12:49 +0000)]
Merge branch 'support/update_ecto' into 'develop'
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
lain [Tue, 28 Jan 2020 12:40:00 +0000 (12:40 +0000)]
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
lain [Tue, 28 Jan 2020 12:38:21 +0000 (13:38 +0100)]
Formatter: Add a test for domain / username clashes
Maksim Pechnikov [Tue, 28 Jan 2020 07:43:47 +0000 (10:43 +0300)]
update ecto
Roman Chvanikov [Tue, 28 Jan 2020 00:54:54 +0000 (03:54 +0300)]
Remove unused var
Roman Chvanikov [Tue, 28 Jan 2020 00:52:35 +0000 (03:52 +0300)]
explicitly describe perform op in AttachmentsClenupWorker
Maksim Pechnikov [Mon, 27 Jan 2020 18:20:33 +0000 (21:20 +0300)]
fix test
Maksim Pechnikov [Mon, 27 Jan 2020 18:13:13 +0000 (21:13 +0300)]
Merge branch 'develop' into feature/tag_feed
Haelwenn [Mon, 27 Jan 2020 13:21:50 +0000 (13:21 +0000)]
Merge branch 'remove/suggestions-third-party-engine' into 'develop'
Remove user recommendation by third party engine
See merge request pleroma/pleroma!2141
Hakaba Hitoyo [Mon, 27 Jan 2020 13:21:50 +0000 (13:21 +0000)]
Remove user recommendation by third party engine
Haelwenn [Mon, 27 Jan 2020 11:45:26 +0000 (11:45 +0000)]
Merge branch 'descriptions-fixes' into 'develop'
Little fixes for descriptions.exs
See merge request pleroma/pleroma!2147
Alexander Strizhakov [Mon, 27 Jan 2020 09:53:21 +0000 (12:53 +0300)]
little fixes
Roman Chvanikov [Mon, 27 Jan 2020 01:01:50 +0000 (04:01 +0300)]
Fix typo
feld [Sun, 26 Jan 2020 17:35:21 +0000 (17:35 +0000)]
Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config
See merge request pleroma/pleroma!2143
feld [Sun, 26 Jan 2020 17:33:12 +0000 (17:33 +0000)]
Merge branch 'issue/1280' into 'develop'
[#1280] updated error messages for authentication process
Closes #1280
See merge request pleroma/pleroma!2111
Mark Felder [Sun, 26 Jan 2020 17:23:05 +0000 (11:23 -0600)]
Merge branch 'develop' into issue/1280
feld [Sun, 26 Jan 2020 17:21:49 +0000 (17:21 +0000)]
Merge branch 'fix/descriptions' into 'develop'
Fixes for descriptions.exs
Closes admin-fe#68
See merge request pleroma/pleroma!2145
Alexander Strizhakov [Sat, 25 Jan 2020 16:45:51 +0000 (19:45 +0300)]
description typos, Oban verbose type fix, new keys
Alexander Strizhakov [Sat, 25 Jan 2020 07:39:10 +0000 (10:39 +0300)]
can be changed in runtime
Alexander Strizhakov [Sat, 25 Jan 2020 07:33:27 +0000 (10:33 +0300)]
respect settings from database in mix tasks
Maksim Pechnikov [Fri, 24 Jan 2020 19:08:10 +0000 (22:08 +0300)]
added atom feed
Maksim Pechnikov [Fri, 24 Jan 2020 18:46:57 +0000 (21:46 +0300)]
Merge branch 'develop' into feature/tag_feed
feld [Fri, 24 Jan 2020 14:11:06 +0000 (14:11 +0000)]
Merge branch 'chore/changelog-for-dynamic-config' into 'develop'
Document dynamic_configuration breaking change
See merge request pleroma/pleroma!2142
Mark Felder [Fri, 24 Jan 2020 14:04:25 +0000 (08:04 -0600)]
Document dynamic_configuration breaking change
feld [Fri, 24 Jan 2020 13:54:44 +0000 (13:54 +0000)]
Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'
Better descriptions for email fields for admin-fe
Closes admin-fe#67
See merge request pleroma/pleroma!2138
rinpatch [Fri, 24 Jan 2020 11:33:02 +0000 (11:33 +0000)]
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
rinpatch [Fri, 24 Jan 2020 11:32:25 +0000 (11:32 +0000)]
Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
rinpatch [Fri, 24 Jan 2020 11:31:34 +0000 (11:31 +0000)]
Merge branch 'fix/removing-mdii-uploader-from-descriptions' into 'develop'
Removing deleted MDII uploader from suggestions
Closes admin-fe#64
See merge request pleroma/pleroma!2137
rinpatch [Fri, 24 Jan 2020 11:31:24 +0000 (11:31 +0000)]
Merge branch 'emoji-reaction-api-change-2' into 'develop'
Emoji reaction api change 2
See merge request pleroma/pleroma!2140
lain [Fri, 24 Jan 2020 09:53:01 +0000 (10:53 +0100)]
Emoji reactions: Update docs and changelog
lain [Fri, 24 Jan 2020 09:52:24 +0000 (10:52 +0100)]
Emoji reactions: Change api format once more
Alexander Strizhakov [Fri, 24 Jan 2020 09:22:26 +0000 (12:22 +0300)]
fix for non existing atom
Alexander Strizhakov [Fri, 24 Jan 2020 08:19:12 +0000 (11:19 +0300)]
better descriptions for email fields for admin-fe
Alexander Strizhakov [Fri, 24 Jan 2020 08:05:03 +0000 (11:05 +0300)]
removing deleted MDII uploader from suggestions
Maksim Pechnikov [Fri, 24 Jan 2020 05:58:07 +0000 (08:58 +0300)]
Merge branch 'develop' into feature/tag_feed
feld [Fri, 24 Jan 2020 00:25:38 +0000 (00:25 +0000)]
Merge branch 'fix_for_migrate_to_db_test' into 'develop'
Fix for migrate to db test
See merge request pleroma/pleroma!2133
feld [Thu, 23 Jan 2020 17:18:11 +0000 (17:18 +0000)]
Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop'
Truncate config table on migrate to db task and fix for parsing Swoosh adapters
Closes #1529
See merge request pleroma/pleroma!2136
Alexander Strizhakov [Thu, 23 Jan 2020 15:21:29 +0000 (18:21 +0300)]
parsing Swoosh modules
Alexander Strizhakov [Thu, 23 Jan 2020 14:48:45 +0000 (17:48 +0300)]
restart config id after truncate
Alexander Strizhakov [Thu, 23 Jan 2020 14:23:02 +0000 (17:23 +0300)]
truncate config table on migrate to db task
Alexander Strizhakov [Thu, 23 Jan 2020 12:13:27 +0000 (15:13 +0300)]
fix for migrate to db test
lain [Thu, 23 Jan 2020 11:34:34 +0000 (12:34 +0100)]
Emoji reactions: Add sanity checks for the cache
Maksim Pechnikov [Thu, 23 Jan 2020 08:42:10 +0000 (11:42 +0300)]
Merge branch 'develop' into feature/tag_feed
Haelwenn [Thu, 23 Jan 2020 02:12:03 +0000 (02:12 +0000)]
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
Haelwenn [Thu, 23 Jan 2020 02:05:22 +0000 (02:05 +0000)]
Merge branch 'develop' into 'develop'
Updated OpenBSD installation guide for version OpenBSD 6.6
See merge request pleroma/pleroma!2131
projects / akkoma / log