Commit graph

2280 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier
4c440f12c3
[Credo] Fix the consistency 2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings 2019-03-13 04:17:30 +01:00
Maxim Filippov
25eb6cf1cb Add "roles" to users admin API 2019-03-12 22:15:28 +03:00
kaniini
c231ed610a Merge branch 'masto-api-followers-following' into 'develop'
MastoAPI followers/following endpoints

See merge request pleroma/pleroma!924
2019-03-12 16:27:47 +00:00
eugenijm
984b5f8adf MastoAPI followers/following endpoints 2019-03-12 16:01:24 +03:00
kaniini
4aa285e6ce Merge branch 'add-screenname-extension-to-masto-api' into 'develop'
MastoAPI Accounts: Add fetching by nickname.

See merge request pleroma/pleroma!922
2019-03-11 21:43:46 +00:00
lain
07277879e5 Linting. 2019-03-11 19:32:21 +01:00
lain
600f428db4 WebPush: Add activity id to the push messages.
Makes it easier to relate the push to a given status.
2019-03-11 19:23:21 +01:00
lain
3474066f6d MastoAPI Accounts: Add fetching by nickname.
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
2019-03-11 15:18:32 +01:00
lambda
2c8deecdd2 Merge branch 'add-local-field-to-status' into 'develop'
MastoAPI StatusView: Add locality indicator.

See merge request pleroma/pleroma!920
2019-03-11 13:26:12 +00:00
lambda
d9ae2d00a1 Merge branch 'feat/style-oauth-login-page' into 'develop'
Style again the OAuth login page to fit pleroma more

See merge request pleroma/pleroma!921
2019-03-11 13:19:24 +00:00
Shpuld Shpuldson
50edead11c Remove chromium input hilight that clashes with our own 2019-03-11 15:10:42 +02:00
Shpuld Shpuldson
8ddbedcd9a Style again the login page to fit pleroma more 2019-03-11 14:57:04 +02:00
lain
4811eefa6e MastoAPI StatusView: Add locality indicator. 2019-03-11 13:48:27 +01:00
eugenijm
6038c8a753 Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec 2019-03-11 09:02:03 +03:00
William Pitcock
19afd9f81f http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout 2019-03-08 22:56:16 +00:00
kaniini
735f40047a Merge branch 'delete-status' into 'develop'
Allow an admin to delete a user status #721 (MastoAPI)

See merge request pleroma/pleroma!914
2019-03-08 22:47:41 +00:00
kaniini
130fc9eae6 Merge branch 'fetch-posts-on-first-federation' into 'develop'
Fetch user's outbox posts on first federation with that user

Closes #131

See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
eugenijm
2827dfea50 Allow an admin to delete a user status 2019-03-08 20:21:56 +03:00
Ekaterina Vaartis
5021b7836f Fetch user's outbox posts on first federation with that user 2019-03-08 16:27:56 +03:00
William Pitcock
e53a9fd15e MRF: anti followbot: gracefully handle accounts without a display name 2019-03-07 12:13:48 +00:00
rinpatch
992145e64c Merge branch 'bugfix/delete-activity-audience' into 'develop'
expand the audience of delete activities to all recipients of the deleted object

Closes #682

See merge request pleroma/pleroma!891
2019-03-07 11:31:08 +00:00
c2faae70df Adjust delete activity audience to match the deleted object 2019-03-07 12:26:03 +01:00
6a69ece437 Revert existing object check 2019-03-07 11:53:15 +01:00
eugenijm
7342b5a45f Preserve parameters in link headers (Mastodon API) 2019-03-07 09:12:16 +03:00
kaniini
0fe715f3ba Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users

See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
kaniini
07f8c79a69 Merge branch 'bugfix/rel-me_list' into 'develop'
Web.RelMe: Fix having other values in rel attr

See merge request pleroma/pleroma!901
2019-03-06 13:20:51 +00:00
Maksim
bc7570c282 [#647] tests for web push 2019-03-06 13:20:12 +00:00
28d5b40d0a Add handling of objects not in database 2019-03-05 23:15:22 +01:00
rinpatch
bcd8ef65e0 Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo

Closes #689

See merge request pleroma/pleroma!899
2019-03-05 07:05:44 +00:00
Haelwenn (lanodan) Monnier
788a354ce0
Web.RelMe: Fix having other values in rel attr
One example of this is Github which puts a rel="nofollow me" on the
profile link.
2019-03-05 02:13:22 +01:00
eugenijm
d1de0a30cc Include admins in nodeinfo 2019-03-05 03:17:24 +03:00
Maxim Filippov
2d30fc279f Typo 2019-03-05 02:11:15 +03:00
William Pitcock
b7aa1ea9e6 rich media: helpers: rework validate_page_url() 2019-03-04 18:39:13 +00:00
William Pitcock
9f3cb38012 helpers: use AutoLinker to validate URIs as well as the other tests 2019-03-04 18:31:49 +00:00
William Pitcock
d38d537bee rich media: don't crawl bogus URIs 2019-03-04 18:31:49 +00:00
kaniini
d45dbdce5a Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts)

Closes #696

See merge request pleroma/pleroma!897
2019-03-04 18:29:13 +00:00
Maxim Filippov
f620199836 Merge search endpoint into /users 2019-03-04 21:26:32 +03:00
Maxim Filippov
0245ce842f Remove unused code 2019-03-04 20:49:20 +03:00
Maxim Filippov
cc7b35e097 Add status text to notifications (mentions and reposts) 2019-03-04 20:47:34 +03:00
kaniini
ca5d894e68 Merge branch 'fix/like-adressing' into 'develop'
Stop adresssing like activities to actor's follower collection on non-public posts

See merge request pleroma/pleroma!896
2019-03-04 15:59:57 +00:00
rinpatch
33c614bce0 Stop adresssing like activities to actor's follower collection on non-public posts 2019-03-04 18:09:58 +03:00
kaniini
10248d86a2 Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI

Closes #690

See merge request pleroma/pleroma!889
2019-03-04 13:25:32 +00:00
1445dc25d4 fix format 2019-03-04 11:18:45 +01:00
aab86698a5 Expand "to" of delete activities 2019-03-04 11:18:45 +01:00
eugenijm
86e4b48a5e Fix DM visibility for blocking users 2019-03-04 06:24:27 +03:00
eugenijm
594694607c Unify Mastodon and Twitter follow implementations using CommonAPI 2019-03-04 01:00:37 +03:00
kaniini
dd5865535e Merge branch 'muting' into 'develop'
Don't stream muted accounts

See merge request pleroma/pleroma!888
2019-03-03 21:10:10 +00:00