Mark Felder [Wed, 29 May 2019 17:20:18 +0000 (12:20 -0500)]
Permit fetching statuses from API with nickname or id
lambda [Wed, 29 May 2019 14:25:53 +0000 (14:25 +0000)]
Merge branch 'fix/mastodon-search-limit' into 'develop'
Default search limit should be 40
See merge request pleroma/pleroma!1210
lambda [Wed, 29 May 2019 14:04:58 +0000 (14:04 +0000)]
Merge branch 'issue/936' into 'develop'
[#936] fix tests
See merge request pleroma/pleroma!1208
Maksim [Wed, 29 May 2019 14:04:58 +0000 (14:04 +0000)]
[#936] fix tests
Mark Felder [Wed, 29 May 2019 13:06:26 +0000 (08:06 -0500)]
Default search limit should be 40
https://docs.joinmastodon.org/api/rest/search/
kaniini [Wed, 29 May 2019 11:33:37 +0000 (11:33 +0000)]
Merge branch 'feature/search-authenticated-only' into 'develop'
router: require oauth_read for searching
Closes #935
See merge request pleroma/pleroma!1209
William Pitcock [Wed, 29 May 2019 10:58:45 +0000 (10:58 +0000)]
router: require oauth_read for searching
Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords. An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.
Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion. It also
removes Pleroma as a potential vector in distributed search engines.
feld [Tue, 28 May 2019 21:20:24 +0000 (21:20 +0000)]
Merge branch 'varnish-improvements' into 'develop'
More Varnish improvements
See merge request pleroma/pleroma!667
feld [Tue, 28 May 2019 21:20:24 +0000 (21:20 +0000)]
Improve Varnish config. We set sane headers from the backend now.
kaniini [Tue, 28 May 2019 06:49:54 +0000 (06:49 +0000)]
Merge branch 'respect-proxy-settings-federation' into 'develop'
Respect proxy settings federation
See merge request pleroma/pleroma!1206
jeff [Tue, 28 May 2019 06:49:53 +0000 (06:49 +0000)]
Respect proxy settings federation
lambda [Sun, 26 May 2019 13:33:11 +0000 (13:33 +0000)]
Merge branch 'refactor/die-httpoison-die' into 'develop'
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
kaniini [Sun, 26 May 2019 02:10:31 +0000 (02:10 +0000)]
Merge branch 'fix/mrf-simple' into 'develop'
mrf: simple policy: fix matching imported activitypub and ostatus statuses
Closes #915
See merge request pleroma/pleroma!1205
William Pitcock [Sun, 26 May 2019 01:57:22 +0000 (01:57 +0000)]
mrf: simple policy: fix matching imported activitypub and ostatus statuses
William Pitcock [Sat, 25 May 2019 04:39:32 +0000 (04:39 +0000)]
remove @websub and @ostatus module-level constants
William Pitcock [Sat, 25 May 2019 04:34:16 +0000 (04:34 +0000)]
tests: websub: check only that signature validation succeeds or fails
William Pitcock [Sat, 25 May 2019 04:24:21 +0000 (04:24 +0000)]
kill @httpoison
kaniini [Sat, 25 May 2019 01:45:17 +0000 (01:45 +0000)]
Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'
Keep nodeinfo available when not federating
Closes #923
See merge request pleroma/pleroma!1202
Aaron Tinio [Sat, 25 May 2019 00:15:12 +0000 (08:15 +0800)]
Keep nodeinfo available when not federating
kaniini [Fri, 24 May 2019 20:34:23 +0000 (20:34 +0000)]
Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'
Mention all people in the beginning of DM
Closes #924
See merge request pleroma/pleroma!1194
Sergey Suprunenko [Fri, 24 May 2019 20:34:23 +0000 (20:34 +0000)]
Mention all people in the beginning of DM
kaniini [Fri, 24 May 2019 20:33:55 +0000 (20:33 +0000)]
Merge branch 'feature/static-headers' into 'develop'
Improve serving of static assets
See merge request pleroma/pleroma!1200
feld [Fri, 24 May 2019 20:33:55 +0000 (20:33 +0000)]
Move the Cache Control header test to its own file
We can consolidate our cache control header tests here
lambda [Fri, 24 May 2019 09:54:45 +0000 (09:54 +0000)]
Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'
explicitly set reverse proxy upstream to IPv4
Closes #930
See merge request pleroma/pleroma!1197
Alfie Pates [Thu, 23 May 2019 21:33:27 +0000 (22:33 +0100)]
explicitly set reverse proxy upstream to IPv4
since Pleroma.Web.Endpoint binds on IPv4 only and `localhost.` resolves to
[::0] on some systems
fixes #930.
kaniini [Wed, 22 May 2019 19:03:14 +0000 (19:03 +0000)]
Merge branch 'feature/mrf-user-filter' into 'develop'
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
kaniini [Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)]
Merge branch 'ssh-fixes' into 'develop'
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
William Pitcock [Wed, 22 May 2019 05:55:09 +0000 (05:55 +0000)]
update documentation for the new MRF features [no-ci]
William Pitcock [Wed, 22 May 2019 05:08:37 +0000 (05:08 +0000)]
tests: add tests for banner and avatar removal
William Pitcock [Wed, 22 May 2019 04:55:16 +0000 (04:55 +0000)]
mrf: simple policy: add the ability to strip avatars and banners from user profiles
William Pitcock [Wed, 22 May 2019 04:33:10 +0000 (04:33 +0000)]
activitypub: run user objects through MRF filters
William Pitcock [Wed, 22 May 2019 04:15:59 +0000 (04:15 +0000)]
mrf: defang policy modules for filtering user profile objects
rinpatch [Wed, 22 May 2019 17:19:51 +0000 (17:19 +0000)]
Merge branch 'fix/prune-objects-times-out' into 'develop'
Disable timeouts for object pruning query
See merge request pleroma/pleroma!1193
rinpatch [Wed, 22 May 2019 17:10:52 +0000 (20:10 +0300)]
Disable timeouts for object pruning query
lambda [Wed, 22 May 2019 15:44:50 +0000 (15:44 +0000)]
Merge branch 'issue/699' into 'develop'
[#699] add worker to clean expired oauth tokens
See merge request pleroma/pleroma!1184
Maksim [Wed, 22 May 2019 15:44:50 +0000 (15:44 +0000)]
[#699] add worker to clean expired oauth tokens
lambda [Wed, 22 May 2019 11:07:51 +0000 (11:07 +0000)]
Update CHANGELOG.md
lambda [Wed, 22 May 2019 11:04:30 +0000 (11:04 +0000)]
Merge branch 'feature/object-pruning' into 'develop'
Object pruning
See merge request pleroma/pleroma!1181
lain [Wed, 22 May 2019 10:57:20 +0000 (12:57 +0200)]
Mix: Only start sshd when needed, second try.
lambda [Wed, 22 May 2019 10:05:05 +0000 (10:05 +0000)]
Merge branch 'bring-ecto-back-to-mainline' into 'develop'
Mix: Bring ecto-sql back to mainline.
See merge request pleroma/pleroma!1192
lain [Wed, 22 May 2019 09:44:17 +0000 (11:44 +0200)]
Mix: Bring ecto-sql back to mainline.
lain [Wed, 22 May 2019 09:01:10 +0000 (11:01 +0200)]
Changelog: Add tip for debian users.
lain [Wed, 22 May 2019 08:44:26 +0000 (10:44 +0200)]
Documentation: Specify PEM format for SSH keys.
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
lain [Wed, 22 May 2019 08:40:15 +0000 (10:40 +0200)]
Linting.
lain [Wed, 22 May 2019 08:28:50 +0000 (10:28 +0200)]
Mix: Don't start esshd application if we don't need it.
lain [Wed, 22 May 2019 08:17:32 +0000 (10:17 +0200)]
Changelog: Add SSH mode.
lambda [Wed, 22 May 2019 06:28:16 +0000 (06:28 +0000)]
Merge branch 'refactor/keys' into 'develop'
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
William Pitcock [Wed, 22 May 2019 05:58:51 +0000 (05:58 +0000)]
salmon: fix credo
rinpatch [Wed, 22 May 2019 05:39:01 +0000 (05:39 +0000)]
Merge branch 'bugfix/account_view_source.note' into 'develop'
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
Haelwenn (lanodan) Monnier [Wed, 22 May 2019 05:22:19 +0000 (07:22 +0200)]
MastoAPI AccountView: fill source.note with plaintext version of note
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
kaniini [Wed, 22 May 2019 04:06:54 +0000 (04:06 +0000)]
Merge branch 'mongooseim-support' into 'develop'
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
kaniini [Wed, 22 May 2019 04:05:41 +0000 (04:05 +0000)]
Merge branch 'fix/api-fallback' into 'develop'
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
kaniini [Wed, 22 May 2019 04:04:20 +0000 (04:04 +0000)]
Merge branch 'bugfix/dm-being-truncated' into 'develop'
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
Closes #904
See merge request pleroma/pleroma!1185
Sergey Suprunenko [Wed, 22 May 2019 04:04:20 +0000 (04:04 +0000)]
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
William Pitcock [Wed, 22 May 2019 03:58:15 +0000 (03:58 +0000)]
move key generation functions into Pleroma.Keys module
William Pitcock [Wed, 22 May 2019 03:12:48 +0000 (03:12 +0000)]
prune objects task: use Repo.delete_all()
Aaron Tinio [Tue, 21 May 2019 23:11:09 +0000 (07:11 +0800)]
Fix failing test
Aaron Tinio [Tue, 21 May 2019 01:40:29 +0000 (09:40 +0800)]
Respond with a 404 Not implemented JSON error message
when requested API is not implemented
Aaron Tinio [Tue, 21 May 2019 01:39:32 +0000 (09:39 +0800)]
Add tests for fallback routes
William Pitcock [Tue, 21 May 2019 01:22:27 +0000 (01:22 +0000)]
add changelog entry for object pruning
William Pitcock [Tue, 21 May 2019 01:21:28 +0000 (01:21 +0000)]
add mix task to prune the object database using a configured retention period
William Pitcock [Tue, 21 May 2019 00:41:58 +0000 (00:41 +0000)]
object: fetcher: add support for reinjecting pruned objects
William Pitcock [Tue, 21 May 2019 00:41:40 +0000 (00:41 +0000)]
object: add Object.prune()
lain [Tue, 21 May 2019 16:57:36 +0000 (18:57 +0200)]
MongooseIM: Add documentation.
kaniini [Tue, 21 May 2019 05:15:29 +0000 (05:15 +0000)]
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'
http: bump connection timeout to 10 seconds
See merge request pleroma/pleroma!1183
William Pitcock [Tue, 21 May 2019 04:58:26 +0000 (04:58 +0000)]
http: bump connection timeout to 10 seconds
kaniini [Tue, 21 May 2019 01:36:06 +0000 (01:36 +0000)]
Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'
Fix prometheus-ecto error when not configured
Closes #917
See merge request pleroma/pleroma!1180
kaniini [Mon, 20 May 2019 23:30:19 +0000 (23:30 +0000)]
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
Aaron Tinio [Mon, 20 May 2019 23:30:18 +0000 (07:30 +0800)]
Fix prometheus-ecto error when not configured
Mark Felder [Mon, 20 May 2019 22:18:59 +0000 (17:18 -0500)]
Additional reserved usernames
kaniini [Mon, 20 May 2019 18:17:42 +0000 (18:17 +0000)]
Merge branch 'feature/user-configurable-mascot' into 'develop'
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
kaniini [Mon, 20 May 2019 18:16:29 +0000 (18:16 +0000)]
Merge branch 'doc/mrf-simple-report-removal' into 'develop'
Document MRF.Simple :report_removal
See merge request pleroma/pleroma!1179
Aaron Tinio [Mon, 20 May 2019 16:59:12 +0000 (00:59 +0800)]
Document MRF.Simple :report_removal
Aaron Tinio [Mon, 20 May 2019 16:35:46 +0000 (00:35 +0800)]
Add virtual :thread_muted? field
that may be set when fetching activities
Sadposter [Mon, 20 May 2019 15:12:55 +0000 (16:12 +0100)]
Move default mascot configuration to `config/`
Sadposter [Mon, 20 May 2019 13:19:42 +0000 (14:19 +0100)]
Add changelog entry for mascot config
Sadposter [Mon, 20 May 2019 12:10:04 +0000 (13:10 +0100)]
Use string map for default mascot
Sadposter [Mon, 20 May 2019 11:58:17 +0000 (12:58 +0100)]
Format mascot tests
Sadposter [Mon, 20 May 2019 11:58:06 +0000 (12:58 +0100)]
Add mascot get/set tests
Sadposter [Mon, 20 May 2019 11:39:23 +0000 (12:39 +0100)]
Add API endpoints for a custom user mascot
kaniini [Sun, 19 May 2019 22:30:10 +0000 (22:30 +0000)]
Merge branch 'feature/mrf-simple-report-filtering' into 'develop'
Add report filtering to MRF.SimplePolicy
Closes #610
See merge request pleroma/pleroma!1176
Aaron Tinio [Sun, 19 May 2019 22:02:50 +0000 (06:02 +0800)]
Add report filtering to MRF.SimplePolicy
rinpatch [Sat, 18 May 2019 07:13:18 +0000 (07:13 +0000)]
Merge branch 'feature/mrf-always-nsfw' into 'develop'
suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173
Haelwenn [Sat, 18 May 2019 04:42:11 +0000 (04:42 +0000)]
Merge branch 'feature/http-ua-header-always' into 'develop'
http: request builder: send user-agent when making requests
Closes #546
See merge request pleroma/pleroma!1174
William Pitcock [Fri, 17 May 2019 20:43:31 +0000 (20:43 +0000)]
add Changelog entry
William Pitcock [Fri, 17 May 2019 20:42:51 +0000 (20:42 +0000)]
also suppress link previews from posts marked #nsfw
William Pitcock [Fri, 17 May 2019 20:31:39 +0000 (20:31 +0000)]
add CHANGELOG entry
William Pitcock [Fri, 17 May 2019 20:28:58 +0000 (20:28 +0000)]
config: make sending the user agent configurable, disable sending the user agent in tests
William Pitcock [Fri, 17 May 2019 19:03:19 +0000 (19:03 +0000)]
http: request builder: send user-agent when making requests
William Pitcock [Fri, 17 May 2019 18:49:43 +0000 (18:49 +0000)]
rich media: suppress link previews if post is marked as sensitive
William Pitcock [Fri, 17 May 2019 18:49:10 +0000 (18:49 +0000)]
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
rinpatch [Fri, 17 May 2019 16:35:19 +0000 (16:35 +0000)]
Merge branch 'rum-index' into 'develop'
Search: Use RUM index.
See merge request pleroma/pleroma!1136
lain [Fri, 17 May 2019 16:32:30 +0000 (18:32 +0200)]
Linting.
lain [Fri, 17 May 2019 16:21:11 +0000 (18:21 +0200)]
MongooseIM: Add basic integration endpoints.
lain [Fri, 17 May 2019 13:21:29 +0000 (15:21 +0200)]
CI: Use the correct image with the correct hostname.
lain [Fri, 17 May 2019 13:06:51 +0000 (15:06 +0200)]
RUM: Set rum status by the environment.
lain [Fri, 17 May 2019 12:59:01 +0000 (14:59 +0200)]
RUM: Remove vacuum analyze from migration
Can't be run in a trnasaction.
lain [Fri, 17 May 2019 10:47:38 +0000 (12:47 +0200)]
CI: Add rum variant testing.
lain [Fri, 17 May 2019 10:26:59 +0000 (12:26 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
lambda [Fri, 17 May 2019 10:21:38 +0000 (10:21 +0000)]
Merge branch 'ecto_sql_update' into 'develop'
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
projects / akkoma / log