akkoma
5 years agoWIP
Mike Verdone [Wed, 24 Jul 2019 15:25:11 +0000 (17:25 +0200)]
WIP

5 years agoRevert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
Mike Verdone [Wed, 24 Jul 2019 15:09:59 +0000 (17:09 +0200)]
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"

This reverts commit 2981821db834448bf9b2ba26590314e36201664c.

5 years agofixup! Update changelog
Mike Verdone [Wed, 24 Jul 2019 15:07:51 +0000 (17:07 +0200)]
fixup! Update changelog

5 years agosquash! Expose expires_at datetime in mastoAPI only for the activity actor
Mike Verdone [Wed, 24 Jul 2019 14:51:09 +0000 (16:51 +0200)]
squash! Expose expires_at datetime in mastoAPI only for the activity actor

NOTE: rewrite the commit msg

5 years agoUpdate changelog to document expiring posts feature
Mike Verdone [Wed, 24 Jul 2019 11:02:28 +0000 (13:02 +0200)]
Update changelog to document expiring posts feature

5 years agoExpose expires_at datetime in mastoAPI only for the activity actor
Mike Verdone [Wed, 24 Jul 2019 10:43:20 +0000 (12:43 +0200)]
Expose expires_at datetime in mastoAPI only for the activity actor

In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.

The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.

5 years agoRequire that ephemeral posts live for at least one hour
Mike Verdone [Tue, 23 Jul 2019 14:33:45 +0000 (16:33 +0200)]
Require that ephemeral posts live for at least one hour

If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.

5 years agoAdd support for activity expiration to common and Masto API
Mike Verdone [Mon, 22 Jul 2019 14:46:20 +0000 (16:46 +0200)]
Add support for activity expiration to common and Masto API

The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.

At this point the API will not give you any feedback about if your post
will expire or not.

5 years agoAdd activity expiration worker
Mike Verdone [Mon, 22 Jul 2019 12:18:58 +0000 (14:18 +0200)]
Add activity expiration worker

This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.

5 years agoAdd activity expirations table
Mike Verdone [Mon, 22 Jul 2019 12:16:20 +0000 (14:16 +0200)]
Add activity expirations table

Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.

5 years agoMake test.exs read config in the same way as dev.exs
Mike Verdone [Mon, 22 Jul 2019 07:10:30 +0000 (09:10 +0200)]
Make test.exs read config in the same way as dev.exs

This way, if your test.secret.exs has an error, you'll actually see it.

5 years agoCleanup: fix a comment
Mike Verdone [Mon, 22 Jul 2019 14:45:54 +0000 (16:45 +0200)]
Cleanup: fix a comment

5 years agoMerge branch 'Fix-static-dir-doc' into 'develop'
kaniini [Wed, 24 Jul 2019 01:59:41 +0000 (01:59 +0000)]
Merge branch 'Fix-static-dir-doc' into 'develop'

Fix static_dir docs

See merge request pleroma/pleroma!1465

5 years agoAdd text about gitignore
aries [Wed, 24 Jul 2019 01:50:56 +0000 (01:50 +0000)]
Add text about gitignore

5 years agoMerge branch 'feature/admin-api-user-statuses' into 'develop'
kaniini [Tue, 23 Jul 2019 23:59:21 +0000 (23:59 +0000)]
Merge branch 'feature/admin-api-user-statuses' into 'develop'

Admin API: Endpoint for fetching latest user's statuses

See merge request pleroma/pleroma!1413

5 years agoMerge branch 'bugfix/rich-media-splice-url' into 'develop'
kaniini [Tue, 23 Jul 2019 23:59:06 +0000 (23:59 +0000)]
Merge branch 'bugfix/rich-media-splice-url' into 'develop'

rich media: parser: splice the given URL into the result

See merge request pleroma/pleroma!1480

5 years agorich media: parser: splice the given URL into the result
Ariadne Conill [Tue, 23 Jul 2019 22:58:31 +0000 (22:58 +0000)]
rich media: parser: splice the given URL into the result

5 years agoMerge branch 'develop' into feature/admin-api-user-statuses
Maxim Filippov [Tue, 23 Jul 2019 23:42:28 +0000 (02:42 +0300)]
Merge branch 'develop' into feature/admin-api-user-statuses

5 years agoAdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private...
Maxim Filippov [Tue, 23 Jul 2019 22:50:09 +0000 (01:50 +0300)]
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)

5 years agoMerge branch 'chore/update-mix-lock' into 'develop'
kaniini [Tue, 23 Jul 2019 19:59:15 +0000 (19:59 +0000)]
Merge branch 'chore/update-mix-lock' into 'develop'

update mix.lock

