Haelwenn (lanodan) Monnier
90be91b0e0
Router: Remove deprecated AdminAPI endpoints
2019-07-23 21:35:25 +02:00
Haelwenn
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
2019-07-22 11:01:35 +00:00
kaniini
7271b2a954
Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'
...
Bugfix: muted/blocked user notification streaming
Closes #1105
See merge request pleroma/pleroma!1461
2019-07-22 02:43:55 +00:00
Sadposter
f712ee879a
Bugfix: muted/blocked user notification streaming
2019-07-22 02:43:55 +00:00
kaniini
24362cbb3c
Merge branch 'tests/improve-test-coverage' into 'develop'
...
Add tests for users tasks and PleromaAuthenticator
See merge request pleroma/pleroma!1462
2019-07-22 02:43:15 +00:00
Sergey Suprunenko
05b5af8075
Add tests for users tasks and PleromaAuthenticator
2019-07-22 02:43:15 +00:00
kaniini
b391211aa3
Merge branch 'hide-blocked-from-interaction' into 'develop'
...
Hide blocked users from interactions
See merge request pleroma/pleroma!1463
2019-07-22 02:42:29 +00:00
Sadposter
a5d6287ba8
Hide blocked users from interactions
2019-07-22 02:42:29 +00:00
Ariadne Conill
56019d53a8
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.
2019-07-22 02:38:31 +00:00
kaniini
a00aab3402
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
2019-07-21 16:05:58 +00:00
rinpatch
3368174785
Fix rich media parser failing when no TTL can be found by image TTL
...
setters
2019-07-21 18:22:22 +03:00
kaniini
1689a11a80
Merge branch 'bugfix/sharedinbox-path-first' into 'develop'
...
router: ensure the AP sharedinbox path is registered first
See merge request pleroma/pleroma!1458
2019-07-21 04:18:12 +00:00
Ariadne Conill
bc6c5c513a
router: ensure the AP sharedinbox path is registered first
2019-07-21 03:52:06 +00:00
kaniini
fe548f322e
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
2019-07-20 13:09:38 +00:00
kaniini
6e99e7c774
Merge branch 'tests/mock-sha512-crypt' into 'develop'
...
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
Closes #1114
See merge request pleroma/pleroma!1455
2019-07-20 13:07:51 +00:00
Sergey Suprunenko
43a7cd27fe
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
2019-07-20 13:07:51 +00:00
Ivan Tashkinov
d0198fe215
[ #1112 ] Preserving id
on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
2019-07-20 13:03:34 +03:00
feld
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
Mark Felder
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-19 16:55:10 -05:00
kaniini
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
kaniini
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
Ariadne Conill
9a8eb2c94d
mix: add pleroma.user unsubscribe_all_from_instance
2019-07-19 19:25:29 +00:00
kaniini
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
kaniini
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
Maksim
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
2019-07-19 16:20:23 +00:00
rinpatch
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
tom79
5c4a555b1d
Fix domain for the contact clients.md
2019-07-19 08:40:47 +00:00
tom79
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
Sachin Joshi
581756ccc5
update the docs
2019-07-19 11:50:47 +05:45
Sachin Joshi
de9906ad56
change the structure of image ttl parsar
2019-07-19 11:43:42 +05:45
Ariadne Conill
c947cfec5a
mapped signature plug: use user
assign like authentication plug
2019-07-18 20:31:25 +00:00
kaniini
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
Maksim
f435217e50
tests for Plugs.AuthenticationPlug
2019-07-18 20:29:51 +00:00
Ariadne Conill
621cacf667
tests: add tests for mapped signature plug
2019-07-18 16:28:36 +00:00
Ariadne Conill
a8af0ac053
mapped signature plug: fix user lookup
2019-07-18 16:27:50 +00:00
Ariadne Conill
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
Ariadne Conill
cdf0038d0f
mix: update http signatures dependency
2019-07-18 15:53:01 +00:00
Ariadne Conill
184fa61fb3
plugs: add MappedSignatureToIdentityPlug
2019-07-18 15:38:45 +00:00
Ariadne Conill
18d8d12d53
signature: make key_id_to_actor_id() public
2019-07-18 15:35:42 +00:00
Ariadne Conill
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
kaniini
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
kaniini
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
Maksim
b6b748d3e7
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
kaniini
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
aries
129078eddc
Fix redirect setting not working
2019-07-18 21:08:31 +09:00
Ariadne Conill
7bb50bfccc
update changelog
2019-07-17 23:07:53 +00:00
Ariadne Conill
1345e0c2bf
tests: add tests for signed object fetches
2019-07-17 23:06:16 +00:00
kaniini
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
tallship
cffe8229a5
Update clients.md - added Homepage for Fedilab Android app
2019-07-17 23:03:46 +00:00
kaniini
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