summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-28did it really take me 4 commits to fix this?rinpatch
2019-03-28Remove duplicated header from admin_api.mdrinpatch
2019-03-28remove admin tasks as they have their page in mix tasks category alreadyrinpatch
2019-03-28cringerinpatch
2019-03-28Move out of Gitlab Wikirinpatch
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just * Gets everything from gitlab wiki * Removes some specific gitlab hacks * Formats all documentation file names to be in snake case so they look the same way as our code does
2019-03-28mastodon_api_controller.ex: fallback to first for min_idHaelwenn (lanodan) Monnier
2019-03-28mastodon_api_controller.ex: Use min_id in link header instead of since_idHaelwenn (lanodan) Monnier
2019-03-28pagination.ex: Drop atom keys in paramsHaelwenn (lanodan) Monnier
Atom keys could also have been transformed to string, or the other way around but this one is more efficient and what we actually expect with the current param_types in Pagination
2019-03-28activity_pub.ex: Move limit/max_id restrictions to Pagination helpersHaelwenn (lanodan) Monnier
2019-03-28Add PUT /api/pleroma/notification_settings endpointeugenijm
2019-03-28Merge branch 'admin-api-user-show' into 'develop'lambda
Admin API user show Closes #766 See merge request pleroma/pleroma!987
2019-03-28Notification controlseugenijm
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-27Add user show endpoint for Pleroma admin APIeugenijm
2019-03-27password reset page labels alignAlex S
2019-03-27[#923] Enabled binding of multiple OAuth provider accounts to single user.Ivan Tashkinov
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov
2019-03-27[#923] OAuth consumer improvements, fixes, refactoring.Ivan Tashkinov
2019-03-27Merge branch 'feature/more-user-filters' into 'develop'lambda
Add more user filters + move search to its own module See merge request pleroma/pleroma!982
2019-03-27Merge branch 'fix-reblog-tests' into 'develop'lambda
Fix muting reblogs tests See merge request pleroma/pleroma!984
2019-03-27Fix muting reblogs testsrinpatch
2019-03-27Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'rinpatch
Fix missing announces in MastoAPI home timeline Closes #762 See merge request pleroma/pleroma!983
2019-03-27Fix missing announces in MastoAPI home timelinerinpatch
Closes #762
2019-03-27Merge branch 'apps-verify-credentials' into 'develop'lambda
MastodonAPI: Add GET /api/v1/apps/verify_credentials See merge request pleroma/pleroma!981
2019-03-27Add more user filters + move search to its own moduleMaxim Filippov
2019-03-26Add vapid_key to the `POST /api/v1/apps` responseeugenijm
2019-03-26Add GET /api/v1/apps/verify_credentialseugenijm
2019-03-26Merge branch 'fix/ap-icon' into 'develop'lambda
Do not federate instance avatar Closes #759 See merge request pleroma/pleroma!977
2019-03-26Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'lambda
Mastodon 2.7.2 instance attributes (registrations, languages) See merge request pleroma/pleroma!979
2019-03-26AP UserView: Refactor banner / avatar display code, add test.lain
2019-03-26Test for MastoAPI /api/v1/instance response structure (formatting fix).Ivan Tashkinov
2019-03-26Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'lambda
Mastodon-based auth error messages. User#auth_active?/1 refactoring. See merge request pleroma/pleroma!978
2019-03-26Test for MastoAPI /api/v1/instance response structure.Ivan Tashkinov
2019-03-26Merge branch 'replies-count' into 'develop'lambda
Increment replies_count (MastoAPI) Closes #756 See merge request pleroma/pleroma!974
2019-03-26Merge branch 'refactor/remove-activity-representer' into 'develop'lambda
Remove ActivityRepresenter See merge request pleroma/pleroma!980
2019-03-26Credo is upset about me not remembering the alphabetrinpatch
2019-03-26Fix formattingrinpatch
2019-03-26Remove ActivityRepresenterrinpatch
2019-03-26Mastodon 2.7.2 instance attributes (registrations, languages).Ivan Tashkinov
2019-03-26Increment replies_count on replies (MastoAPI)eugenijm
2019-03-26Comments split.Ivan Tashkinov
2019-03-26Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.Ivan Tashkinov
2019-03-25Try sending an empty mapMark Felder
2019-03-25Attempt to fix incorrect federation of default instance avatarsMark Felder
2019-03-25Merge branch 'fix/notification-id-index' into 'develop'rinpatch
Add an `id desc nulls last` index to notifications See merge request pleroma/pleroma!975
2019-03-25Add an id index to notificationsrinpatch
2019-03-25Merge branch 'bugfix/missing-announces' into 'develop'rinpatch
fix up missing announcements with preloads See merge request pleroma/pleroma!972
2019-03-25fix up missing announcements with preloadsWilliam Pitcock
2019-03-25Merge branch 'features/s3-uploader-digital-ocean' into 'develop'kaniini
add overriding truncated_namespace condition for truncating paths for digital ocean See merge request pleroma/pleroma!969
2019-03-25Merge branch 'fix/mastoapi-liked' into 'develop'kaniini
Serve non-public activities in /api/v1/favourites Closes #648 See merge request pleroma/pleroma!970
2019-03-25Serve non-public activities in /api/v1/favouritesrinpatch
Fixes #648