Commit graph

4249 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting 2019-03-02 04:10:57 +01:00
Haelwenn (lanodan) Monnier
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response 2019-03-02 04:04:16 +01:00
Maxim Filippov
f635b675b2 Refactor a little bit 2019-03-01 21:17:23 +03:00
Maxim Filippov
a25c1313ae Format 2019-03-01 21:07:05 +03:00
Maxim Filippov
aaa9fed1ca Fix user_test 2019-03-01 20:58:47 +03:00
Maxim Filippov
f384a9a256 Format 2019-03-01 20:23:19 +03:00
Maxim Filippov
f1a4c3163b Show current user in users list as well 2019-03-01 20:23:03 +03:00
Maxim Filippov
5b08b470f6 Add "local" params to users search 2019-03-01 20:13:02 +03:00
Maxim Filippov
adac745512 Add docs to /users/search 2019-03-01 17:34:14 +03:00
rinpatch
9c6abec4d8 use commonapi.post instead of activitybulder 2019-03-01 15:48:04 +03:00
kaniini
b91a6dd85e Merge branch 'hotfix/http-date-header' into 'develop'
activitypub: fix date header format

See merge request pleroma/pleroma!879
2019-03-01 12:28:08 +00:00
William Pitcock
689b0730f8 activitypub: fix date header format
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
2019-03-01 12:22:45 +00:00
kaniini
1fc1b0d935 Merge branch 'default-tags-for-existing-users' into 'develop'
Migration for adding tags to the existing users records

See merge request pleroma/pleroma!878
2019-03-01 11:09:36 +00:00
eugenijm
85734c0d49 Added migration for setting default tags in existing users records 2019-03-01 14:02:25 +03:00
lambda
2f00814475 Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
Bugfix #236 Prefer user look-up by nickname

See merge request pleroma/pleroma!860
2019-03-01 09:48:24 +00:00
lambda
b37b26ab87 Merge branch 'feature/cowboy2' into 'develop'
upgrade to cowboy 2.6

See merge request pleroma/pleroma!876
2019-03-01 09:42:34 +00:00
rinpatch
1341ee650e [#675] Do not show DMs in mentions timeline 2019-03-01 09:37:29 +03:00
William Pitcock
6b2a1ad1c8 config: fix chat endpoint path 2019-02-28 17:00:54 +00: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
Maxim Filippov
46f29b9da1 Add search users endpoint 2019-02-28 19:04:47 +03: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
9aec00d711 config: update config for cowboy 2 endpoints 2019-02-28 15:44:12 +00:00
William Pitcock
bc53dff5b6 mastodon api: websocket: update code for cowboy 2.x 2019-02-28 15:44:12 +00:00
William Pitcock
e10ca35b3d mix: update dependencies for cowboy 2.0 2019-02-28 15:44:07 +00:00
Maxim Filippov
70e82a3465 Add test for the second page 2019-02-28 17:54:02 +03:00
Maxim Filippov
72b7a0797e Use Mastodon API views in Admin API 2019-02-28 17:43:09 +03:00
href
a47cc5a2cf Merge branch 'customizable_auth' into 'develop'
Authenticator tweaks

See merge request pleroma/pleroma!875
2019-02-28 11:18:01 +00:00
Ivan Tashkinov
3281a3f074 Renamed *DatabaseAuthenticator to *Authenticator. 2019-02-28 14:12:41 +03:00
Ivan Tashkinov
4e77f68414 Added auth_template/0 to DatabaseAuthenticator. 2019-02-28 13:58:58 +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
href
90a24fbf95 Merge branch 'customizable_auth' into 'develop'
Auth customization support

See merge request pleroma/pleroma!852
2019-02-28 10:12:26 +00:00
kaniini
089e2588a3 Merge branch 'speedup-follow-requests' into 'develop'
Speedup follow requests

Closes #677

See merge request pleroma/pleroma!871
2019-02-28 10:10:03 +00:00
kaniini
3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop'
Add activation status to the regular user view

See merge request pleroma/pleroma!874
2019-02-28 10:08:31 +00:00
Ivan Tashkinov
b6f915313f Made auth customization be runtime-configurable. 2019-02-28 13:00:54 +03:00
lambda
9cc98b496e Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'
mastodon api: embed relationship card under account card for Pleroma FE convenience

See merge request pleroma/pleroma!870
2019-02-28 07:35:26 +00:00
eugenijm
6b11011039 Added deactivated to the user view 2019-02-28 09:08:34 +03:00
Maxim Filippov
2883f75a3a Add pagination to users admin API 2019-02-28 01:11:56 +03:00
lain
bbbdbec4fd Remove parts of the old activity view.
Not used anymore.
2019-02-27 17:24:51 +01:00
lain
9ade1242c2 Add user muted status info to twitterapi. 2019-02-27 16:52:03 +01:00
lain
c1ae495878 Add user muted status info to MastodonAPI. 2019-02-27 16:46:47 +01:00
lain
c4235f96bd Add with_muted param. 2019-02-27 16:37:42 +01:00
lain
b24cc44e8d Follower requests: Utilize object index.
Closes #677
2019-02-27 15:01:54 +01:00
lain
8d8cb08f94 Add follow request test. 2019-02-27 14:51:07 +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
kaniini
14bc6bd40f Merge branch 'fix/formatter' into 'develop'
Bugfix: markdown in formatter

Closes #688

See merge request pleroma/pleroma!869
2019-02-27 08:45:43 +00:00
Egor Kislitsyn
5d961d536c fix formatter 2019-02-27 15:40:30 +07:00
kaniini
a50a47a011 Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'
Add missing docs and tests to Admin API

See merge request pleroma/pleroma!868
2019-02-27 07:28:10 +00:00
Maxim Filippov
ed7fd6b47e Add missing docs and tests 2019-02-27 03:08:03 +03:00
kaniini
1c265b3b19 Merge branch 'auto_linker' into 'develop'
AutoLinker

Closes #609

See merge request pleroma/pleroma!839
2019-02-26 23:32:26 +00:00