Commit graph

607 commits

Author SHA1 Message Date
Maxim Filippov aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it 2019-10-11 15:58:45 +03:00
Maxim Filippov f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it 2019-10-11 00:24:31 +03:00
Maxim Filippov ad42837244 Ability to toggle activation status and permission group for a group of users 2019-10-09 17:03:54 +03:00
Maxim Filippov 35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-07 15:41:41 +03:00
Maxim Filippov 7aceaa517b Admin API: Reports, grouped by status 2019-10-07 15:39:07 +03:00
lain 6c278cfe09 Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-07 12:31:51 +00:00
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
lain 61097ba6ab Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-06 08:11:47 +00:00
eugenijm 8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
lain 1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 15:10:57 +02:00
kaniini e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
lain d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 10:42:29 +02:00
kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info

See merge request pleroma/pleroma!1737
2019-10-04 17:33:18 +00:00
Maxim Filippov 795ea5dfc2 Move HTTP verb to the header (admin_api.md) 2019-10-04 18:58:44 +03:00
lain 27110793a7 Merge branch 'featrue/job-monitor' into 'develop'
Add Pleroma.JobQueueMonitor

Closes #1274

See merge request pleroma/pleroma!1721
2019-10-04 12:52:11 +00:00
Haelwenn (lanodan) Monnier e4ab9a05dd
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations 2019-10-04 00:10:28 +02:00
eugenijm 06d9df79c5 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-04 00:53:23 +03:00
rinpatch 69784eb75a Add a missing language specification 2019-10-03 15:10:04 +03:00
rinpatch 1cae564b5d Move config task docs to a separate file and mark it as WIP 2019-10-03 14:12:57 +03:00
rinpatch 6baa037903 Move database maintenance tasks docs to a separate file 2019-10-03 11:17:29 +03:00
rinpatch 8e08d5b233 MkDocs does not like if a paragraph doesn't have a newline after it 2019-10-03 11:02:07 +03:00
rinpatch 2656f41818 Remove silent mode note as it's no longer relevant 2019-10-03 10:57:27 +03:00
rinpatch aefb4dcff5 Cheatsheet: Use note/warning blocks instead of bold text 2019-10-03 10:54:41 +03:00
rinpatch e560d65db3 Fix a typo in activity expirations 2019-10-03 10:45:40 +03:00
rinpatch 25849157aa Remove fe settings from :instance as they no longer do anything 2019-10-03 10:43:38 +03:00
rinpatch 4e70009490 Move bold text in RemoveIp description into a proper warning 2019-10-03 10:39:53 +03:00
rinpatch cb162678df Add missing language spec 2019-10-03 10:37:34 +03:00
rinpatch 66450f8615 Cheatsheet: Move the deprecated config warning into a warning block 2019-10-03 10:36:01 +03:00
rinpatch 2cbe2dcbde Oops 2019-10-03 10:31:59 +03:00
rinpatch b4ca864c6b Move user tasks docs to a separate file 2019-10-03 10:15:24 +03:00
rinpatch 8fd47a4a5a Use consistent command signature 2019-10-03 09:38:24 +03:00
rinpatch f5372bfb4a Fix up some headings 2019-10-03 09:36:35 +03:00
rinpatch d39ccc2e7f Move uploads task docs to a separate file 2019-10-03 09:35:21 +03:00
rinpatch 808d0a0170 Move relay docs to a separate file 2019-10-03 09:10:31 +03:00
rinpatch 6435ba83cd Move instance CLI task docs to a text file 2019-10-03 09:06:06 +03:00
rinpatch a54739a530 Improve styling of CLI tasks 2019-10-03 08:51:57 +03:00
rinpatch 869ea2ab90 Move digest email docs to a separate file and improve styling 2019-10-03 01:10:36 +03:00
rinpatch bd9c7807fb Move emoji task docs to a separate file 2019-10-03 01:03:47 +03:00
rinpatch 2767c413fb Remove a reference to inline docs since everything it describes is
described in the cheatsheet already and add A TODO
2019-10-03 00:36:18 +03:00
rinpatch 0ba5c1a9d7 Fix more links 2019-10-03 00:22:14 +03:00
rinpatch b8e5e46fa8 Fix references to other pages 2019-10-03 00:18:32 +03:00
rinpatch 74d682a09e Remove Small customizations as it's contents have been integrated into
static_dir.md
2019-10-03 00:02:01 +03:00
rinpatch 838ff12ec5 Remove "General tips for customizing Pleroma FE" because it's no longer
relevant and we have actual fe docs now
2019-10-02 23:58:57 +03:00
rinpatch 03e1898917 Rename "Configuration" to "Configuration Cheat Sheet" and explain a bit
about how Pleroma Configuration works
2019-10-02 23:54:55 +03:00
rinpatch acc62f327d Rename some directories because MkDocs uses them for categories 2019-10-02 23:28:45 +03:00
lain 0e41951eab Pleroma API Readme: Document unreaction endpoint. 2019-10-02 18:20:40 +02:00
Egor Kislitsyn 93f966ea4b
Update CHANGELOG and pleroma_api.md 2019-10-02 14:51:30 +07:00
lain b923842e96 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:57:54 +02:00
Ariadne Conill 1d7cbdaf7b change new scrobble endpoint 2019-09-30 10:39:48 +00:00
Ariadne Conill a6e1469767 router: change scrobble timeline route from now-playing to scrobbles 2019-09-30 10:39:48 +00:00
Ariadne Conill 5fd29edac4 docs: add scrobble API description 2019-09-30 10:39:17 +00:00
Haelwenn (lanodan) Monnier 717cb4f933
admin_api.md: Put data-type info as the values
Similar to how the other responses examples are done,
this also makes it proper JSON (as it doesn’t have comments).
2019-09-29 02:14:53 +02:00
Maxim Filippov 0e59d1dc04 Update admin_api.md 2019-09-29 00:01:35 +03:00
minibikini f9380289eb Add remote_ip plug 2019-09-27 21:59:23 +00:00
kaniini c4fbb56984 Merge branch 'patch-2' into 'develop'
Minor corrections and clarification for Alpine standard v.3.10

