19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
2019-03-03 18:29:37 +02:00
ace4231628
Merge branch 'features/bio_rel_me' into 'develop'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
2019-03-03 16:00:49 +00:00
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
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
2019-03-03 15:51:32 +00:00
413cf00cc3
Merge branch 'atomic-note-count-updates' into 'develop'
...
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
2019-03-03 15:50:41 +00:00
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
2019-03-03 15:49:19 +00:00
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
2019-03-03 15:48:00 +00:00
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.
2019-03-03 18:42:27 +03:00
af0039a3a0
Use atomic update for note count and follower count
2019-03-03 17:41:34 +03:00
8a1e0c9bee
Added migration to update existing user note counters
2019-03-03 15:35:32 +03:00
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
2019-03-03 11:13:59 +00:00
c46950d3b1
Increment user note count only on public activities
2019-03-03 14:08:43 +03:00
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
2019-03-02 22:18:56 +03:00
08c6aeeed7
Add docs
2019-03-02 17:32:46 +03:00
bf30df99cb
We do not guarantee the order of elements when we search
2019-03-02 17:32:40 +03:00
2ec8cf5665
Add pagination to search
2019-03-02 17:21:30 +03:00
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
2019-03-02 06:39:07 +00:00
f2452d5700
Pleroma.User: mix format
2019-03-02 07:04:49 +01:00
7b9868f343
Pleroma.UserTest: Add tests for rel=me
2019-03-02 06:59:09 +01:00
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
2019-03-02 06:58:42 +01:00
39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call
2019-03-02 06:57:28 +01:00
3d22642352
Pleroma.User: Pass an array to profile_urls
2019-03-02 06:33:15 +01:00
9b83236fb0
Pleroma.Web.RelMe: fixups
2019-03-02 06:32:03 +01:00
25e588496a
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
2019-03-02 06:31:33 +01:00
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
2019-03-02 05:36:48 +01:00
bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting
2019-03-02 04:10:57 +01:00
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
2019-03-02 04:04:16 +01:00
f635b675b2
Refactor a little bit
2019-03-01 21:17:23 +03:00
a25c1313ae
Format
2019-03-01 21:07:05 +03:00
aaa9fed1ca
Fix user_test
2019-03-01 20:58:47 +03:00
f384a9a256
Format
2019-03-01 20:23:19 +03:00
f1a4c3163b
Show current user in users list as well
2019-03-01 20:23:03 +03:00
5b08b470f6
Add "local" params to users search
2019-03-01 20:13:02 +03:00
adac745512
Add docs to /users/search
2019-03-01 17:34:14 +03:00
9c6abec4d8
use commonapi.post instead of activitybulder
2019-03-01 15:48:04 +03:00
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
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
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
85734c0d49
Added migration for setting default tags in existing users records
2019-03-01 14:02:25 +03:00
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
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
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
2019-03-01 09:37:29 +03:00
6b2a1ad1c8
config: fix chat endpoint path
2019-02-28 17:00:54 +00:00
28b4093233
mastodon websocket: return errors using ok, not stop
2019-02-28 16:23:55 +00:00
388a3f4ca2
mastodon websocket: bring back infinity timeout
2019-02-28 16:23:24 +00:00
46f29b9da1
Add search users endpoint
2019-02-28 19:04:47 +03:00
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
2019-02-28 16:02:48 +00:00
9aec00d711
config: update config for cowboy 2 endpoints
2019-02-28 15:44:12 +00:00
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
2019-02-28 15:44:12 +00:00
e10ca35b3d
mix: update dependencies for cowboy 2.0
2019-02-28 15:44:07 +00:00
link0ff