summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-02Merge branch 'bugfix/oauth-scopes-join' into 'develop'rinpatch
Bugfix: OAuth scopes formatting Closes #702 See merge request pleroma/pleroma!881
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
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
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
Authenticator tweaks See merge request pleroma/pleroma!875
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
Add `with_muted` param. Closes #683 See merge request pleroma/pleroma!872
2019-02-28Merge branch 'customizable_auth' into 'develop'href
Auth customization support See merge request pleroma/pleroma!852
2019-02-28Merge branch 'speedup-follow-requests' into 'develop'kaniini
Speedup follow requests Closes #677 See merge request pleroma/pleroma!871
2019-02-28Merge branch 'deactivated-in-user-view' into 'develop'kaniini
Add activation status to the regular user view See merge request pleroma/pleroma!874
2019-02-28Made auth customization be runtime-configurable.Ivan Tashkinov
2019-02-28Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'lambda
mastodon api: embed relationship card under account card for Pleroma FE convenience See merge request pleroma/pleroma!870
2019-02-28Added deactivated to the user vieweugenijm
2019-02-27Remove parts of the old activity view.lain
Not used anymore.
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
Closes #677
2019-02-27Add follow request test.lain
2019-02-27mastodon api: embed relationship card under account card for Pleroma FE ↵William Pitcock
convenience
2019-02-27Merge branch 'fix/formatter' into 'develop'kaniini
Bugfix: markdown in formatter Closes #688 See merge request pleroma/pleroma!869
2019-02-27fix formatterEgor Kislitsyn
2019-02-27Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'kaniini
Add missing docs and tests to Admin API See merge request pleroma/pleroma!868
2019-02-27Add missing docs and testsMaxim Filippov
2019-02-26Merge branch 'auto_linker' into 'develop'kaniini
AutoLinker Closes #609 See merge request pleroma/pleroma!839