See merge request pleroma/pleroma!1478

5 years agoupdate mix.lock
Ariadne Conill [Tue, 23 Jul 2019 19:49:36 +0000 (19:49 +0000)]
update mix.lock

5 years agoMerge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
kaniini [Tue, 23 Jul 2019 19:48:34 +0000 (19:48 +0000)]
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'

Router: Remove deprecated AdminAPI endpoints

See merge request pleroma/pleroma!1466

5 years agoRouter: Remove deprecated AdminAPI endpoints
Haelwenn (lanodan) Monnier [Mon, 22 Jul 2019 11:41:56 +0000 (13:41 +0200)]
Router: Remove deprecated AdminAPI endpoints

5 years agoMerge branch 'admin-config-fix' into 'develop'
kaniini [Tue, 23 Jul 2019 19:17:00 +0000 (19:17 +0000)]
Merge branch 'admin-config-fix' into 'develop'

Admin config fix

See merge request pleroma/pleroma!1471

5 years agoAdmin config fix
Alexander Strizhakov [Tue, 23 Jul 2019 19:17:00 +0000 (19:17 +0000)]
Admin config fix

5 years agoMerge branch 'tests/activity_pub_publisher' into 'develop'
kaniini [Tue, 23 Jul 2019 19:15:48 +0000 (19:15 +0000)]
Merge branch 'tests/activity_pub_publisher' into 'develop'

tests for Pleroma.Web.ActivityPub.Publisher

See merge request pleroma/pleroma!1473

5 years agotests for Pleroma.Web.ActivityPub.Publisher
Maksim [Tue, 23 Jul 2019 19:15:48 +0000 (19:15 +0000)]
tests for Pleroma.Web.ActivityPub.Publisher

5 years agoMerge branch 'bugfix/unauthed-liked-by' into 'develop'
kaniini [Tue, 23 Jul 2019 19:14:43 +0000 (19:14 +0000)]
Merge branch 'bugfix/unauthed-liked-by' into 'develop'

Bugfix: don't error out on unauthorized request to liked/favourited_by

See merge request pleroma/pleroma!1474

5 years agoMerge branch 'patch-2' into 'develop'
kaniini [Tue, 23 Jul 2019 19:14:16 +0000 (19:14 +0000)]
Merge branch 'patch-2' into 'develop'

Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.

Closes #1050

See merge request pleroma/pleroma!1475

5 years agoMerge branch 'fix/subscriber-notifications' into 'develop'
kaniini [Tue, 23 Jul 2019 19:13:55 +0000 (19:13 +0000)]
Merge branch 'fix/subscriber-notifications' into 'develop'

Do not notify subscribers for messages from users which are replies to others

See merge request pleroma/pleroma!1477

5 years agoFix test
Mark Felder [Tue, 23 Jul 2019 18:57:22 +0000 (13:57 -0500)]
Fix test

5 years agoFix function
Mark Felder [Tue, 23 Jul 2019 18:53:05 +0000 (13:53 -0500)]
Fix function

5 years agomove unauth'd user blocks?/2 check
Sadposter [Tue, 23 Jul 2019 18:44:47 +0000 (19:44 +0100)]
move unauth'd user blocks?/2 check

5 years agoMerge branch 'bugfix/http-signatures-misskey' into 'develop'
Haelwenn [Tue, 23 Jul 2019 18:39:01 +0000 (18:39 +0000)]
Merge branch 'bugfix/http-signatures-misskey' into 'develop'

signature: properly deduce the actor from misskey key IDs

See merge request pleroma/pleroma!1476

5 years agoDo not notify subscribers for messages from users which are replies to others
Mark Felder [Tue, 23 Jul 2019 18:14:26 +0000 (13:14 -0500)]
Do not notify subscribers for messages from users which are replies to others

5 years agosignature: properly deduce the actor from misskey key IDs
Ariadne Conill [Tue, 23 Jul 2019 16:47:22 +0000 (16:47 +0000)]
signature: properly deduce the actor from misskey key IDs