See merge request pleroma/pleroma!1594
2019-09-27 03:50:36 +00:00
kaniini 0e280354d9 Merge branch 'update/docs-jp' into 'develop'
Update Japanese document to follow English document

See merge request pleroma/pleroma!1615
2019-09-27 03:49:00 +00:00
kaniini 01a7e20c32 Merge branch 'list-packs-docs' into 'develop'
Add list_from endpoint to the pleroma_api docs

See merge request pleroma/pleroma!1720
2019-09-27 03:46:53 +00:00
kaniini 8df3a63ce9 Merge branch 'patch-1' into 'develop'
Fix code block for admin api document

See merge request pleroma/pleroma!1722
2019-09-27 03:46:34 +00:00
Maxim Filippov 39a4892929 Add docs 2019-09-26 19:20:47 +03:00
kPherox f249b2381f Fix code block for admin api document 2019-09-26 16:10:34 +00:00
Ekaterina Vaartis fc16bec317 Add list_from endpoint to the pleroma_api docs 2019-09-26 09:50:53 +02:00
Maxim Filippov 5e9759cd7d Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-24 13:00:48 +03:00
kaniini 29dd8ab9c0 Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset

See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
kaniini 19263f30c3 Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"`

Closes #1255

See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
Rachel Fae Fox 63af6951fa add tunable for stream uploads, as needed for jortage to work. 2019-09-23 20:38:53 +00:00
rinpatch fd48bd80eb Merge branch 'better-emoji-packs' into 'develop'
Shareable emoji packs

Closes #833 and #1096

