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
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
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
lambda [Fri, 17 May 2019 10:21:14 +0000 (10:21 +0000)]
Merge branch 'update-tzdata' into 'develop'
Dependencies: Update tzdata.
Closes #910
See merge request pleroma/pleroma!1171
lambda [Fri, 17 May 2019 10:07:51 +0000 (10:07 +0000)]
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
lambda [Fri, 17 May 2019 09:53:44 +0000 (09:53 +0000)]
Update account_view.ex
lain [Fri, 17 May 2019 09:51:50 +0000 (11:51 +0200)]
Dependencies: Update tzdata.
This fixes the bug that tz data could not be loaded. Closes #910.
lain [Fri, 17 May 2019 09:49:13 +0000 (11:49 +0200)]
Fix specs.
lain [Fri, 17 May 2019 09:33:04 +0000 (11:33 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
lain [Fri, 17 May 2019 09:30:35 +0000 (11:30 +0200)]
Configuration: disable migration lock.
lain [Fri, 17 May 2019 09:19:30 +0000 (11:19 +0200)]
Dependencies: Update ecto sql once more.
rinpatch [Fri, 17 May 2019 07:25:20 +0000 (07:25 +0000)]
Merge branch 'fix/902-random-compile-failing' into 'develop'
Fix/902 random compile failing
Closes #902
See merge request pleroma/pleroma!1168
Alexander Strizhakov [Fri, 17 May 2019 07:25:20 +0000 (07:25 +0000)]
Fix/902 random compile failing
Haelwenn (lanodan) Monnier [Fri, 17 May 2019 05:34:52 +0000 (07:34 +0200)]
MastoAPI account_view.ex: requested is false when following is true
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
kaniini [Fri, 17 May 2019 01:20:04 +0000 (01:20 +0000)]
Merge branch 'fix/mrf-tag-typo' into 'develop'
Fix MRF "tag" typo
See merge request pleroma/pleroma!1167
Aaron Tinio [Fri, 17 May 2019 00:11:17 +0000 (08:11 +0800)]
Add tests for MRF.SimplePolicy
Aaron Tinio [Fri, 17 May 2019 01:02:04 +0000 (09:02 +0800)]
Fix typo: s/"tags"/"tag"/g
kaniini [Thu, 16 May 2019 20:11:12 +0000 (20:11 +0000)]
Merge branch 'feature/890-add-report-uri' into 'develop'
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
feld [Thu, 16 May 2019 20:04:08 +0000 (20:04 +0000)]
Merge branch 'feature/task-update-following' into 'develop'
Remove duplicated entries in users' following lists
Closes #888
See merge request pleroma/pleroma!1166
Sergey Suprunenko [Thu, 16 May 2019 20:04:08 +0000 (20:04 +0000)]
Remove duplicated entries in users' following lists
feld [Thu, 16 May 2019 19:09:19 +0000 (19:09 +0000)]
Merge branch 'feature/admin-api-reports' into 'develop'
Add Reports to Admin API
Closes #774
See merge request pleroma/pleroma!1107
Sergey Suprunenko [Thu, 16 May 2019 19:09:18 +0000 (19:09 +0000)]
Add Reports to Admin API
feld [Thu, 16 May 2019 18:57:14 +0000 (18:57 +0000)]
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
rinpatch [Thu, 16 May 2019 18:32:42 +0000 (18:32 +0000)]
Merge branch 'conversations-import' into 'develop'
Conversations import
Closes #871
See merge request pleroma/pleroma!1127
Mark Felder [Thu, 16 May 2019 18:17:09 +0000 (13:17 -0500)]
Update CHANGELOG
Mark Felder [Thu, 16 May 2019 18:14:48 +0000 (13:14 -0500)]
Move to pleroma.database mix task
Mark Felder [Thu, 16 May 2019 18:11:17 +0000 (13:11 -0500)]
Merge branch 'develop' into conversations-import
lambda [Thu, 16 May 2019 13:44:22 +0000 (13:44 +0000)]
Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver
See merge request pleroma/pleroma!971
rinpatch [Thu, 16 May 2019 13:23:42 +0000 (13:23 +0000)]
Merge branch 'feature/896-toggling-confirmation' into 'develop'
Feature/896 toggling confirmation
Closes #896
See merge request pleroma/pleroma!1165
Alexander Strizhakov [Thu, 16 May 2019 13:23:41 +0000 (13:23 +0000)]
Feature/896 toggling confirmation
Alex S [Thu, 16 May 2019 10:35:07 +0000 (17:35 +0700)]
try this
Alex S [Thu, 16 May 2019 10:03:12 +0000 (17:03 +0700)]
trailing spaces
Alex S [Thu, 16 May 2019 05:54:06 +0000 (12:54 +0700)]
Merge branch 'develop' into feature/890-add-report-uri
Alex S [Thu, 16 May 2019 05:49:40 +0000 (12:49 +0700)]
add report uri and report to
kaniini [Thu, 16 May 2019 05:03:37 +0000 (05:03 +0000)]
Merge branch 'docs/update_debian_instructions' into 'develop'
Added package to dependency list documentation
See merge request pleroma/pleroma!1161
kaniini [Thu, 16 May 2019 05:02:50 +0000 (05:02 +0000)]
Merge branch 'chore/docs-update' into 'develop'
Update Admin API docs
See merge request pleroma/pleroma!1162
kaniini [Thu, 16 May 2019 04:50:15 +0000 (04:50 +0000)]
Merge branch 'fix/slow-federation' into 'develop'
publisher: use the correct queue name for outgoing federation
See merge request pleroma/pleroma!1163
William Pitcock [Thu, 16 May 2019 04:41:27 +0000 (04:41 +0000)]
publisher: use the correct queue name for outgoing federation
Angelina Filippova [Wed, 15 May 2019 22:48:53 +0000 (01:48 +0300)]
Note that nicknames is an array
Angelina Filippova [Wed, 15 May 2019 22:46:43 +0000 (01:46 +0300)]
Note that nicknames is an array
Angelina Filippova [Wed, 15 May 2019 22:36:26 +0000 (01:36 +0300)]
Update tag/untag docs
PolymerWitch [Wed, 15 May 2019 22:36:20 +0000 (15:36 -0700)]
Added package to dependency list
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
Aaron Tinio [Wed, 15 May 2019 22:25:14 +0000 (06:25 +0800)]
Use named binding to conditionally join object
Aaron Tinio [Tue, 14 May 2019 23:59:24 +0000 (07:59 +0800)]
Restrict reblogs of activities from blocked domains
Aaron Tinio [Tue, 14 May 2019 22:13:47 +0000 (06:13 +0800)]
Add test for blocked domains
William Pitcock [Wed, 15 May 2019 17:02:40 +0000 (17:02 +0000)]
thread visibility function: fix use of no longer used author variable
William Pitcock [Wed, 15 May 2019 16:56:46 +0000 (16:56 +0000)]
activity pub: remove Ecto SQL query dumps
William Pitcock [Wed, 15 May 2019 16:54:14 +0000 (16:54 +0000)]
thread visibility function: significantly improve efficiency
William Pitcock [Wed, 15 May 2019 16:23:01 +0000 (16:23 +0000)]
chase test failures
William Pitcock [Wed, 15 May 2019 16:22:52 +0000 (16:22 +0000)]
update migration
William Pitcock [Wed, 8 May 2019 23:17:51 +0000 (23:17 +0000)]
bbs: chase timeline containment patch
William Pitcock [Mon, 25 Mar 2019 02:56:13 +0000 (02:56 +0000)]
migration: only care about Create activities
projects / akkoma / log