summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-04local -> only_localMaxim Filippov
2019-03-04Format & update docsMaxim Filippov
2019-03-04helpers: use AutoLinker to validate URIs as well as the other testsWilliam Pitcock
2019-03-04tests: add tests for rich media helper functionsWilliam Pitcock
2019-03-04rich media: don't crawl bogus URIsWilliam Pitcock
2019-03-04Merge branch 'feature/add-status-text-to-notifications' into 'develop'kaniini
Add status text to notifications (mentions and reposts) Closes #696 See merge request pleroma/pleroma!897
2019-03-04Merge search endpoint into /usersMaxim Filippov
2019-03-04Remove unused codeMaxim Filippov
2019-03-04Add status text to notifications (mentions and reposts)Maxim Filippov
2019-03-04Merge branch 'fix/like-adressing' into 'develop'kaniini
Stop adresssing like activities to actor's follower collection on non-public posts See merge request pleroma/pleroma!896
2019-03-04Stop adresssing like activities to actor's follower collection on non-public ↵rinpatch
posts
2019-03-04Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-03-04Merge branch 'unify-follow' into 'develop'kaniini
Unify follow code with CommonAPI Closes #690 See merge request pleroma/pleroma!889
2019-03-04Merge branch 'dm-visibility-for-blocking-users' into 'develop'kaniini
Fix DM visibility for blocking users #698 Closes #698 See merge request pleroma/pleroma!890
2019-03-04allow users to disable their own accountEgor Kislitsyn
2019-03-04Set content types settings on mastofe endpoint.KokaKiwi
2019-03-04Fix supported TLS versions as TLS 1.3 support seems buggy.KokaKiwi
2019-03-04Merge branch 'bugfix/delete-activity-audience' of ↵Karen Konou
git.pleroma.social:pleroma/pleroma into bugfix/delete-activity-audience
2019-03-04fix formatKaren Konou
2019-03-04Expand "to" of delete activitiesKaren Konou
2019-03-04Expand "to" of delete activitiesKaren Konou
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