Egor Kislitsyn [Fri, 13 Mar 2020 15:30:42 +0000 (19:30 +0400)]
Fix hashtags WebSocket streaming
feld [Thu, 12 Mar 2020 20:29:51 +0000 (20:29 +0000)]
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
rinpatch [Wed, 11 Mar 2020 20:26:50 +0000 (20:26 +0000)]
Merge branch 'docs/new_user' into 'develop'
CLI_tasks/user.md: Fix `pleroma.user new` documentation
Closes #1621
See merge request pleroma/pleroma!2286
feld [Wed, 11 Mar 2020 16:53:05 +0000 (16:53 +0000)]
Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email
See merge request pleroma/pleroma!2246
rinpatch [Wed, 11 Mar 2020 15:16:18 +0000 (15:16 +0000)]
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
feld [Wed, 11 Mar 2020 15:10:09 +0000 (15:10 +0000)]
Merge branch 'relay-list-change' into 'develop'
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
Alexander Strizhakov [Wed, 11 Mar 2020 14:22:50 +0000 (17:22 +0300)]
using Pleroma.Config instead of ets
Alexander Strizhakov [Wed, 11 Mar 2020 13:43:58 +0000 (16:43 +0300)]
compile fix
Alexander Strizhakov [Wed, 11 Mar 2020 13:25:53 +0000 (16:25 +0300)]
merging release default config on app start
rinpatch [Wed, 11 Mar 2020 10:39:06 +0000 (10:39 +0000)]
Merge branch 'docs/debian-install' into 'develop'
installation/otp_en.md: Fix pleroma.nginx target [deb]
See merge request pleroma/pleroma!2280
Haelwenn (lanodan) Monnier [Wed, 11 Mar 2020 07:46:57 +0000 (08:46 +0100)]
CLI_tasks: Use manpage formatting conventions
- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated
[ci skip]
Haelwenn (lanodan) Monnier [Wed, 11 Mar 2020 07:35:46 +0000 (08:35 +0100)]
CLI_tasks/user.md: Fix `pleroma.user new` documentation
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621
[ci skip]
Haelwenn [Wed, 11 Mar 2020 07:25:35 +0000 (07:25 +0000)]
Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'
static-fe.css: Restore from before
a65ee8ea
See merge request pleroma/pleroma!2284
Haelwenn (lanodan) Monnier [Wed, 11 Mar 2020 05:35:18 +0000 (06:35 +0100)]
static-fe.css: Restore from before
a65ee8ea
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
lain [Tue, 10 Mar 2020 18:16:10 +0000 (18:16 +0000)]
Merge branch 'fix/post-length-validation' into 'develop'
Fix enforcement of character limits
Closes #1618
See merge request pleroma/pleroma!2283
Mark Felder [Tue, 10 Mar 2020 18:08:00 +0000 (13:08 -0500)]
Fix enforcement of character limits
Haelwenn (lanodan) Monnier [Tue, 10 Mar 2020 10:49:02 +0000 (11:49 +0100)]
installation/otp_en.md: Fix pleroma.nginx target [deb]
Needs to be backported to stable.
Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29
lain [Mon, 9 Mar 2020 13:36:21 +0000 (13:36 +0000)]
Merge branch 'patch-1' into 'develop'
Better advice for vacuuming after restoring.
See merge request pleroma/pleroma!2233
rinpatch [Sun, 8 Mar 2020 20:31:54 +0000 (20:31 +0000)]
Merge branch 'chore/mix-version-bump' into 'develop'
mix.exs: bump version to development one
See merge request pleroma/pleroma!2279
rinpatch [Sun, 8 Mar 2020 20:24:30 +0000 (23:24 +0300)]
mix.exs: bump version to development one
rinpatch [Sun, 8 Mar 2020 13:42:15 +0000 (13:42 +0000)]
Merge branch 'stable' into 'develop'
Sync develop with stable
Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606
See merge request pleroma/pleroma!2278
rinpatch [Sun, 8 Mar 2020 10:38:35 +0000 (10:38 +0000)]
Merge branch 'release/2.0.0' into 'stable'
Release/2.0.0
See merge request pleroma/pleroma!2273
rinpatch [Sat, 7 Mar 2020 15:18:43 +0000 (18:18 +0300)]
rinpatch [Sat, 7 Mar 2020 14:45:00 +0000 (14:45 +0000)]
Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'
moderation log: fix improperly migrated data
See merge request pleroma/pleroma!2277
rinpatch [Sat, 7 Mar 2020 10:51:28 +0000 (13:51 +0300)]
moderation log: fix improperly migrated data
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
Alexander Strizhakov [Tue, 18 Feb 2020 15:10:39 +0000 (18:10 +0300)]
wait in mix task while pleroma is rebooted
rinpatch [Sat, 7 Mar 2020 09:32:29 +0000 (09:32 +0000)]
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
rinpatch [Fri, 6 Mar 2020 20:23:39 +0000 (20:23 +0000)]
Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'
Remove EmojiPacks from AdminFE build
See merge request pleroma/pleroma!2275
feld [Fri, 6 Mar 2020 16:03:24 +0000 (16:03 +0000)]
Merge branch 'revert-
67cc4dce' into 'develop'
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
See merge request pleroma/pleroma!2276
feld [Fri, 6 Mar 2020 15:56:41 +0000 (15:56 +0000)]
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
This reverts merge request !2274
Mark Felder [Fri, 6 Mar 2020 15:54:38 +0000 (09:54 -0600)]
Remove EmojiPacks from AdminFE build
Once more, with feeling
lain [Fri, 6 Mar 2020 15:14:10 +0000 (15:14 +0000)]
Merge branch 'update/admin-fe-without-emojipack' into 'develop'
Remove emoji support from AdminFE
See merge request pleroma/pleroma!2274
Mark Felder [Fri, 6 Mar 2020 13:53:33 +0000 (07:53 -0600)]
Remove emoji support from AdminFE
rinpatch [Thu, 5 Mar 2020 20:41:47 +0000 (23:41 +0300)]
rinpatch [Thu, 5 Mar 2020 19:38:38 +0000 (22:38 +0300)]
Merge branch 'stable' into release/2.0.0
rinpatch [Thu, 5 Mar 2020 19:36:35 +0000 (22:36 +0300)]
Merge branch 'stable' into release/2.0.0
rinpatch [Thu, 5 Mar 2020 19:35:23 +0000 (22:35 +0300)]
version bump changelog and mix version
rinpatch [Thu, 5 Mar 2020 19:28:37 +0000 (22:28 +0300)]
changelog: sync with stable
eugenijm [Thu, 5 Mar 2020 12:01:45 +0000 (15:01 +0300)]
Exclude private and direct statuses visible to the admin when using godmode
lain [Thu, 5 Mar 2020 11:49:51 +0000 (11:49 +0000)]
Merge branch 'proper_error_messages' into 'develop'
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
lain [Thu, 5 Mar 2020 11:42:02 +0000 (12:42 +0100)]
Admin API tests: Fix wrong test.
Haelwenn [Thu, 5 Mar 2020 07:25:23 +0000 (07:25 +0000)]
Merge branch 'fix/stats-on-startup' into 'develop'
Generate instance stats on startup
Closes #1598
See merge request pleroma/pleroma!2271
Mark Felder [Wed, 4 Mar 2020 19:41:04 +0000 (13:41 -0600)]
Document the instance stats fix
Mark Felder [Wed, 4 Mar 2020 19:33:26 +0000 (13:33 -0600)]
Generate instance stats on startup
feld [Wed, 4 Mar 2020 18:22:37 +0000 (18:22 +0000)]
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
lain [Wed, 4 Mar 2020 17:09:06 +0000 (18:09 +0100)]
MastodonController: Return 404 errors correctly.
lain [Wed, 4 Mar 2020 12:43:06 +0000 (12:43 +0000)]
Merge branch 'fix/no-email-no-fail' into 'develop'
Do not fail when user has no email
See merge request pleroma/pleroma!2249
Haelwenn [Tue, 3 Mar 2020 23:15:12 +0000 (23:15 +0000)]
Merge branch 'chore/update-copyrights' into 'develop'
Update Copyrights
See merge request pleroma/pleroma!2269
Mark Felder [Tue, 3 Mar 2020 22:46:45 +0000 (16:46 -0600)]
Older copyright updates
Mark Felder [Tue, 3 Mar 2020 22:44:49 +0000 (16:44 -0600)]
Update Copyrights
Egor Kislitsyn [Mon, 2 Mar 2020 20:29:51 +0000 (00:29 +0400)]
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
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
eugenijm [Mon, 2 Mar 2020 13:47:30 +0000 (16:47 +0300)]
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Egor Kislitsyn [Mon, 2 Mar 2020 11:35:49 +0000 (15:35 +0400)]
Merge branch 'develop' into fix/signup-without-email
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
Alexander Strizhakov [Tue, 25 Feb 2020 13:21:48 +0000 (16:21 +0300)]
relay list shows hosts without accepted follow
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 [Tue, 18 Feb 2020 15:10:39 +0000 (18:10 +0300)]
wait in mix task while pleroma is rebooted
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.
Egor Kislitsyn [Thu, 27 Feb 2020 13:27:49 +0000 (17:27 +0400)]
Do not fail when user has no email
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
Egor Kislitsyn [Wed, 26 Feb 2020 16:13:53 +0000 (20:13 +0400)]
Allow account registration without an email
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
projects / akkoma / log