Commit Graph

11590 Commits

Author SHA1 Message Date
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
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-02 20:42:40 +03:00
lain 0e41951eab Pleroma API Readme: Document unreaction endpoint. 2019-10-02 18:20:40 +02:00
lain 4cb603e1df PleromaAPI: Add unreacting. 2019-10-02 18:19:16 +02:00
lain 391c736292 PleromaAPI: Fix emoji_reactions_by 2019-10-02 18:13:10 +02:00
Egor Kislitsyn e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController 2019-10-02 21:31:19 +07:00
Egor Kislitsyn 7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController 2019-10-02 21:22:21 +07:00
rinpatch c5e937b156 Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'
[#1278] Move actions from MastodonAPIController to CustomEmojiController and MastoFEController

See merge request pleroma/pleroma!1772
2019-10-02 14:17:21 +00:00
Egor Kislitsyn 9b68aab8b3
Fix credo warning 2019-10-02 21:12:01 +07:00
lain 9cfe9a57c5 CommonAPI: Add unreactions. 2019-10-02 15:38:57 +02:00
Egor Kislitsyn d3c404af12
Add MastoFEController 2019-10-02 20:36:08 +07:00
lain dfe5c958eb ActivityPub: Add undo for emoji reactions. 2019-10-02 15:08:20 +02:00
Egor Kislitsyn 1c6e1055c8
Add CustomEmojiController 2019-10-02 19:16:34 +07:00
lain 557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-02 13:27:55 +02:00
kaniini 433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop'
Extract instance actions from `MastodonAPIController` to `InstanceController`

See merge request pleroma/pleroma!1760
2019-10-02 10:46:14 +00:00
kaniini debd0a3066 Merge branch 'accept-embedded-announce-object' into 'develop'
Inline object when Announcing a self-owned private object

See merge request pleroma/pleroma!1769
2019-10-02 10:45:55 +00:00
kaniini f205d3da1d Merge branch 'get_announce_visibility-name' into 'develop'
Rename misleading `get_announce_visibility` to `public_announce?`

See merge request pleroma/pleroma!1768
2019-10-02 10:44:51 +00:00
Thibaut Girka 86880b9821 Inline object when Announcing a self-owned private object 2019-10-02 12:15:06 +02:00
Thibaut Girka 3d61efa7c9 Rename misleading `get_announce_visibility` to `public_announce?` 2019-10-02 10:48:34 +02:00
Egor Kislitsyn 0fc29deba0
Add tests for Pleroma.JobQueueMonitor 2019-10-02 15:24:21 +07:00
Egor Kislitsyn 93f966ea4b
Update CHANGELOG and pleroma_api.md 2019-10-02 14:51:30 +07:00
Egor Kislitsyn 26693292f4
Remove `:enqueued` counter 2019-10-02 14:50:25 +07:00
Egor Kislitsyn c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController` 2019-10-02 14:13:52 +07:00
kaniini 89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
Send an identifier alongside with error message in OAuthController

See merge request pleroma/pleroma!1765
2019-10-02 07:04:33 +00:00
kaniini 8557176808 Merge branch 'split-masto-api/auth' into 'develop'
Extract auth actions from `MastodonAPIController` to `AuthController`

See merge request pleroma/pleroma!1759
2019-10-02 07:02:56 +00:00
kaniini 9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop'
Allow receiving private self-announces over ActivityPub

See merge request pleroma/pleroma!1766
2019-10-02 07:02:24 +00:00
kaniini 5eab6561d8 Merge branch 'update/admin-fe-20191001' into 'develop'
Update AdminFE bundle

See merge request pleroma/pleroma!1767
2019-10-02 07:01:18 +00:00
Mark Felder a562cb2c34 Update AdminFE bundle 2019-10-01 18:29:39 -05:00