summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-04Fix DM visibility for blocking userseugenijm
2019-03-04Unify Mastodon and Twitter follow implementations using CommonAPIeugenijm
2019-03-03Merge branch 'muting' into 'develop'kaniini
Don't stream muted accounts See merge request pleroma/pleroma!888
2019-03-03Don't stream muted accountsWilliam Pearson
2019-03-03Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange ↵link0ff
with grant_type as well
2019-03-03Merge branch 'remove-todo-txt' into 'develop'rinpatch
Remove TODO.txt See merge request pleroma/pleroma!887
2019-03-03Remove TODO.txtrinpatch
2019-03-03Merge remote-tracking branch 'upstream/develop' into feature/openldap-supportlink0ff
2019-03-03Merge branch 'features/bio_rel_me' into 'develop'kaniini
Add rel=me to the User bio Closes #423 See merge request pleroma/pleroma!813
2019-03-03Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'kaniini
Add pagination and search to users See merge request pleroma/pleroma!873
2019-03-03Merge branch 'get-follow-requests-sql' into 'develop'kaniini
Use sql query in User.get_follow_requests/1 for filtering logic See merge request pleroma/pleroma!883
2019-03-03Merge branch 'atomic-note-count-updates' into 'develop'kaniini
Atomic update for note count and follower count See merge request pleroma/pleroma!885
2019-03-03Merge branch 'count-only-public-statuses' into 'develop'kaniini
Increment user note count only on public activities #703 See merge request pleroma/pleroma!884
2019-03-03Merge branch 'remove-follow-request-count' into 'develop'kaniini
Remove follow_request_count as it's not needed for FE anymore. See merge request pleroma/pleroma!886
2019-03-03Remove follow_request_count as it's not needed for FE anymore.eugenijm
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-03Use atomic update for note count and follower counteugenijm
2019-03-03Added migration to update existing user note counterseugenijm
2019-03-03Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'lambda
[#675] Do not show DMs in mentions timeline See merge request pleroma/pleroma!877
2019-03-03Increment user note count only on public activitieseugenijm
2019-03-02Use sql query in User.get_follow_requests/1 for filtering logiceugenijm
2019-03-02Add docsMaxim Filippov
2019-03-02We do not guarantee the order of elements when we searchMaxim Filippov
2019-03-02Add pagination to searchMaxim Filippov
2019-03-02Merge branch 'bugfix/oauth-scopes-join' into 'develop'rinpatch
Bugfix: OAuth scopes formatting Closes #702 See merge request pleroma/pleroma!881
2019-03-02Pleroma.User: mix formatHaelwenn (lanodan) Monnier
2019-03-02Pleroma.UserTest: Add tests for rel=meHaelwenn (lanodan) Monnier
2019-03-02RelMe.maybe_put_rel_me/2: When true put "me" otherwise nilHaelwenn (lanodan) Monnier
2019-03-02Pleroma.User: Fix syntax and user.ap_id callHaelwenn (lanodan) Monnier
2019-03-02Pleroma.User: Pass an array to profile_urlsHaelwenn (lanodan) Monnier
2019-03-02Pleroma.Web.RelMe: fixupsHaelwenn (lanodan) Monnier
2019-03-02Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMeHaelwenn (lanodan) Monnier
2019-03-02Pleroma.User: Add rel=me to URLs where it linkbacks to the profileHaelwenn (lanodan) Monnier
2019-03-02Web.OAuth.OAuthControllerTest: Add test against token formattingHaelwenn (lanodan) Monnier
2019-03-02Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth responseHaelwenn (lanodan) Monnier
2019-03-01Refactor a little bitMaxim Filippov
2019-03-01FormatMaxim Filippov
2019-03-01Fix user_testMaxim Filippov
2019-03-01FormatMaxim Filippov
2019-03-01Show current user in users list as wellMaxim Filippov
2019-03-01Add "local" params to users searchMaxim Filippov
2019-03-01Add docs to /users/searchMaxim Filippov
2019-03-01use commonapi.post instead of activitybulderrinpatch
2019-03-01Merge branch 'hotfix/http-date-header' into 'develop'kaniini
activitypub: fix date header format See merge request pleroma/pleroma!879
2019-03-01activitypub: fix date header formatWilliam Pitcock
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-01Merge branch 'default-tags-for-existing-users' into 'develop'kaniini
Migration for adding tags to the existing users records See merge request pleroma/pleroma!878
2019-03-01Added migration for setting default tags in existing users recordseugenijm
2019-03-01Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'lambda
Bugfix #236 Prefer user look-up by nickname See merge request pleroma/pleroma!860
2019-03-01Merge branch 'feature/cowboy2' into 'develop'lambda
upgrade to cowboy 2.6 See merge request pleroma/pleroma!876
2019-03-01[#675] Do not show DMs in mentions timelinerinpatch
2019-02-28config: fix chat endpoint pathWilliam Pitcock