sadposter [Tue, 3 Mar 2020 11:16:59 +0000 (11:16 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Tue, 3 Mar 2020 11:14:58 +0000 (11:14 +0000)]
thing
lain [Mon, 2 Mar 2020 17:00:04 +0000 (17:00 +0000)]
Merge branch 'prepared-statements-settings' into 'develop'
Prepared statements settings
See merge request pleroma/pleroma!2238
rinpatch [Mon, 2 Mar 2020 10:05:03 +0000 (10:05 +0000)]
Merge branch 'docs_cheatsheet_fix' into 'develop'
fix for :fetch_initial_posts
See merge request pleroma/pleroma!2266
ilja [Mon, 2 Mar 2020 09:29:24 +0000 (10:29 +0100)]
fix for :fetch_initial_posts
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
Haelwenn [Mon, 2 Mar 2020 07:58:01 +0000 (07:58 +0000)]
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
Haelwenn [Mon, 2 Mar 2020 05:15:13 +0000 (05:15 +0000)]
Merge branch 'chores/bump-copyright' into 'develop'
Bump copyright
See merge request pleroma/pleroma!2265
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 05:08:45 +0000 (06:08 +0100)]
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff
fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 04:54:39 +0000 (05:54 +0100)]
Bump copyright years of files changed after 2019-01-01
Done via the following command:
git diff
1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
rinpatch [Sun, 1 Mar 2020 19:16:54 +0000 (19:16 +0000)]
Merge branch 'docs_cheatsheet' into 'develop'
DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source
See merge request pleroma/pleroma!2262
Ilja [Sun, 1 Mar 2020 19:16:54 +0000 (19:16 +0000)]
Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)
I also made a more explicit distinction between OTP and from source installs in the general explanation
Alexander Strizhakov [Fri, 17 Jan 2020 08:51:08 +0000 (11:51 +0300)]
spec fix
Alexander Strizhakov [Mon, 30 Dec 2019 09:35:41 +0000 (12:35 +0300)]
fix for compiling
Alexander Strizhakov [Mon, 30 Dec 2019 08:30:20 +0000 (11:30 +0300)]
ActivityPub actions & side-effects in transaction
rinpatch [Sat, 29 Feb 2020 23:08:14 +0000 (23:08 +0000)]
Merge branch 'fix/easy-timeline-dos' into 'develop'
Cap the number of requested statuses in timelines to 40 and rate limit them
See merge request pleroma/pleroma!2253
rinpatch [Sat, 29 Feb 2020 23:03:46 +0000 (02:03 +0300)]
timeline controller: add a TODO for replacing copypaste with a macro
rinpatch [Fri, 28 Feb 2020 14:59:16 +0000 (17:59 +0300)]
changelog: entries for timeline DoS fixes
rinpatch [Fri, 28 Feb 2020 14:44:59 +0000 (17:44 +0300)]
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
rinpatch [Fri, 28 Feb 2020 14:35:01 +0000 (17:35 +0300)]
rate limiter: Fix a race condition
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
rinpatch [Fri, 28 Feb 2020 14:29:53 +0000 (17:29 +0300)]
pagination: limit the number of elements returned at one time to 40
rinpatch [Sat, 29 Feb 2020 21:52:33 +0000 (21:52 +0000)]
Merge branch 'rate-limiter-runtime-settings' into 'develop'
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
Ivan Tashkinov [Sat, 29 Feb 2020 19:04:09 +0000 (22:04 +0300)]
[#2250] Tiny refactoring per merge request review.
rinpatch [Sat, 29 Feb 2020 17:58:48 +0000 (17:58 +0000)]
Merge branch 'chore/update-cachex' into 'develop'
deps: update cachex to 3.2.0
See merge request pleroma/pleroma!2259
rinpatch [Sat, 29 Feb 2020 17:40:23 +0000 (20:40 +0300)]
deps: update cachex to 3.2.0
rinpatch [Sat, 29 Feb 2020 16:31:31 +0000 (16:31 +0000)]
Merge branch 'mastofe/bundle-2020-01-20' into 'develop'
MastoFE: Bundle 2020-01-20
See merge request pleroma/pleroma!2257
Haelwenn [Sat, 29 Feb 2020 11:29:45 +0000 (11:29 +0000)]
Merge branch 'descriptions-changes' into 'develop'
Adding streamer group & Oban crontab child to descriptions.exs
Closes #1592
See merge request pleroma/pleroma!2258
Alexander Strizhakov [Sat, 29 Feb 2020 08:24:30 +0000 (11:24 +0300)]
streamer group & Oban crontab child
Haelwenn (lanodan) Monnier [Sat, 29 Feb 2020 05:41:13 +0000 (06:41 +0100)]
MastoFE: Bundle 2020-01-20
feld [Fri, 28 Feb 2020 23:28:58 +0000 (23:28 +0000)]
Merge branch 'update/pleroma-fe-
20200228' into 'develop'
Update PleromaFE bundle for the 2.0 release
See merge request pleroma/pleroma!2255
Mark Felder [Fri, 28 Feb 2020 22:18:09 +0000 (16:18 -0600)]
Merge branch 'develop' into update/pleroma-fe-
20200228
Mark Felder [Fri, 28 Feb 2020 22:15:12 +0000 (16:15 -0600)]
Update PleromaFE bundle for the 2.0 release
feld [Fri, 28 Feb 2020 18:40:22 +0000 (18:40 +0000)]
Merge branch 'update/admin-fe-
20200228' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2254
Mark Felder [Fri, 28 Feb 2020 18:32:44 +0000 (12:32 -0600)]
Update AdminFE build
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
Ivan Tashkinov [Fri, 28 Feb 2020 13:33:42 +0000 (13:33 +0000)]
Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
Haelwenn [Fri, 28 Feb 2020 04:27:50 +0000 (04:27 +0000)]
Merge branch 'filtered-params' into 'develop'
add confirm field to filtered params
See merge request pleroma/pleroma!2251
Steven Fuchs [Fri, 28 Feb 2020 04:27:50 +0000 (04:27 +0000)]
add confirm field to filtered params
feld [Thu, 27 Feb 2020 18:11:26 +0000 (18:11 +0000)]
Merge branch 'descriptions-changes' into 'develop'
Removing unnecessary groups from descriptions.exs
See merge request pleroma/pleroma!2247
feld [Thu, 27 Feb 2020 18:11:04 +0000 (18:11 +0000)]
Merge branch 'admin-status-list' into 'develop'
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
feld [Thu, 27 Feb 2020 18:09:19 +0000 (18:09 +0000)]
Merge branch 'exclude-boosts-admin-api' into 'develop'
Admin API: filter out boosts from recent statuses
Closes #1589
See merge request pleroma/pleroma!2248
Ivan Tashkinov [Thu, 27 Feb 2020 15:46:05 +0000 (18:46 +0300)]
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
eugenijm [Wed, 26 Feb 2020 11:47:19 +0000 (14:47 +0300)]
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
eugenijm [Mon, 10 Feb 2020 11:32:38 +0000 (14:32 +0300)]
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
Alexander Strizhakov [Wed, 26 Feb 2020 16:50:07 +0000 (19:50 +0300)]
unnecessary groups
lain [Wed, 26 Feb 2020 08:26:16 +0000 (08:26 +0000)]
Merge branch 'feat/instance-gen-improvements' into 'develop'
small instance.gen task improvements
See merge request pleroma/pleroma!2245
rinpatch [Tue, 25 Feb 2020 21:32:34 +0000 (00:32 +0300)]
instance.gen task: make example instance name less confusing
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
rinpatch [Tue, 25 Feb 2020 19:13:08 +0000 (22:13 +0300)]
instance.gen task: remind to transfer the config to the database after
migrations
rinpatch [Tue, 25 Feb 2020 18:59:37 +0000 (21:59 +0300)]
instance.gen task: make instance name default to the domain
rinpatch [Tue, 25 Feb 2020 18:56:37 +0000 (18:56 +0000)]
Merge branch 'fix/dialyzer-warnings' into 'develop'
Fix Dialyzer warnings
See merge request pleroma/pleroma!2242
feld [Tue, 25 Feb 2020 17:14:54 +0000 (17:14 +0000)]
Merge branch 'merge/admin-fe-
20200225' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2244
Mark Felder [Tue, 25 Feb 2020 17:08:35 +0000 (11:08 -0600)]
Update AdminFE build
feld [Tue, 25 Feb 2020 16:06:06 +0000 (16:06 +0000)]
Merge branch 'token-web-push-test' into 'develop'
Add a test to ensure OAuth tokens are tied to Push subscriptions
Closes #1551
See merge request pleroma/pleroma!2241
Egor Kislitsyn [Tue, 25 Feb 2020 14:34:56 +0000 (18:34 +0400)]
Fix Dialyzer warnings
Egor Kislitsyn [Tue, 25 Feb 2020 14:04:28 +0000 (18:04 +0400)]
Add a test to ensure OAuth tokens are tied to Push subscriptions
lain [Tue, 25 Feb 2020 12:26:39 +0000 (12:26 +0000)]
Merge branch 'test-fix' into 'develop'
Compile fix in tests
See merge request pleroma/pleroma!2239
Alexander Strizhakov [Tue, 25 Feb 2020 12:19:52 +0000 (15:19 +0300)]
compile fix
lain [Tue, 25 Feb 2020 10:51:01 +0000 (11:51 +0100)]
Document database default changes
lain [Tue, 25 Feb 2020 10:17:51 +0000 (11:17 +0100)]
Add :unnamed option to default database configuration
rinpatch [Mon, 24 Feb 2020 20:52:10 +0000 (20:52 +0000)]
Merge branch 'fix/instance-gen-custom-static' into 'develop'
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
rinpatch [Mon, 24 Feb 2020 19:52:38 +0000 (22:52 +0300)]
instance.gen task: fix crash when using custom static directory
Closes #1082
Haelwenn [Mon, 24 Feb 2020 19:21:29 +0000 (19:21 +0000)]
Merge branch 'status-visibility-count-stats' into 'develop'
Status count by visibility scope (`GET /api/pleroma/admin/stats` )
See merge request pleroma/pleroma!2097
eugenijm [Thu, 9 Jan 2020 19:18:55 +0000 (22:18 +0300)]
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
lain [Mon, 24 Feb 2020 17:48:18 +0000 (17:48 +0000)]
Merge branch 'theming_your_instance' into 'develop'
DOCS Theming your instance
See merge request pleroma/pleroma!2232
Ilja [Mon, 24 Feb 2020 17:48:18 +0000 (17:48 +0000)]
DOCS Theming your instance
I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance
lain [Mon, 24 Feb 2020 14:54:22 +0000 (14:54 +0000)]
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
Haelwenn [Mon, 24 Feb 2020 07:28:35 +0000 (07:28 +0000)]
Merge branch '1505-threads-federation' into 'develop'
[#1505] Threads / replies federation
Closes #1505
See merge request pleroma/pleroma!2129
Haelwenn (lanodan) Monnier [Mon, 24 Feb 2020 01:41:48 +0000 (02:41 +0100)]
Captcha: return invalid when answer_data is nil
Haelwenn (lanodan) Monnier [Mon, 24 Feb 2020 00:27:16 +0000 (01:27 +0100)]
captcha_test.exs: Use the same testing logic in Kocaptcha and native
feld [Sat, 22 Feb 2020 15:35:33 +0000 (15:35 +0000)]
Merge branch 'fix/missing-config-settings' into 'develop'
Add missing invites_enabled and account_activation_required settings
See merge request pleroma/pleroma!2234
Mark Felder [Sat, 22 Feb 2020 15:29:05 +0000 (09:29 -0600)]
Add missing invites_enabled and account_activation_required settings
Ivan Tashkinov [Sat, 22 Feb 2020 06:31:43 +0000 (09:31 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# CHANGELOG.md
# config/config.exs
lain [Fri, 21 Feb 2020 19:34:45 +0000 (19:34 +0000)]
Merge branch 'patch-1' into 'develop'
added why doing a vacuum after restoring a backup is so important
See merge request pleroma/pleroma!2230
Igeljäger [Fri, 21 Feb 2020 15:30:52 +0000 (15:30 +0000)]
added why doing a vacuum after restoring a backup is so important
Haelwenn [Thu, 20 Feb 2020 23:53:52 +0000 (23:53 +0000)]
Merge branch 'migration-fixes-20' into 'develop'
Migrations: Make them not fail for old databases
See merge request pleroma/pleroma!2227
Haelwenn [Thu, 20 Feb 2020 23:52:45 +0000 (23:52 +0000)]
Merge branch 'fix/gin-fuzzy' into 'develop'
Improve GIN full text search performance
See merge request pleroma/pleroma!2228
Haelwenn [Thu, 20 Feb 2020 23:50:40 +0000 (23:50 +0000)]
Merge branch 'single_emoji_reaction' into 'develop'
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
Mark Felder [Thu, 20 Feb 2020 21:34:10 +0000 (15:34 -0600)]
Apply database session parameter to improve GIN full text search
lain [Thu, 20 Feb 2020 15:44:31 +0000 (16:44 +0100)]
Migrations: Make them not fail for old databases
sadposter [Thu, 20 Feb 2020 13:50:56 +0000 (13:50 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Ivan Tashkinov [Thu, 20 Feb 2020 12:18:28 +0000 (15:18 +0300)]
[#1505] Typo fix.
lain [Thu, 20 Feb 2020 12:13:21 +0000 (12:13 +0000)]
Merge branch 'require-signature' into 'develop'
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
lain [Thu, 20 Feb 2020 12:04:29 +0000 (12:04 +0000)]
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
lain [Thu, 20 Feb 2020 12:03:21 +0000 (12:03 +0000)]
Merge branch 'docs_updating' into 'develop'
DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108
Ivan Tashkinov [Thu, 20 Feb 2020 12:00:48 +0000 (15:00 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# config/config.exs
lain [Thu, 20 Feb 2020 11:58:37 +0000 (11:58 +0000)]
Merge branch 'feature/new-registrations-digest' into 'develop'
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
Ivan Tashkinov [Thu, 20 Feb 2020 11:48:46 +0000 (14:48 +0300)]
[#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3
lain [Thu, 20 Feb 2020 11:36:48 +0000 (11:36 +0000)]
Merge branch 'tests-clear-config-tweaks' into 'develop'
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
lain [Wed, 19 Feb 2020 16:17:05 +0000 (17:17 +0100)]
Emoji Reactions: Add documentation
lain [Wed, 19 Feb 2020 16:16:45 +0000 (17:16 +0100)]
Pleroma API: Add endpoint to get reaction information on a single emoji
feld [Tue, 18 Feb 2020 21:03:01 +0000 (21:03 +0000)]
Merge branch 'fix/mrf-sample-doc' into 'develop'
Update MRF docs, make sample code actually compile
See merge request pleroma/pleroma!2210
feld [Tue, 18 Feb 2020 20:58:15 +0000 (20:58 +0000)]
Merge branch 'develop' into 'fix/mrf-sample-doc'
# Conflicts:
# docs/configuration/mrf.md
feld [Tue, 18 Feb 2020 20:57:23 +0000 (20:57 +0000)]
Merge branch 'fix/mrf-docs' into 'develop'
Fix MRF documentation
See merge request pleroma/pleroma!2187
feld [Tue, 18 Feb 2020 20:45:31 +0000 (20:45 +0000)]
Merge branch 'chore/config-descriptions' into 'develop'
Additional config description improvements
See merge request pleroma/pleroma!2207
lain [Tue, 18 Feb 2020 14:56:59 +0000 (14:56 +0000)]
Merge branch 'fix/status-view/expires_at' into 'develop'
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
Ivan Tashkinov [Tue, 18 Feb 2020 14:52:31 +0000 (17:52 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
Ivan Tashkinov [Tue, 18 Feb 2020 14:46:09 +0000 (17:46 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
lain [Tue, 18 Feb 2020 14:36:10 +0000 (14:36 +0000)]
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
lain [Tue, 18 Feb 2020 14:32:03 +0000 (14:32 +0000)]
Merge branch 'need-reboot-flag' into 'develop'
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
Egor Kislitsyn [Tue, 18 Feb 2020 13:09:50 +0000 (17:09 +0400)]
Add a test
lain [Tue, 18 Feb 2020 13:09:37 +0000 (13:09 +0000)]
Merge branch 'chore/floki-update' into 'develop'
Update floki to 0.25
See merge request pleroma/pleroma!2217
Egor Kislitsyn [Tue, 18 Feb 2020 10:52:11 +0000 (14:52 +0400)]
Fix `status.expires_at` type
projects / akkoma / log