William Pearson
818a7894da
Don't stream muted accounts
6 years ago
link0ff
88a672fe88
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
6 years ago
rinpatch
8543e7f760
Merge branch 'remove-todo-txt' into 'develop'
...
Remove TODO.txt
See merge request pleroma/pleroma!887
6 years ago
rinpatch
9962121bff
Remove TODO.txt
6 years ago
link0ff
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
kaniini
ace4231628
Merge branch 'features/bio_rel_me' into 'develop'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
6 years ago
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
6 years ago
kaniini
b531e366df
Merge branch 'get-follow-requests-sql' into 'develop'
...
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
6 years ago
kaniini
413cf00cc3
Merge branch 'atomic-note-count-updates' into 'develop'
...
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
6 years ago
kaniini
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
6 years ago
kaniini
dfdbb6f125
Merge branch 'remove-follow-request-count' into 'develop'
...
Remove follow_request_count as it's not needed for FE anymore.
See merge request pleroma/pleroma!886
6 years ago
eugenijm
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
6 years ago
eugenijm
af0039a3a0
Use atomic update for note count and follower count
6 years ago
eugenijm
8a1e0c9bee
Added migration to update existing user note counters
6 years ago
lambda
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
6 years ago
eugenijm
c46950d3b1
Increment user note count only on public activities
6 years ago
eugenijm
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
6 years ago
Maxim Filippov
08c6aeeed7
Add docs
6 years ago
Maxim Filippov
bf30df99cb
We do not guarantee the order of elements when we search
6 years ago
Maxim Filippov
2ec8cf5665
Add pagination to search
6 years ago
rinpatch
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
6 years ago
Haelwenn (lanodan) Monnier
f2452d5700
Pleroma.User: mix format
6 years ago
Haelwenn (lanodan) Monnier
7b9868f343
Pleroma.UserTest: Add tests for rel=me
6 years ago
Haelwenn (lanodan) Monnier
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
6 years ago
Haelwenn (lanodan) Monnier
39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call
6 years ago
Haelwenn (lanodan) Monnier
3d22642352
Pleroma.User: Pass an array to profile_urls
6 years ago
Haelwenn (lanodan) Monnier
9b83236fb0
Pleroma.Web.RelMe: fixups
6 years ago
Haelwenn (lanodan) Monnier
25e588496a
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
6 years ago
Haelwenn (lanodan) Monnier
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
6 years ago
Haelwenn (lanodan) Monnier
bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting
6 years ago
Haelwenn (lanodan) Monnier
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
6 years ago
Maxim Filippov
f635b675b2
Refactor a little bit
6 years ago
Maxim Filippov
a25c1313ae
Format
6 years ago
Maxim Filippov
aaa9fed1ca
Fix user_test
6 years ago
Maxim Filippov
f384a9a256
Format
6 years ago
Maxim Filippov
f1a4c3163b
Show current user in users list as well
6 years ago
Maxim Filippov
5b08b470f6
Add "local" params to users search
6 years ago
Maxim Filippov
adac745512
Add docs to /users/search
6 years ago
rinpatch
9c6abec4d8
use commonapi.post instead of activitybulder
6 years ago
kaniini
b91a6dd85e
Merge branch 'hotfix/http-date-header' into 'develop'
...
activitypub: fix date header format
See merge request pleroma/pleroma!879
6 years ago
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).
6 years ago
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
6 years ago
eugenijm
85734c0d49
Added migration for setting default tags in existing users records
6 years ago
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
6 years ago
lambda
b37b26ab87
Merge branch 'feature/cowboy2' into 'develop'
...
upgrade to cowboy 2.6
See merge request pleroma/pleroma!876
6 years ago
rinpatch
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
6 years ago
William Pitcock
6b2a1ad1c8
config: fix chat endpoint path
6 years ago
William Pitcock
28b4093233
mastodon websocket: return errors using ok, not stop
6 years ago
William Pitcock
388a3f4ca2
mastodon websocket: bring back infinity timeout
6 years ago
Maxim Filippov
46f29b9da1
Add search users endpoint
6 years ago