eugenijm
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
2019-03-13 20:28:36 +03:00
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
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
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
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
2019-03-11 13:48:27 +01: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
eugenijm
7342b5a45f
Preserve parameters in link headers (Mastodon API)
2019-03-07 09:12:16 +03:00
Maksim
bc7570c282
[ #647 ] tests for web push
2019-03-06 13:20:12 +00: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
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
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
Maxim Filippov
5b08b470f6
Add "local" params to users search
2019-03-01 20:13:02 +03:00
William Pitcock
28b4093233
mastodon websocket: return errors using ok, not stop
2019-02-28 16:23:55 +00:00
William Pitcock
388a3f4ca2
mastodon websocket: bring back infinity timeout
2019-02-28 16:23:24 +00:00
William Pitcock
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
2019-02-28 16:02:48 +00:00
William Pitcock
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
2019-02-28 15:44:12 +00:00
Maxim Filippov
72b7a0797e
Use Mastodon API views in Admin API
2019-02-28 17:43:09 +03:00
kaniini
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
2019-02-28 10:22:19 +00:00
lain
c1ae495878
Add user muted status info to MastodonAPI.
2019-02-27 16:46:47 +01:00
William Pitcock
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
2019-02-27 13:01:10 +00:00
lain
9e0686efa6
Move visibility into own module.
2019-02-22 13:29:52 +01:00
lain
62296f5a25
Fix private post card handling.
2019-02-22 12:02:51 +01:00
Egor
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
lain
59c27f29c8
Add some nicer urls in status view.
2019-02-20 17:36:16 +01:00
Ivan Tashkinov
b574d97c2e
[ #468 ] Added support for push OAuth scope (Mastodon 2.4+).
2019-02-20 17:27:41 +03:00
Ivan Tashkinov
6fe7acd58e
[ #468 ] Merged upstream/develop.
2019-02-20 16:48:59 +03:00
Ekaterina Vaartis
5a46d37af9
Update the mute implementation to the current codebase
...
Make it part of the info thing (and do a migration to ensure it's there)
2019-02-19 23:09:16 +03:00
Ekaterina Vaartis
da64ea4a55
Implement mastodon mutes endpoint
...
Aparently i forgot to add it, it gets a list of muted users
2019-02-19 21:49:55 +03:00
Ekaterina Vaartis
f41f017bbc
Implement muting, add it to the mastodon API
2019-02-19 21:49:55 +03:00
Ivan Tashkinov
c0ecbf6669
[ #468 ] Merged upstream/develop.
2019-02-19 19:10:55 +03:00
kaniini
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
2019-02-18 04:01:51 +00:00
kaniini
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
2019-02-18 04:01:26 +00:00
Ivan Tashkinov
bc4f77b10b
[ #468 ] Merged upstream/develop, resolved conflicts.
2019-02-17 14:07:04 +03:00
Ivan Tashkinov
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
2019-02-17 13:49:14 +03:00
Haelwenn (lanodan) Monnier
4df455f69b
[MastoAPI] Add switching of frontend flavours
2019-02-16 19:50:13 +01:00
rinpatch
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
2019-02-16 20:38:25 +03:00
Ivan Tashkinov
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
2019-02-15 19:54:37 +03:00
eugenijm
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the follow,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
2019-02-15 12:20:20 +03:00
Ivan Tashkinov
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
2019-02-14 17:03:19 +03:00
Ivan Tashkinov
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.
2019-02-14 00:29:29 +03:00
Karen Konou
ac72b578da
Merge branch 'develop' into feature/thread-muting
2019-02-11 12:10:49 +01:00
Karen Konou
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
2019-02-11 12:04:02 +01:00
Karen Konou
cc21fc5f53
refactor, status view updating, error handling
2019-02-10 10:42:30 +01:00
Haelwenn (lanodan) Monnier
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier
8bcfac93a8
Make credo happy
2019-02-09 14:59:20 +01:00
Karen Konou
98ec578f4d
Merge branch 'develop' into feature/thread-muting
2019-02-08 12:44:02 +01:00
