summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-31BBS: Some fixes.lain
2019-03-31Add replying.lain
2019-03-31BBS: Tests and formatting.lain
2019-03-31ssl_trusted_certificate should point to chain.pem if we're demonstrating ↵Horsemans
LetsEncrypt: https://community.letsencrypt.org/t/howto-ocsp-stapling-for-nginx/13611/5
2019-03-31BBS: Add documentation.lain
2019-03-31BBS: Some more functionality.lain
2019-03-31Basic SSH daemon.lain
2019-03-30Add a fake option to lazy_put_actvity_defaultsrinpatch
2019-03-29document fake optionrinpatch
2019-03-29Implement fake status submitrinpatch
2019-03-29Merge branch 'fix/job-queue-doc' into 'develop'lambda
Improve PleromaJobQeue config documentation See merge request pleroma/pleroma!993
2019-03-29qsrinpatch
2019-03-29Improve PleromaJobQeue config documentationrinpatch
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-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