Aries [Tue, 23 Jul 2019 00:55:58 +0000 (09:55 +0900)]
Fix the sentence and add the setting example
aries [Mon, 22 Jul 2019 09:46:32 +0000 (18:46 +0900)]
Fix static_dir docs
kaniini [Mon, 22 Jul 2019 02:43:55 +0000 (02:43 +0000)]
Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'
Bugfix: muted/blocked user notification streaming
Closes #1105
See merge request pleroma/pleroma!1461
Sadposter [Mon, 22 Jul 2019 02:43:55 +0000 (02:43 +0000)]
Bugfix: muted/blocked user notification streaming
kaniini [Mon, 22 Jul 2019 02:43:15 +0000 (02:43 +0000)]
Merge branch 'tests/improve-test-coverage' into 'develop'
Add tests for users tasks and PleromaAuthenticator
See merge request pleroma/pleroma!1462
Sergey Suprunenko [Mon, 22 Jul 2019 02:43:15 +0000 (02:43 +0000)]
Add tests for users tasks and PleromaAuthenticator
kaniini [Mon, 22 Jul 2019 02:42:29 +0000 (02:42 +0000)]
Merge branch 'hide-blocked-from-interaction' into 'develop'
Hide blocked users from interactions
See merge request pleroma/pleroma!1463
Sadposter [Mon, 22 Jul 2019 02:42:29 +0000 (02:42 +0000)]
Hide blocked users from interactions
kaniini [Sun, 21 Jul 2019 16:05:58 +0000 (16:05 +0000)]
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
Fix rich media parser failing when no TTL can be found by image TTL setters
See merge request pleroma/pleroma!1460
rinpatch [Sun, 21 Jul 2019 15:22:22 +0000 (18:22 +0300)]
Fix rich media parser failing when no TTL can be found by image TTL
setters
kaniini [Sun, 21 Jul 2019 04:18:12 +0000 (04:18 +0000)]
Merge branch 'bugfix/sharedinbox-path-first' into 'develop'
router: ensure the AP sharedinbox path is registered first
See merge request pleroma/pleroma!1458
Ariadne Conill [Sun, 21 Jul 2019 03:52:06 +0000 (03:52 +0000)]
router: ensure the AP sharedinbox path is registered first
kaniini [Sat, 20 Jul 2019 13:09:38 +0000 (13:09 +0000)]
Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'
[#1112] Preserving `id` on user insert conflict
Closes #1112
See merge request pleroma/pleroma!1456
kaniini [Sat, 20 Jul 2019 13:07:51 +0000 (13:07 +0000)]
Merge branch 'tests/mock-sha512-crypt' into 'develop'
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
Closes #1114
See merge request pleroma/pleroma!1455
Sergey Suprunenko [Sat, 20 Jul 2019 13:07:51 +0000 (13:07 +0000)]
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
Ivan Tashkinov [Sat, 20 Jul 2019 10:03:34 +0000 (13:03 +0300)]
[#1112] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
feld [Fri, 19 Jul 2019 21:59:18 +0000 (21:59 +0000)]
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
Mark Felder [Fri, 19 Jul 2019 21:55:10 +0000 (16:55 -0500)]
Merge branch 'develop' into feature/matstodon-statuses-by-name
kaniini [Fri, 19 Jul 2019 21:36:36 +0000 (21:36 +0000)]
Merge branch 'feature/richmedia-ttl' into 'develop'
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
kaniini [Fri, 19 Jul 2019 19:33:47 +0000 (19:33 +0000)]
Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'
mix: add pleroma.user unsubscribe_all_from_instance
See merge request pleroma/pleroma!1454
Ariadne Conill [Fri, 19 Jul 2019 19:11:04 +0000 (19:11 +0000)]
mix: add pleroma.user unsubscribe_all_from_instance
kaniini [Fri, 19 Jul 2019 16:57:24 +0000 (16:57 +0000)]
Merge branch 'refactor/http-signature-plug' into 'develop'
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
kaniini [Fri, 19 Jul 2019 16:20:23 +0000 (16:20 +0000)]
Merge branch 'issue/1110' into 'develop'
#1110 fixed /api/pleroma/healthcheck
Closes #1110
See merge request pleroma/pleroma!1453
Maksim [Fri, 19 Jul 2019 16:20:23 +0000 (16:20 +0000)]
#1110 fixed /api/pleroma/healthcheck
rinpatch [Fri, 19 Jul 2019 10:15:16 +0000 (10:15 +0000)]
Merge branch 'patch-2' into 'develop'
Update clients.md for Fedilab
See merge request pleroma/pleroma!1452
tom79 [Fri, 19 Jul 2019 08:40:47 +0000 (08:40 +0000)]
Fix domain for the contact clients.md
tom79 [Fri, 19 Jul 2019 08:39:22 +0000 (08:39 +0000)]
Update clients.md for Fedilab
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
Sachin Joshi [Fri, 19 Jul 2019 06:05:47 +0000 (11:50 +0545)]
update the docs
Sachin Joshi [Fri, 19 Jul 2019 05:58:42 +0000 (11:43 +0545)]
change the structure of image ttl parsar
Ariadne Conill [Thu, 18 Jul 2019 20:31:25 +0000 (20:31 +0000)]
mapped signature plug: use `user` assign like authentication plug
kaniini [Thu, 18 Jul 2019 20:29:51 +0000 (20:29 +0000)]
Merge branch 'tests/authentication_plug' into 'develop'
tests for Plugs.AuthenticationPlug
See merge request pleroma/pleroma!1450
Maksim [Thu, 18 Jul 2019 20:29:51 +0000 (20:29 +0000)]
tests for Plugs.AuthenticationPlug
Ariadne Conill [Thu, 18 Jul 2019 16:28:36 +0000 (16:28 +0000)]
tests: add tests for mapped signature plug
Ariadne Conill [Thu, 18 Jul 2019 16:27:50 +0000 (16:27 +0000)]
mapped signature plug: fix user lookup
Ariadne Conill [Thu, 18 Jul 2019 16:01:21 +0000 (16:01 +0000)]
mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)
Ariadne Conill [Thu, 18 Jul 2019 15:51:58 +0000 (15:51 +0000)]
mix: update http signatures dependency
Ariadne Conill [Thu, 18 Jul 2019 15:38:45 +0000 (15:38 +0000)]
plugs: add MappedSignatureToIdentityPlug
Ariadne Conill [Thu, 18 Jul 2019 15:35:42 +0000 (15:35 +0000)]
signature: make key_id_to_actor_id() public
Ariadne Conill [Thu, 18 Jul 2019 15:06:58 +0000 (15:06 +0000)]
http signature plug: remove redundant checks handled by HTTPSignatures library
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests. but now, the adapter has been corrected.
kaniini [Thu, 18 Jul 2019 13:27:50 +0000 (13:27 +0000)]
Merge branch 'feature/signed-object-fetches' into 'develop'
signed object fetches
See merge request pleroma/pleroma!1446
kaniini [Thu, 18 Jul 2019 12:30:18 +0000 (12:30 +0000)]
Merge branch 'tests/uploads' into 'develop'
tests for Uploader with webhook
See merge request pleroma/pleroma!1447
Maksim [Thu, 18 Jul 2019 12:30:18 +0000 (12:30 +0000)]
tests for Uploader with webhook
kaniini [Thu, 18 Jul 2019 12:29:26 +0000 (12:29 +0000)]
Merge branch 'fix-howto_mediaproxy' into 'develop'
Fix media proxy doc redirect setting not working
See merge request pleroma/pleroma!1448
aries [Thu, 18 Jul 2019 12:08:31 +0000 (21:08 +0900)]
Fix redirect setting not working
Ariadne Conill [Wed, 17 Jul 2019 23:07:53 +0000 (23:07 +0000)]
update changelog
Ariadne Conill [Wed, 17 Jul 2019 22:58:52 +0000 (22:58 +0000)]
tests: add tests for signed object fetches
kaniini [Wed, 17 Jul 2019 23:03:46 +0000 (23:03 +0000)]
Merge branch 'patch-2' into 'develop'
Update clients.md - added Homepage for Fedilab Android app
See merge request pleroma/pleroma!1444
tallship [Wed, 17 Jul 2019 23:03:46 +0000 (23:03 +0000)]
Update clients.md - added Homepage for Fedilab Android app
kaniini [Wed, 17 Jul 2019 23:03:30 +0000 (23:03 +0000)]
Merge branch 'patch-3' into 'develop'
Update otp_en.md - Added creation of initial admin user
See merge request pleroma/pleroma!1445
Ariadne Conill [Wed, 17 Jul 2019 22:41:42 +0000 (22:41 +0000)]
fetcher: sign object fetches if configured
Bradley D. Thornton [Wed, 17 Jul 2019 22:35:16 +0000 (22:35 +0000)]
Update otp_en.md - Added creation of initial admin user
Ariadne Conill [Wed, 17 Jul 2019 21:38:06 +0000 (21:38 +0000)]
config: add sign_object_fetches option
kaniini [Wed, 17 Jul 2019 19:45:40 +0000 (19:45 +0000)]
Merge branch 'feature/instance-fetch-actor' into 'develop'
instance fetch service actor
See merge request pleroma/pleroma!1440
kaniini [Wed, 17 Jul 2019 19:44:14 +0000 (19:44 +0000)]
Merge branch 'feature/http-signatures-keyid' into 'develop'
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
Ariadne Conill [Wed, 17 Jul 2019 19:18:19 +0000 (19:18 +0000)]
http signatures: derive actor ID from key ID.
Almost all AP servers return their key ID as the actor URI with #main-key
added. Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
Ariadne Conill [Wed, 17 Jul 2019 19:00:26 +0000 (19:00 +0000)]
mix: bump http_signatures dependency to
a2a5982fa167fb1352fbd518ce6b606ba233a989
kaniini [Wed, 17 Jul 2019 18:09:31 +0000 (18:09 +0000)]
Merge branch 'password-reset-fix-for-non-test-env' into 'develop'
Fix password reset for non-test env
See merge request pleroma/pleroma!1441
Eugenij [Wed, 17 Jul 2019 18:09:31 +0000 (18:09 +0000)]
Fix password reset for non-test env
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
Ariadne Conill [Wed, 17 Jul 2019 17:49:21 +0000 (17:49 +0000)]
update changelog
Ariadne Conill [Wed, 17 Jul 2019 17:48:08 +0000 (17:48 +0000)]
tests: add test for fetching the internal fetch actor
Ariadne Conill [Wed, 17 Jul 2019 17:34:57 +0000 (17:34 +0000)]
activitypub: represent internal fetch actor
Ariadne Conill [Wed, 17 Jul 2019 17:14:08 +0000 (17:14 +0000)]
activitypub: introduce internal fetch service actor
Ariadne Conill [Wed, 17 Jul 2019 17:12:42 +0000 (17:12 +0000)]
user: add is_internal_user? helper function
Ariadne Conill [Wed, 17 Jul 2019 16:59:29 +0000 (16:59 +0000)]
webfinger: allow resolution of usernames with dots in them (internal actors)
Ariadne Conill [Wed, 17 Jul 2019 16:22:57 +0000 (16:22 +0000)]
activitypub: controller: rework the way the relay actor is presented so the code can be reused
Ariadne Conill [Wed, 17 Jul 2019 15:48:51 +0000 (15:48 +0000)]
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
kaniini [Wed, 17 Jul 2019 15:28:41 +0000 (15:28 +0000)]
Merge branch 'feature/mention-mrf' into 'develop'
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
RX14 [Wed, 17 Jul 2019 13:55:47 +0000 (14:55 +0100)]
Add MRF MentionPolicy for dropping posts which mention specific actors
kaniini [Tue, 16 Jul 2019 21:44:50 +0000 (21:44 +0000)]
Merge branch 'feature/1078-password-reset' into 'develop'
Feature/1078 password reset
Closes #1078
See merge request pleroma/pleroma!1431
Alexander Strizhakov [Tue, 16 Jul 2019 21:44:50 +0000 (21:44 +0000)]
mastoapi password reset
added rate limit to password reset
configure rate limit in runtime
kaniini [Tue, 16 Jul 2019 21:35:43 +0000 (21:35 +0000)]
Merge branch 'tests/upload_filters' into 'develop'
added tests for Pleroma.Upload.Filter
See merge request pleroma/pleroma!1434
Maksim [Tue, 16 Jul 2019 21:35:43 +0000 (21:35 +0000)]
added tests for Pleroma.Upload.Filter
kaniini [Tue, 16 Jul 2019 21:35:12 +0000 (21:35 +0000)]
Merge branch '1094-relation-actions-rate-limiting' into 'develop'
[#1094] Rate-limited follow & unfollow actions.
Closes #1094
See merge request pleroma/pleroma!1436
Sachin Joshi [Tue, 16 Jul 2019 16:52:36 +0000 (22:37 +0545)]
add the rich media ttl based on image exp time
Ivan Tashkinov [Tue, 16 Jul 2019 16:59:02 +0000 (16:59 +0000)]
Apply suggestion to docs/config.md
Ivan Tashkinov [Tue, 16 Jul 2019 16:18:30 +0000 (19:18 +0300)]
[#1094] Rate-limited follow & unfollow actions.
kaniini [Tue, 16 Jul 2019 11:14:46 +0000 (11:14 +0000)]
Merge branch 'add-deactivated-to-account-view' into 'develop'
Add `pleroma.deactivated` to the Account entity (Mastodon API)
See merge request pleroma/pleroma!1433
Eugenij [Tue, 16 Jul 2019 11:14:46 +0000 (11:14 +0000)]
Add `pleroma.deactivated` to the Account entity (Mastodon API)
kaniini [Tue, 16 Jul 2019 11:04:11 +0000 (11:04 +0000)]
Merge branch 'add-blocked-by-to-relationship' into 'develop'
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
See merge request pleroma/pleroma!1429
Eugenij [Tue, 16 Jul 2019 11:04:11 +0000 (11:04 +0000)]
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
kaniini [Tue, 16 Jul 2019 10:49:24 +0000 (10:49 +0000)]
Merge branch 'feature/addressable-lists' into 'develop'
Fix typo
See merge request pleroma/pleroma!1432
Egor Kislitsyn [Tue, 16 Jul 2019 07:56:07 +0000 (14:56 +0700)]
Fix typo
rinpatch [Tue, 16 Jul 2019 06:06:22 +0000 (06:06 +0000)]
Merge branch 'bugfix/poll-id-as-string' into 'develop'
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
lain [Tue, 16 Jul 2019 05:01:18 +0000 (14:01 +0900)]
Mastodon Controller: Fix tests.
lain [Tue, 16 Jul 2019 03:47:40 +0000 (12:47 +0900)]
Status View: Poll ids are strings.
All ids in mastodon are strings, in general.
Mark Felder [Mon, 15 Jul 2019 22:10:33 +0000 (17:10 -0500)]
Add changelog entry for Mastodon API change
Mark Felder [Mon, 15 Jul 2019 22:10:27 +0000 (17:10 -0500)]
Merge branch 'develop' into feature/matstodon-statuses-by-name
feld [Mon, 15 Jul 2019 22:04:58 +0000 (22:04 +0000)]
Merge branch 'match-file-name' into 'develop'
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
feld [Mon, 15 Jul 2019 21:43:04 +0000 (21:43 +0000)]
Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'
Remove dead link from the installation docs
See merge request pleroma/pleroma!1428
Eugenij [Mon, 15 Jul 2019 21:43:04 +0000 (21:43 +0000)]
Remove dead link from the installation docs
kaniini [Mon, 15 Jul 2019 19:47:23 +0000 (19:47 +0000)]
Merge branch 'tests/mastodon-common-api' into 'develop'
Add more tests for MastodonAPIController and CommonAPI
See merge request pleroma/pleroma!1425
Sergey Suprunenko [Mon, 15 Jul 2019 19:47:23 +0000 (19:47 +0000)]
Add more tests for MastodonAPIController and CommonAPI
kaniini [Mon, 15 Jul 2019 19:46:31 +0000 (19:46 +0000)]
Merge branch 'fix/1091-notifications-query' into 'develop'
Notifications query fix
Closes #1091
See merge request pleroma/pleroma!1427
Alex S [Mon, 15 Jul 2019 17:53:07 +0000 (20:53 +0300)]
query fix
kaniini [Mon, 15 Jul 2019 16:13:17 +0000 (16:13 +0000)]
Merge branch 'sha512-crypt' into 'develop'
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
Sachin Joshi [Mon, 15 Jul 2019 15:45:56 +0000 (21:30 +0545)]
Merge branch 'develop' into match-file-name
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
Moonman [Mon, 15 Jul 2019 15:36:51 +0000 (08:36 -0700)]
formatting
kaniini [Mon, 15 Jul 2019 13:02:59 +0000 (13:02 +0000)]
Merge branch 'update-tzdata' into 'develop'
Dependencies: Update tzdata and related packages.
See merge request pleroma/pleroma!1423
kaniini [Mon, 15 Jul 2019 13:01:58 +0000 (13:01 +0000)]
Merge branch 'admin-configure-atom-keys' into 'develop'
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
kaniini [Mon, 15 Jul 2019 13:01:22 +0000 (13:01 +0000)]
Merge branch 'tests/http_signature' into 'develop'
tests for Pleroma.Signature
See merge request pleroma/pleroma!1426
projects / akkoma / log