6c06529cd4
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
...
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
2019-07-31 19:13:56 +00:00
813c686dd7
Disallow following locked accounts over OStatus
2019-07-31 22:05:12 +03:00
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
2019-07-31 18:35:15 +00:00
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
2019-07-31 18:17:31 +00:00
58443d0cd6
tests for TwitterApi/UtilController
2019-07-31 15:14:36 +00:00
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
3850812503
twitter api: utils: rework do_remote_follow() to use CommonAPI
...
Closes #1138
2019-07-29 20:00:57 +00:00
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
5795a890e9
markdown: clean up html generated by earmark
2019-07-29 19:09:58 +00:00
1dfde4151c
Merge branch 'refactor/use-constants' into 'develop'
...
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
2019-07-29 16:30:47 +00:00
0bee2131ce
Add `mailerEnabled` to the NodeInfo metadata
2019-07-29 16:17:40 +00:00
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
2019-07-29 16:17:22 +00:00
159bbec570
added tests for OstatusController
2019-07-29 05:02:20 +00:00
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
2019-07-28 21:32:04 +00:00
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
2019-07-26 20:27:38 +00:00
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
2019-07-24 19:29:01 +00:00
b20020da16
Show the url advertised in the Activity in the Status JSON response
2019-07-24 19:28:21 +00:00
ac27b94ffa
Change to not require `magic-public-key` on WebFinger
2019-07-25 00:21:32 +09:00
55341ac717
tests WebFinger
2019-07-24 15:13:10 +00:00
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
f5d574f4ed
check both item and parent domain blocks
2019-07-24 11:35:16 +01:00
48bd3be9cb
move domain block check to with block
2019-07-24 11:11:33 +01:00
4af4f6166b
honour domain blocks on streaming notifications
2019-07-24 11:09:06 +01:00
9c6357324e
Merge branch 'feature/admin-api-user-statuses' into 'develop'
...
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
2019-07-23 23:59:21 +00:00
d3bdb8e704
rich media: parser: splice the given URL into the result
2019-07-23 23:51:29 +00:00
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-24 02:42:28 +03:00
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
2019-07-24 01:51:36 +03:00
bd265acf91
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
...
Router: Remove deprecated AdminAPI endpoints
See merge request pleroma/pleroma!1466
2019-07-23 19:48:34 +00:00
90be91b0e0
Router: Remove deprecated AdminAPI endpoints
2019-07-23 21:35:25 +02:00
5e72554f3c
Admin config fix
2019-07-23 19:17:00 +00:00
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
2019-07-23 19:15:48 +00:00
6a79bb12c3
Fix function
2019-07-23 13:53:05 -05:00
fd287387a0
Do not notify subscribers for messages from users which are replies to others
2019-07-23 13:14:26 -05:00
e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
2019-07-23 19:47:27 +09:00
b70e659304
Feature/1087 wildcard option for blocks
2019-07-22 14:33:58 +00:00
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
f712ee879a
Bugfix: muted/blocked user notification streaming
2019-07-22 02:43:55 +00:00
05b5af8075
Add tests for users tasks and PleromaAuthenticator
2019-07-22 02:43:15 +00:00
a5d6287ba8
Hide blocked users from interactions
2019-07-22 02:42:29 +00:00
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
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
3368174785
Fix rich media parser failing when no TTL can be found by image TTL
...
setters
2019-07-21 18:22:22 +03:00
bc6c5c513a
router: ensure the AP sharedinbox path is registered first
2019-07-21 03:52:06 +00: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
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
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
2019-07-19 16:20:23 +00:00
kaniini