See merge request pleroma/pleroma!1551
2019-09-23 18:20:08 +00:00
Maxim Filippov 02bbcd6180 Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-22 16:58:39 +03:00
Maxim Filippov f89fe3ac06 Update docs 2019-09-22 16:45:38 +03:00
Maxim Filippov 6f25668215 Admin API: Add ability to force user's password reset 2019-09-22 16:08:07 +03:00
lain fe4db3b94e API Docs: Document conversation ids. 2019-09-19 21:01:05 +02:00
Haelwenn c1e011624d Merge branch 'docs/clients-update' into 'develop'
docs/clients.md: Update source code urls

See merge request pleroma/pleroma!1697
2019-09-19 18:01:49 +00:00
Egor Kislitsyn cf3041220a Add support for rel="ugc" 2019-09-19 14:56:10 +07:00
Haelwenn (lanodan) Monnier c3856bed0c
docs/clients.md: Update source code urls 2019-09-18 23:17:15 +02:00
Ekaterina Vaartis 86795d5ac2 Document emoji pack listing in the api docs 2019-09-19 00:16:33 +03:00
vaartis 43022c347f Apply suggestion to docs/api/pleroma_api.md 2019-09-19 00:16:33 +03:00
vaartis 8aed05ac15 Apply suggestion to docs/api/pleroma_api.md 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis d51e5e447e Move emoji reloading to admin api 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis dd818bdd48 Add documentation for the emoji endpoints 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis ee620ecbf1 Add caching for emoji pack sharing 2019-09-19 00:16:33 +03:00
feld ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop'
Add a setting to hide follows/followers stats from the user profile

See merge request pleroma/pleroma!1663
2019-09-18 21:13:15 +00:00
Alex S a18f1e7cd7 namings 2019-09-18 10:49:14 +03:00
Alex S 17ff63b3c3 docs fix 2019-09-18 10:49:14 +03:00
Alex S 4faf2b1555 post for creating invite tokens in admin api 2019-09-18 10:49:14 +03:00
rinpatch ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop'
Admin API: Return total for reports

See merge request pleroma/pleroma!1628
2019-09-17 19:09:56 +00:00
eugenijm 450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count) 2019-09-17 14:45:47 +03:00
Egor Kislitsyn d6ab78e610 Set account_field_value_length limit to 2048 by default 2019-09-16 21:48:01 +07:00
Maxim Filippov 219dca1b00 Merge branch 'develop' into feature/return-total-for-reports 2019-09-16 14:40:17 +03:00
Ivan Tashkinov 3b8ec98b0e [#1149] Reinstated docs/config.md changes. 2019-09-15 10:15:57 +03:00
Alex S c625fe6f09 config.md back 2019-09-13 19:03:39 +03:00
lain a7f31bf06c Merge remote-tracking branch 'origin/develop' into reactions 2019-09-13 16:31:27 +02:00
lain f649a2e972 Pleroma API Docs: Documented Emoji reaction endpoints. 2019-09-13 16:19:50 +02:00
Haelwenn 0d9609894f Merge branch 'feature/change-email' into 'develop'
Add email change endpoint

Closes #1156

See merge request pleroma/pleroma!1580
2019-09-13 12:46:16 +00:00
rinpatch f884987ace Merge branch 'admin-config-description' into 'develop'
Admin config description

Closes #1178 and #1209

See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
Egor Kislitsyn 7b5c81b391 Add a note about compatibility with Mastodon 2019-09-13 13:09:37 +07:00
Egor Kislitsyn 25d8216804 Add email change endpoint 2019-09-13 13:09:35 +07:00
Angelina Filippova 528a88a686 Fix admin api docs for creating users 2019-09-13 03:31:16 +00:00
Alex S aa7fb22008 placeholder for config.md 2019-09-11 09:25:33 +03:00
Alex S ab4960cc7f deleting old config.md file 2019-09-11 09:25:33 +03:00
Egor Kislitsyn 30f0cec49a Add note about limit to the doc 2019-09-10 13:39:45 +07:00
Egor Kislitsyn b40b10b53d Add an endpoint to get multiple statuses by IDs 2019-09-10 13:39:45 +07:00