5 years agoUpdate `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
oncletom [Tue, 23 Jul 2019 15:16:47 +0000 (15:16 +0000)]
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.

5 years agofix test names because i cannot type
Sadposter [Tue, 23 Jul 2019 14:47:17 +0000 (15:47 +0100)]
fix test names because i cannot type

5 years agoactually reblog on the reblog test
Sadposter [Tue, 23 Jul 2019 14:38:19 +0000 (15:38 +0100)]
actually reblog on the reblog test

5 years agoUse correct URL for tests
Sadposter [Tue, 23 Jul 2019 14:31:35 +0000 (15:31 +0100)]
Use correct URL for tests

5 years agoMix format
Sadposter [Tue, 23 Jul 2019 14:13:05 +0000 (15:13 +0100)]
Mix format

5 years agoadd tests for unauthed reqs to liked/reblogged_by
Sadposter [Tue, 23 Jul 2019 14:05:19 +0000 (15:05 +0100)]
add tests for unauthed reqs to liked/reblogged_by

5 years agofix unauthenticated req to favourited/rebloggd_by
Sadposter [Tue, 23 Jul 2019 14:02:18 +0000 (15:02 +0100)]
fix unauthenticated req to favourited/rebloggd_by

5 years agoremove pry
Maxim Filippov [Tue, 23 Jul 2019 09:30:37 +0000 (12:30 +0300)]
remove pry

5 years agoFix the sentence and add the setting example
Aries [Tue, 23 Jul 2019 00:55:58 +0000 (09:55 +0900)]
Fix the sentence and add the setting example

5 years agoMerge branch 'tests/skip-some-tests-on-mac' into 'develop'
kaniini [Mon, 22 Jul 2019 19:54:22 +0000 (19:54 +0000)]
Merge branch 'tests/skip-some-tests-on-mac' into 'develop'

Exclude tests that use :crypt.crypt/2 on macOS

See merge request pleroma/pleroma!1470

5 years agoExclude tests that use :crypt.crypt/2 on macOS
Sergey Suprunenko [Mon, 22 Jul 2019 19:54:22 +0000 (19:54 +0000)]
Exclude tests that use :crypt.crypt/2 on macOS

5 years agoMerge branch 'changelog' into 'develop'
kaniini [Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)]
Merge branch 'changelog' into 'develop'

changelog

See merge request pleroma/pleroma!1469

5 years agochangelog
Alexander Strizhakov [Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)]
changelog

5 years agoMerge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'
kaniini [Mon, 22 Jul 2019 14:33:58 +0000 (14:33 +0000)]
Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'

Feature/1087 wildcard option for blocks

Closes #1087

See merge request pleroma/pleroma!1467

5 years agoFeature/1087 wildcard option for blocks
Alexander Strizhakov [Mon, 22 Jul 2019 14:33:58 +0000 (14:33 +0000)]
Feature/1087 wildcard option for blocks

5 years agoMerge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
Haelwenn [Mon, 22 Jul 2019 11:01:35 +0000 (11:01 +0000)]
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'

activitypub: publisher: align sharedinbox usage with AP specification rules

See merge request pleroma/pleroma!1464

5 years agoFix static_dir docs
aries [Mon, 22 Jul 2019 09:46:32 +0000 (18:46 +0900)]
Fix static_dir docs

5 years agoMerge branch 'bugfix/muted-user-notif-streaming' into 'develop'
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

5 years agoBugfix: muted/blocked user notification streaming
Sadposter [Mon, 22 Jul 2019 02:43:55 +0000 (02:43 +0000)]
Bugfix: muted/blocked user notification streaming

5 years agoMerge branch 'tests/improve-test-coverage' into 'develop'
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

5 years agoAdd tests for users tasks and PleromaAuthenticator
Sergey Suprunenko [Mon, 22 Jul 2019 02:43:15 +0000 (02:43 +0000)]
Add tests for users tasks and PleromaAuthenticator

5 years agoMerge branch 'hide-blocked-from-interaction' into 'develop'
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

5 years agoHide blocked users from interactions
Sadposter [Mon, 22 Jul 2019 02:42:29 +0000 (02:42 +0000)]
Hide blocked users from interactions

5 years agoactivitypub: publisher: align sharedinbox usage with AP specification rules
Ariadne Conill [Mon, 22 Jul 2019 02:18:45 +0000 (02:18 +0000)]
activitypub: publisher: align sharedinbox usage with AP specification rules

While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification.  Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.

5 years agoMerge branch 'fix/rich-media-ttl-fallback' into 'develop'
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

5 years agoFix rich media parser failing when no TTL can be found by image TTL
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

5 years agoMerge branch 'bugfix/sharedinbox-path-first' into 'develop'
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

5 years agorouter: ensure the AP sharedinbox path is registered first
Ariadne Conill [Sun, 21 Jul 2019 03:52:06 +0000 (03:52 +0000)]
router: ensure the AP sharedinbox path is registered first

5 years agoMerge branch '1112-user-insert-conflict-id-preservation' into 'develop'
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

5 years agoMerge branch 'tests/mock-sha512-crypt' into 'develop'
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

5 years ago[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
Sergey Suprunenko [Sat, 20 Jul 2019 13:07:51 +0000 (13:07 +0000)]
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest

5 years ago[#1112] Preserving `id` on user insert conflict on order not to violate conversation_...
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.

5 years agoMerge branch 'feature/matstodon-statuses-by-name' into 'develop'
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

5 years agoMerge branch 'develop' into feature/matstodon-statuses-by-name
Mark Felder [Fri, 19 Jul 2019 21:55:10 +0000 (16:55 -0500)]
Merge branch 'develop' into feature/matstodon-statuses-by-name

5 years agoMerge branch 'feature/richmedia-ttl' into 'develop'
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

5 years agoMerge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'
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

5 years agomix: add pleroma.user unsubscribe_all_from_instance
Ariadne Conill [Fri, 19 Jul 2019 19:11:04 +0000 (19:11 +0000)]
mix: add pleroma.user unsubscribe_all_from_instance

5 years agoMerge branch 'refactor/http-signature-plug' into 'develop'
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

5 years agoMerge branch 'issue/1110' into 'develop'
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

5 years ago#1110 fixed /api/pleroma/healthcheck
Maksim [Fri, 19 Jul 2019 16:20:23 +0000 (16:20 +0000)]
#1110 fixed /api/pleroma/healthcheck

5 years agoMerge branch 'patch-2' into 'develop'
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

5 years agoFix domain for the contact clients.md
tom79 [Fri, 19 Jul 2019 08:40:47 +0000 (08:40 +0000)]
Fix domain for the contact clients.md

5 years agoUpdate clients.md for Fedilab
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

5 years agoupdate the docs
Sachin Joshi [Fri, 19 Jul 2019 06:05:47 +0000 (11:50 +0545)]
update the docs

5 years agochange the structure of image ttl parsar
Sachin Joshi [Fri, 19 Jul 2019 05:58:42 +0000 (11:43 +0545)]
change the structure of image ttl parsar

5 years agoMerge branch 'develop' into feature/admin-api-user-statuses
Maxim Filippov [Thu, 18 Jul 2019 20:38:38 +0000 (23:38 +0300)]
Merge branch 'develop' into feature/admin-api-user-statuses

5 years agomapped signature plug: use `user` assign like authentication plug
Ariadne Conill [Thu, 18 Jul 2019 20:31:25 +0000 (20:31 +0000)]
mapped signature plug: use `user` assign like authentication plug

5 years agoMerge branch 'tests/authentication_plug' into 'develop'
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

5 years agotests for Plugs.AuthenticationPlug
Maksim [Thu, 18 Jul 2019 20:29:51 +0000 (20:29 +0000)]
tests for Plugs.AuthenticationPlug

5 years agotests: add tests for mapped signature plug
Ariadne Conill [Thu, 18 Jul 2019 16:28:36 +0000 (16:28 +0000)]
tests: add tests for mapped signature plug

5 years agomapped signature plug: fix user lookup
Ariadne Conill [Thu, 18 Jul 2019 16:27:50 +0000 (16:27 +0000)]
mapped signature plug: fix user lookup

5 years agomapped signature plug: don't invalidate in cases where a signature is actually not...
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)

5 years agomix: update http signatures dependency
Ariadne Conill [Thu, 18 Jul 2019 15:51:58 +0000 (15:51 +0000)]
mix: update http signatures dependency

5 years agoplugs: add MappedSignatureToIdentityPlug
Ariadne Conill [Thu, 18 Jul 2019 15:38:45 +0000 (15:38 +0000)]
plugs: add MappedSignatureToIdentityPlug

5 years agosignature: make key_id_to_actor_id() public
Ariadne Conill [Thu, 18 Jul 2019 15:35:42 +0000 (15:35 +0000)]
signature: make key_id_to_actor_id() public

5 years agohttp signature plug: remove redundant checks handled by HTTPSignatures library
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.

5 years agoMerge branch 'feature/signed-object-fetches' into 'develop'
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

5 years agoMerge branch 'tests/uploads' into 'develop'
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

5 years agotests for Uploader with webhook
Maksim [Thu, 18 Jul 2019 12:30:18 +0000 (12:30 +0000)]
tests for Uploader with webhook

5 years agoMerge branch 'fix-howto_mediaproxy' into 'develop'
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

5 years agoFix redirect setting not working
aries [Thu, 18 Jul 2019 12:08:31 +0000 (21:08 +0900)]
Fix redirect setting not working

5 years agoupdate changelog
Ariadne Conill [Wed, 17 Jul 2019 23:07:53 +0000 (23:07 +0000)]
update changelog

5 years agotests: add tests for signed object fetches
Ariadne Conill [Wed, 17 Jul 2019 22:58:52 +0000 (22:58 +0000)]
tests: add tests for signed object fetches

5 years agoMerge branch 'patch-2' into 'develop'
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