Egor Kislitsyn [Fri, 17 May 2019 12:57:14 +0000 (19:57 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Egor Kislitsyn [Fri, 17 May 2019 12:56:37 +0000 (19:56 +0700)]
Add `ap_id` to List
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
Egor Kislitsyn [Thu, 16 May 2019 10:54:24 +0000 (17:54 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
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
William Pitcock [Mon, 25 Mar 2019 01:23:15 +0000 (01:23 +0000)]
test: update obsolete test
William Pitcock [Mon, 25 Mar 2019 00:38:28 +0000 (00:38 +0000)]
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
William Pitcock [Mon, 25 Mar 2019 00:10:20 +0000 (00:10 +0000)]
activitypub: remove contain_timeline()
William Pitcock [Mon, 25 Mar 2019 00:06:02 +0000 (00:06 +0000)]
activitypub: add restrict_thread_visibility()
William Pitcock [Sun, 24 Mar 2019 23:45:57 +0000 (23:45 +0000)]
migrations: add function to see if a thread can be satisfied
lain [Wed, 15 May 2019 15:47:29 +0000 (17:47 +0200)]
Merge remote-tracking branch 'origin/develop' into conversations-import
kaniini [Wed, 15 May 2019 15:42:21 +0000 (15:42 +0000)]
Merge branch 'fix/public-option-not-working' into 'develop'
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
lambda [Wed, 15 May 2019 15:37:31 +0000 (15:37 +0000)]
Merge branch 'chore/extricate-http-signatures' into 'develop'
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
William Pitcock [Wed, 15 May 2019 15:29:42 +0000 (15:29 +0000)]
tests: fixup
kaniini [Wed, 15 May 2019 15:26:07 +0000 (15:26 +0000)]
Merge branch 'prevent-public-answers' into 'develop'
Prevent public answers to direct messages
See merge request pleroma/pleroma!1159
lambda [Wed, 15 May 2019 15:23:13 +0000 (15:23 +0000)]
Merge branch 'cleanup' into 'develop'
Remove unused queue from the config
See merge request pleroma/pleroma!1158
lambda [Wed, 15 May 2019 15:19:20 +0000 (15:19 +0000)]
Merge branch 'ci/coverage' into 'develop'
Excoveralls for code coverage
See merge request pleroma/pleroma!1156
feld [Wed, 15 May 2019 15:19:20 +0000 (15:19 +0000)]
Excoveralls for code coverage
lain [Wed, 15 May 2019 14:45:26 +0000 (16:45 +0200)]
Dependencies: Update Ecto SQL.
lain [Wed, 15 May 2019 14:35:33 +0000 (16:35 +0200)]
CommonAPI: Visibility refactor.
lain [Wed, 15 May 2019 14:30:08 +0000 (16:30 +0200)]
CommonAPI: Refactor visibility, forbid public to private replies.
rinpatch [Wed, 15 May 2019 10:56:19 +0000 (10:56 +0000)]
Merge branch 'legacy-fe-config' into 'develop'
remove deprecated PleromaFE configuration
See merge request pleroma/pleroma!1152
Sachin Joshi [Tue, 14 May 2019 17:52:08 +0000 (23:37 +0545)]
remove deprecated PleromaFE configuration
Egor Kislitsyn [Wed, 15 May 2019 07:40:20 +0000 (14:40 +0700)]
Remove unused queue from the config
Egor Kislitsyn [Wed, 15 May 2019 07:31:24 +0000 (14:31 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Aaron Tinio [Mon, 13 May 2019 15:07:11 +0000 (23:07 +0800)]
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
Aaron Tinio [Tue, 14 May 2019 00:21:44 +0000 (08:21 +0800)]
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
lambda [Tue, 14 May 2019 20:33:35 +0000 (20:33 +0000)]
Merge branch 'fix/raise-registration-api-ratelimit' into 'develop'
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
See merge request pleroma/pleroma!1154
rinpatch [Tue, 14 May 2019 20:16:34 +0000 (23:16 +0300)]
Fix rate-limiting tests
William Pitcock [Tue, 14 May 2019 20:03:13 +0000 (20:03 +0000)]
switch to pleroma/http_signatures library
rinpatch [Tue, 14 May 2019 19:47:23 +0000 (22:47 +0300)]
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)
Also in this commit: minor changelog improvements.
lambda [Tue, 14 May 2019 17:40:08 +0000 (17:40 +0000)]
Merge branch 'fix-the-build' into 'develop'
Group def perform() together to fix the build
See merge request pleroma/pleroma!1151
Mark Felder [Tue, 14 May 2019 17:33:03 +0000 (12:33 -0500)]
Group def perform() together to fix the build
lambda [Tue, 14 May 2019 15:41:37 +0000 (15:41 +0000)]
Merge branch 'fix/gopher' into 'develop'
gopher: fix rendering of post content (closes #895)
Closes #895
See merge request pleroma/pleroma!1150
William Pitcock [Tue, 14 May 2019 15:35:06 +0000 (15:35 +0000)]
gopher: fix rendering of post content (closes #895)
lambda [Tue, 14 May 2019 15:27:34 +0000 (15:27 +0000)]
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
William Pitcock [Tue, 14 May 2019 15:07:38 +0000 (15:07 +0000)]
clean up follow/block imports a little
kaniini [Tue, 14 May 2019 14:58:45 +0000 (14:58 +0000)]
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
lambda [Tue, 14 May 2019 14:49:45 +0000 (14:49 +0000)]
Merge branch 'refactor/oauth_controller_response' into 'develop'
Refactoring oauth response.
See merge request pleroma/pleroma!1149
Maksim [Tue, 14 May 2019 14:49:45 +0000 (14:49 +0000)]
Refactoring oauth response.
Egor Kislitsyn [Tue, 14 May 2019 13:27:40 +0000 (20:27 +0700)]
Add documentation
Egor Kislitsyn [Tue, 14 May 2019 13:14:51 +0000 (20:14 +0700)]
Update CHANGELOG
Egor Kislitsyn [Tue, 14 May 2019 13:12:47 +0000 (20:12 +0700)]
Add Tests
kaniini [Tue, 14 May 2019 12:06:08 +0000 (12:06 +0000)]
Merge branch 'feature/disable-account' into 'develop'
[#694] allow users to disable their own account
See merge request pleroma/pleroma!895
Egor Kislitsyn [Tue, 14 May 2019 12:00:07 +0000 (19:00 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Egor Kislitsyn [Tue, 14 May 2019 11:40:21 +0000 (18:40 +0700)]
Update CHANGELOG
Egor Kislitsyn [Tue, 14 May 2019 11:29:10 +0000 (18:29 +0700)]
Reuse query from User.restrict_deactivated/1
Egor Kislitsyn [Tue, 14 May 2019 11:15:56 +0000 (18:15 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Aaron Tinio [Mon, 13 May 2019 22:40:59 +0000 (06:40 +0800)]
Fix Pleroma.Config.get!/1 raising an error when value is false
rinpatch [Mon, 13 May 2019 21:27:07 +0000 (21:27 +0000)]
Merge branch 'changelog/adminfe' into 'develop'
Document AdminFE in changelog
See merge request pleroma/pleroma!1147
Mark Felder [Mon, 13 May 2019 21:11:06 +0000 (16:11 -0500)]
Document AdminFE in changelog
kaniini [Mon, 13 May 2019 21:07:50 +0000 (21:07 +0000)]
Merge branch 'bump-mastoapi' into 'develop'
Bump Mastodon API level
See merge request pleroma/pleroma!1146
projects / akkoma / log