summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-29Implement fake status submitrinpatch
2019-03-29Merge branch 'pleroma_job_queue' into 'develop'lambda
Replace Pleroma.Jobs with `pleroma_job_queue` See merge request pleroma/pleroma!992
2019-03-29Replace Pleroma.Jobs with `pleroma_job_queue`Egor
2019-03-29Merge branch 'sayonara-gitlab-wiki' into 'develop'lambda
Move out of Gitlab Wiki See merge request pleroma/pleroma!990
2019-03-29Merge branch 'feature/deploy-docs' into 'develop'lambda
Add automatic documentation build and deploy for master and develop branches Closes #478 See merge request pleroma/pleroma!965
2019-03-29Merge branch 'bugfix/migration-less_replies_count' into 'develop'kaniini
Revert awfully long migration from 568e34858 See merge request pleroma/pleroma!991
2019-03-29Revert awfully long migration from 568e34858Haelwenn (lanodan) Monnier
2019-03-28Remove duplicated header from i2p.mdrinpatch
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-28Merge branch 'admin-api-user-show' into 'develop'lambda
Admin API user show Closes #766 See merge request pleroma/pleroma!987
2019-03-27Add user show endpoint for Pleroma admin APIeugenijm
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
2019-03-24add overriding truncated_namespace condition for truncating paths for ↵Austin Lanari
digital ocean
2019-03-24Merge branch 'features/mrf-keyword-nil-summary' into 'develop'rinpatch
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil See merge request pleroma/pleroma!968