Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,390 Commits 1 Branch 0 Tags 222 MiB
17d3d05a71
Commit Graph

4390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kaniini
c63a45cd0e Merge branch 'dm-visibility-for-blocking-users' into 'develop' 
Fix DM visibility for blocking users #698

Closes #698

See merge request pleroma/pleroma!890
 2019-03-04 13:20:17 +00:00
KokaKiwi
bf43f055dd Set content types settings on mastofe endpoint. 2019-03-04 12:00:02 +01:00
KokaKiwi
b57913b13a Fix supported TLS versions as TLS 1.3 support seems buggy. 2019-03-04 11:30:26 +01:00
Karen Konou
896f8580dd Merge branch 'bugfix/delete-activity-audience' of git.pleroma.social:pleroma/pleroma into bugfix/delete-activity-audience 2019-03-04 11:22:17 +01:00
Karen Konou
1445dc25d4 fix format 2019-03-04 11:18:45 +01:00
Karen Konou
aab86698a5 Expand "to" of delete activities 2019-03-04 11:18:45 +01:00
Karen Konou
8302cdb5dc Expand "to" of delete activities 2019-03-04 10:47:04 +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
William Pearson
818a7894da Don't stream muted accounts 2019-03-03 20:54:53 +00:00
link0ff
88a672fe88 Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well 2019-03-03 21:20:36 +02:00
rinpatch
8543e7f760 Merge branch 'remove-todo-txt' into 'develop' 
Remove TODO.txt

See merge request pleroma/pleroma!887
 2019-03-03 17:39:46 +00:00
rinpatch
9962121bff Remove TODO.txt 2019-03-03 20:32:46 +03:00
link0ff
19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-03 18:29:37 +02:00
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
 2019-03-03 16:00:49 +00: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
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
 2019-03-03 15:51:32 +00:00
kaniini
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
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
 2019-03-03 15:49:19 +00:00
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
 2019-03-03 15:48:00 +00:00
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.
 2019-03-03 18:42:27 +03:00
eugenijm
af0039a3a0 Use atomic update for note count and follower count 2019-03-03 17:41:34 +03:00
eugenijm
8a1e0c9bee Added migration to update existing user note counters 2019-03-03 15:35:32 +03:00
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
 2019-03-03 11:13:59 +00:00
eugenijm
c46950d3b1 Increment user note count only on public activities 2019-03-03 14:08:43 +03:00
eugenijm
1a1f4520cd Use sql query in User.get_follow_requests/1 for filtering logic 2019-03-02 22:18:56 +03:00
Maxim Filippov
08c6aeeed7 Add docs 2019-03-02 17:32:46 +03:00
Maxim Filippov
bf30df99cb We do not guarantee the order of elements when we search 2019-03-02 17:32:40 +03:00
Maxim Filippov
2ec8cf5665 Add pagination to search 2019-03-02 17:21:30 +03:00
rinpatch
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
Haelwenn (lanodan) Monnier
f2452d5700
Pleroma.User: mix format 2019-03-02 07:04:49 +01:00
Haelwenn (lanodan) Monnier
7b9868f343
Pleroma.UserTest: Add tests for rel=me 2019-03-02 06:59:09 +01:00
Haelwenn (lanodan) Monnier
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil 2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier
39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call 2019-03-02 06:57:28 +01:00
Haelwenn (lanodan) Monnier
3d22642352
Pleroma.User: Pass an array to profile_urls 2019-03-02 06:33:15 +01:00
Haelwenn (lanodan) Monnier
9b83236fb0
Pleroma.Web.RelMe: fixups 2019-03-02 06:32:03 +01:00
Haelwenn (lanodan) Monnier
25e588496a
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe 2019-03-02 06:31:33 +01:00
Haelwenn (lanodan) Monnier
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile 2019-03-02 05:36:48 +01:00
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