aboutsummaryrefslogtreecommitdiff
path: root/docs
AgeCommit message (Collapse)Author
2019-12-10Merge branch 'develop' into '1427-oauth-admin-scopes'lain
# Conflicts: # CHANGELOG.md
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-10Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1427-oauth-admin-scopes # Conflicts: # CHANGELOG.md
2019-12-09Merge branch 'issue/1342' into 'develop'lain
[#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920
2019-12-09Update pleroma_api.mdlain
2019-12-09Merge branch 'feat/docs-otp-source-picker' into 'develop'rinpatch
docs: add OTP/From source tabs to CLI tasks See merge request pleroma/pleroma!2046
2019-12-09Document `with_move` parameter of the notification APIEgor Kislitsyn
2019-12-09docs: add OTP/From source tabs to CLI tasksrinpatch
2019-12-08update docsMaksim Pechnikov
2019-12-06[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API ↵Ivan Tashkinov
documentation entry.
2019-12-04Cheat Sheet: Addg chat_limit information.lain
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-11-27Add a view for the move notificationEgor Kislitsyn
2019-11-25move documentation section for http clientSadposter
2019-11-25add ability to set a custom user-agent stringSadposter
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994
2019-11-21Merge branch 'list-users' into 'develop'rinpatch
Add CLI list users command See merge request pleroma/pleroma!1990
2019-11-21Add CLI list users commandAlex Schroeder
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-18Remove deprecated endpoint from docs that is fully removed from backend nowfeld
2019-11-15Merge branch 'mix-task-warning' into 'develop'rinpatch
Documentation: Add warning about database mix tasks. See merge request pleroma/pleroma!1984
2019-11-15Documentation: Add warning about database mix tasks.lain
2019-11-14docs: document MRF ObjectAgePolicyAriadne Conill
2019-11-14Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'feld
Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815
2019-11-14Merge remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
2019-11-14Merge branch 'reactions' into 'develop'rinpatch
Emoji Reactions See merge request pleroma/pleroma!1662
2019-11-13Fix formatting in OpenBSD install manualEgor Kislitsyn
2019-11-12Add `allow_following_move` setting to UserEgor Kislitsyn
2019-11-11docs: move static-fe docs under a proper categoryrinpatch
2019-11-11Merge branch 'feature/static-fe' into 'develop'kaniini
Static frontend See merge request pleroma/pleroma!1917
2019-11-11Add a warning about Pg version to the RUM related docsEgor Kislitsyn
2019-11-11Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-11Code style fixesMaxim Filippov
2019-11-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-11-09Add changelog entry, cheatsheet docs, and alphabetize.Phil Hagelberg
2019-11-10Big config cheatsheet revamprinpatch
Categorize things, remove old deprecation warnings, consistently place dots in unordered lists, fix links, etc.
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-11-08Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-07Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`eugenijm
2019-11-05Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-01Update docsMaxim Filippov
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of ↵Ivan Tashkinov
git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-19Merge branch 'feature/mastofe-pwa' into 'develop'Haelwenn
MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834
2019-10-19Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's ↵eugenijm
conversations as read
2019-10-19Add documentation for PWA manifest configuration.KokaKiwi
2019-10-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-15DELETE /api/pleroma/admin/users now accepts nicknames arrayMaxim Filippov