36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
93df0796f0
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
...
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
2019-07-19 21:59:18 +00:00
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-19 16:55:10 -05:00
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
2019-07-19 21:36:36 +00:00
c1c64d6d06
Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'
...
mix: add pleroma.user unsubscribe_all_from_instance
See merge request pleroma/pleroma!1454
2019-07-19 19:33:47 +00:00
9a8eb2c94d
mix: add pleroma.user unsubscribe_all_from_instance
2019-07-19 19:25:29 +00:00
716afc83ce
Merge branch 'refactor/http-signature-plug' into 'develop'
...
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
2019-07-19 16:57:24 +00:00
6561709742
Merge branch 'issue/1110' into 'develop'
...
#1110 fixed /api/pleroma/healthcheck
Closes #1110
See merge request pleroma/pleroma!1453
2019-07-19 16:20:23 +00:00
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
2019-07-19 16:20:23 +00:00
505613f6a7
Merge branch 'patch-2' into 'develop'
...
Update clients.md for Fedilab
See merge request pleroma/pleroma!1452
2019-07-19 10:15:16 +00:00
5c4a555b1d
Fix domain for the contact clients.md
2019-07-19 08:40:47 +00:00
b0b9eca37d
Update clients.md for Fedilab
...
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
2019-07-19 08:39:22 +00:00
581756ccc5
update the docs
2019-07-19 11:50:47 +05:45
de9906ad56
change the structure of image ttl parsar
2019-07-19 11:43:42 +05:45
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-18 23:38:38 +03:00
c947cfec5a
mapped signature plug: use `user` assign like authentication plug
2019-07-18 20:31:25 +00:00
16cfee708e
Merge branch 'tests/authentication_plug' into 'develop'
...
tests for Plugs.AuthenticationPlug
See merge request pleroma/pleroma!1450
2019-07-18 20:29:51 +00:00
f435217e50
tests for Plugs.AuthenticationPlug
2019-07-18 20:29:51 +00:00
621cacf667
tests: add tests for mapped signature plug
2019-07-18 16:28:36 +00:00
a8af0ac053
mapped signature plug: fix user lookup
2019-07-18 16:27:50 +00:00
5ea0cd69f7
mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)
2019-07-18 16:01:21 +00:00
cdf0038d0f
mix: update http signatures dependency
2019-07-18 15:53:01 +00:00
184fa61fb3
plugs: add MappedSignatureToIdentityPlug
2019-07-18 15:38:45 +00:00
18d8d12d53
signature: make key_id_to_actor_id() public
2019-07-18 15:35:42 +00:00
88d064d80e
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.
2019-07-18 15:11:21 +00:00
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
2019-07-18 13:27:50 +00:00
1485d75f3c
Merge branch 'tests/uploads' into 'develop'
...
tests for Uploader with webhook
See merge request pleroma/pleroma!1447
2019-07-18 12:30:18 +00:00
b6b748d3e7
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
e2c39e1cc0
Merge branch 'fix-howto_mediaproxy' into 'develop'
...
Fix media proxy doc redirect setting not working
See merge request pleroma/pleroma!1448
2019-07-18 12:29:26 +00:00
129078eddc
Fix redirect setting not working
2019-07-18 21:08:31 +09:00
7bb50bfccc
update changelog
2019-07-17 23:07:53 +00:00
1345e0c2bf
tests: add tests for signed object fetches
2019-07-17 23:06:16 +00:00
0e502cb836
Merge branch 'patch-2' into 'develop'
...
Update clients.md - added Homepage for Fedilab Android app
See merge request pleroma/pleroma!1444
2019-07-17 23:03:46 +00:00
cffe8229a5
Update clients.md - added Homepage for Fedilab Android app
2019-07-17 23:03:46 +00:00
a51ee5fae5
Merge branch 'patch-3' into 'develop'
...
Update otp_en.md - Added creation of initial admin user
See merge request pleroma/pleroma!1445
2019-07-17 23:03:30 +00:00
399acd4c42
fetcher: sign object fetches if configured
2019-07-17 22:58:46 +00:00
cdecef2a08
Update otp_en.md - Added creation of initial admin user
2019-07-17 22:35:16 +00:00
b2a8ccf37f
config: add sign_object_fetches option
2019-07-17 21:38:06 +00:00
1e48af9acf
Merge branch 'feature/instance-fetch-actor' into 'develop'
...
instance fetch service actor
See merge request pleroma/pleroma!1440
2019-07-17 19:45:40 +00:00
60b54ee64a
Merge branch 'feature/http-signatures-keyid' into 'develop'
...
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
2019-07-17 19:44:14 +00:00
f84fb340b7
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.
2019-07-17 19:18:19 +00:00
1e3aff6ef1
mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989
2019-07-17 19:00:26 +00:00
348307ec19
Merge branch 'password-reset-fix-for-non-test-env' into 'develop'
...
Fix password reset for non-test env
See merge request pleroma/pleroma!1441
2019-07-17 18:09:31 +00:00
4bf2bb9cff
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.
2019-07-17 18:09:31 +00:00
c119835102
update changelog
2019-07-17 17:49:21 +00:00
3d23a12d75
tests: add test for fetching the internal fetch actor
2019-07-17 17:48:08 +00:00
cf9cb953d5
activitypub: represent internal fetch actor
2019-07-17 17:34:57 +00:00
d930e5d5c3
activitypub: introduce internal fetch service actor
2019-07-17 17:14:08 +00:00
62e5ff624e
user: add is_internal_user? helper function
2019-07-17 17:12:42 +00:00
0a6f6e1b5b
webfinger: allow resolution of usernames with dots in them (internal actors)
2019-07-17 16:59:29 +00:00
Roman Chvanikov