summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-03-03Merge branch 'get-follow-requests-sql' into 'develop'kaniini
2019-03-03Merge branch 'atomic-note-count-updates' into 'develop'kaniini
2019-03-03Merge branch 'count-only-public-statuses' into 'develop'kaniini
2019-03-03Merge branch 'remove-follow-request-count' into 'develop'kaniini
2019-03-03Remove follow_request_count as it's not needed for FE anymore.eugenijm
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
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-02Merge branch 'bugfix/oauth-scopes-join' into 'develop'rinpatch
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-01use commonapi.post instead of activitybulderrinpatch
2019-03-01Merge branch 'hotfix/http-date-header' into 'develop'kaniini
2019-03-01activitypub: fix date header formatWilliam Pitcock
2019-03-01Merge branch 'default-tags-for-existing-users' into 'develop'kaniini
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
2019-03-01Merge branch 'feature/cowboy2' into 'develop'lambda
2019-03-01[#675] Do not show DMs in mentions timelinerinpatch
2019-02-28config: fix chat endpoint pathWilliam Pitcock
2019-02-28mastodon websocket: return errors using ok, not stopWilliam Pitcock
2019-02-28mastodon websocket: bring back infinity timeoutWilliam Pitcock
2019-02-28mastodon websocket: use pattern match to get query data, robustly handle errorsWilliam Pitcock
2019-02-28config: update config for cowboy 2 endpointsWilliam Pitcock
2019-02-28mastodon api: websocket: update code for cowboy 2.xWilliam Pitcock
2019-02-28mix: update dependencies for cowboy 2.0William Pitcock
2019-02-28Merge branch 'customizable_auth' into 'develop'href
2019-02-28Renamed *DatabaseAuthenticator to *Authenticator.Ivan Tashkinov
2019-02-28Added `auth_template/0` to DatabaseAuthenticator.Ivan Tashkinov
2019-02-28Merge branch 'with-mutes' into 'develop'kaniini
2019-02-28Merge branch 'customizable_auth' into 'develop'href
2019-02-28Merge branch 'speedup-follow-requests' into 'develop'kaniini
2019-02-28Merge branch 'deactivated-in-user-view' into 'develop'kaniini
2019-02-28Made auth customization be runtime-configurable.Ivan Tashkinov
2019-02-28Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'lambda
2019-02-28Added deactivated to the user vieweugenijm
2019-02-27Remove parts of the old activity view.lain
2019-02-27Add user muted status info to twitterapi.lain
2019-02-27Add user muted status info to MastodonAPI.lain
2019-02-27Add `with_muted` param.lain
2019-02-27Follower requests: Utilize object index.lain
2019-02-27Add follow request test.lain
2019-02-27mastodon api: embed relationship card under account card for Pleroma FE conve...William Pitcock
2019-02-27Merge branch 'fix/formatter' into 'develop'kaniini
2019-02-27fix formatterEgor Kislitsyn
2019-02-27Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'kaniini
2019-02-27Add missing docs and testsMaxim Filippov
2019-02-26Merge branch 'auto_linker' into 'develop'kaniini