sadposter [Fri, 4 Oct 2019 11:04:31 +0000 (12:04 +0100)]
stickers
sadposter [Fri, 4 Oct 2019 10:48:39 +0000 (11:48 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Fri, 4 Oct 2019 10:48:31 +0000 (11:48 +0100)]
stickers
rinpatch [Thu, 3 Oct 2019 22:22:47 +0000 (22:22 +0000)]
Merge branch 'docs/frontend_configuration' into 'develop'
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
See merge request pleroma/pleroma!1778
Haelwenn (lanodan) Monnier [Thu, 3 Oct 2019 22:10:28 +0000 (00:10 +0200)]
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
rinpatch [Thu, 3 Oct 2019 15:43:03 +0000 (15:43 +0000)]
Merge branch 'mkdocs-migration-prep' into 'develop'
MkDocs migration preparation
See merge request pleroma/pleroma!1774
rinpatch [Thu, 3 Oct 2019 15:42:02 +0000 (18:42 +0300)]
Remove a test branch from CI
rinpatch [Thu, 3 Oct 2019 12:10:04 +0000 (15:10 +0300)]
Add a missing language specification
rinpatch [Thu, 3 Oct 2019 11:27:11 +0000 (14:27 +0300)]
Change docs build/deploy to just trigger a pipeline in the docs repo
rinpatch [Thu, 3 Oct 2019 11:12:57 +0000 (14:12 +0300)]
Move config task docs to a separate file and mark it as WIP
rinpatch [Thu, 3 Oct 2019 10:59:49 +0000 (13:59 +0300)]
Mix tasks: derive moduledoc from doc files
rinpatch [Thu, 3 Oct 2019 08:17:29 +0000 (11:17 +0300)]
Move database maintenance tasks docs to a separate file
rinpatch [Thu, 3 Oct 2019 08:02:07 +0000 (11:02 +0300)]
MkDocs does not like if a paragraph doesn't have a newline after it
rinpatch [Thu, 3 Oct 2019 07:57:27 +0000 (10:57 +0300)]
Remove silent mode note as it's no longer relevant
rinpatch [Thu, 3 Oct 2019 07:54:41 +0000 (10:54 +0300)]
Cheatsheet: Use note/warning blocks instead of bold text
rinpatch [Thu, 3 Oct 2019 07:45:40 +0000 (10:45 +0300)]
Fix a typo in activity expirations
rinpatch [Thu, 3 Oct 2019 07:43:38 +0000 (10:43 +0300)]
Remove fe settings from :instance as they no longer do anything
rinpatch [Thu, 3 Oct 2019 07:39:53 +0000 (10:39 +0300)]
Move bold text in RemoveIp description into a proper warning
rinpatch [Thu, 3 Oct 2019 07:37:34 +0000 (10:37 +0300)]
Add missing language spec
rinpatch [Thu, 3 Oct 2019 07:36:01 +0000 (10:36 +0300)]
Cheatsheet: Move the deprecated config warning into a warning block
rinpatch [Thu, 3 Oct 2019 07:31:59 +0000 (10:31 +0300)]
Oops
rinpatch [Thu, 3 Oct 2019 07:15:24 +0000 (10:15 +0300)]
Move user tasks docs to a separate file
rinpatch [Thu, 3 Oct 2019 06:38:24 +0000 (09:38 +0300)]
Use consistent command signature
rinpatch [Thu, 3 Oct 2019 06:36:35 +0000 (09:36 +0300)]
Fix up some headings
rinpatch [Thu, 3 Oct 2019 06:35:21 +0000 (09:35 +0300)]
Move uploads task docs to a separate file
rinpatch [Thu, 3 Oct 2019 06:10:31 +0000 (09:10 +0300)]
Move relay docs to a separate file
rinpatch [Thu, 3 Oct 2019 06:02:48 +0000 (09:02 +0300)]
Move instance CLI task docs to a text file
rinpatch [Thu, 3 Oct 2019 05:51:57 +0000 (08:51 +0300)]
Improve styling of CLI tasks
rinpatch [Wed, 2 Oct 2019 22:09:51 +0000 (01:09 +0300)]
Move digest email docs to a separate file and improve styling
rinpatch [Wed, 2 Oct 2019 22:03:47 +0000 (01:03 +0300)]
Move emoji task docs to a separate file
rinpatch [Wed, 2 Oct 2019 21:36:18 +0000 (00:36 +0300)]
Remove a reference to inline docs since everything it describes is
described in the cheatsheet already and add A TODO
rinpatch [Wed, 2 Oct 2019 21:22:14 +0000 (00:22 +0300)]
Fix more links
rinpatch [Wed, 2 Oct 2019 21:18:32 +0000 (00:18 +0300)]
Fix references to other pages
rinpatch [Wed, 2 Oct 2019 21:00:53 +0000 (00:00 +0300)]
Remove Small customizations as it's contents have been integrated into
static_dir.md
rinpatch [Wed, 2 Oct 2019 20:58:57 +0000 (23:58 +0300)]
Remove "General tips for customizing Pleroma FE" because it's no longer
relevant and we have actual fe docs now
rinpatch [Wed, 2 Oct 2019 20:54:55 +0000 (23:54 +0300)]
Rename "Configuration" to "Configuration Cheat Sheet" and explain a bit
about how Pleroma Configuration works
rinpatch [Wed, 2 Oct 2019 20:28:45 +0000 (23:28 +0300)]
Rename some directories because MkDocs uses them for categories
rinpatch [Wed, 2 Oct 2019 14:17:21 +0000 (14:17 +0000)]
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
Egor Kislitsyn [Wed, 2 Oct 2019 14:12:01 +0000 (21:12 +0700)]
Fix credo warning
Egor Kislitsyn [Wed, 2 Oct 2019 13:05:14 +0000 (20:05 +0700)]
Add MastoFEController
Egor Kislitsyn [Wed, 2 Oct 2019 12:16:34 +0000 (19:16 +0700)]
Add CustomEmojiController
kaniini [Wed, 2 Oct 2019 10:46:14 +0000 (10:46 +0000)]
Merge branch 'split-masto-api/instance' into 'develop'
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
kaniini [Wed, 2 Oct 2019 10:45:55 +0000 (10:45 +0000)]
Merge branch 'accept-embedded-announce-object' into 'develop'
Inline object when Announcing a self-owned private object
See merge request pleroma/pleroma!1769
kaniini [Wed, 2 Oct 2019 10:44:51 +0000 (10:44 +0000)]
Merge branch 'get_announce_visibility-name' into 'develop'
Rename misleading `get_announce_visibility` to `public_announce?`
See merge request pleroma/pleroma!1768
Thibaut Girka [Wed, 2 Oct 2019 10:14:08 +0000 (12:14 +0200)]
Inline object when Announcing a self-owned private object
Thibaut Girka [Wed, 2 Oct 2019 08:48:34 +0000 (10:48 +0200)]
Rename misleading `get_announce_visibility` to `public_announce?`
Egor Kislitsyn [Wed, 2 Oct 2019 07:13:52 +0000 (14:13 +0700)]
Extract instance actions from `MastodonAPIController` to `InstanceController`
kaniini [Wed, 2 Oct 2019 07:04:33 +0000 (07:04 +0000)]
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
kaniini [Wed, 2 Oct 2019 07:02:56 +0000 (07:02 +0000)]
Merge branch 'split-masto-api/auth' into 'develop'
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
kaniini [Wed, 2 Oct 2019 07:02:24 +0000 (07:02 +0000)]
Merge branch 'features/private-reblogs' into 'develop'
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
kaniini [Wed, 2 Oct 2019 07:01:18 +0000 (07:01 +0000)]
Merge branch 'update/admin-fe-
20191001' into 'develop'
Update AdminFE bundle
See merge request pleroma/pleroma!1767
Mark Felder [Tue, 1 Oct 2019 23:29:39 +0000 (18:29 -0500)]
Update AdminFE bundle
feld [Tue, 1 Oct 2019 22:16:29 +0000 (22:16 +0000)]
Merge branch 'feature/expose-attachment-size' into 'develop'
Add upload limits to /api/v1/instance
See merge request pleroma/pleroma!1614
feld [Tue, 1 Oct 2019 22:16:29 +0000 (22:16 +0000)]
Revert "Add upload limits to /api/v1/instance"
This reverts commit
db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
Thibaut Girka [Tue, 1 Oct 2019 19:40:35 +0000 (21:40 +0200)]
Store private announcements in object.data["announcements"], filter them on display
feld [Tue, 1 Oct 2019 20:00:27 +0000 (20:00 +0000)]
Merge branch 'feature/track-reverse-proxy-failures' into 'develop'
Track failed proxy urls and don't request them again
Closes #1197
See merge request pleroma/pleroma!1618
Sergey Suprunenko [Tue, 1 Oct 2019 20:00:27 +0000 (20:00 +0000)]
Track failed proxy urls and don't request them again
Thibaut Girka [Tue, 1 Oct 2019 17:28:51 +0000 (19:28 +0200)]
Fix returned visibility of announces in MastodonAPI
Thibaut Girka [Tue, 1 Oct 2019 17:08:25 +0000 (19:08 +0200)]
Add tests for privately announcing statuses via API
Thibaut Girka [Tue, 1 Oct 2019 16:38:23 +0000 (18:38 +0200)]
Allow users to announce privately, including own private notes
Maxim Filippov [Tue, 1 Oct 2019 16:43:22 +0000 (19:43 +0300)]
Discard identifier, if empty
Thibaut Girka [Tue, 1 Oct 2019 15:51:27 +0000 (17:51 +0200)]
Add tests
Thibaut Girka [Tue, 1 Oct 2019 15:49:52 +0000 (17:49 +0200)]
Ensure self-announces do not widen the audience of the original post
KokaKiwi [Sun, 24 Feb 2019 17:45:29 +0000 (18:45 +0100)]
Make activity announceable by its author.
Maxim Filippov [Tue, 1 Oct 2019 15:10:04 +0000 (18:10 +0300)]
Send an identifier alongside with error message in OAuthController
Egor Kislitsyn [Tue, 1 Oct 2019 08:54:45 +0000 (15:54 +0700)]
Extract auth actions from `MastodonAPIController` to `AuthController`
kaniini [Tue, 1 Oct 2019 08:32:59 +0000 (08:32 +0000)]
Merge branch 'split-masto-api/apps' into 'develop'
Extract apps actions from `MastodonAPIController` to `AppController`
See merge request pleroma/pleroma!1758
Egor Kislitsyn [Tue, 1 Oct 2019 08:21:46 +0000 (15:21 +0700)]
Extract apps actions from `MastodonAPIController` to `AppController`
kaniini [Tue, 1 Oct 2019 08:15:56 +0000 (08:15 +0000)]
Merge branch 'split-masto-api/suggestions' into 'develop'
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
See merge request pleroma/pleroma!1757
Egor Kislitsyn [Tue, 1 Oct 2019 07:45:04 +0000 (14:45 +0700)]
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
kaniini [Tue, 1 Oct 2019 07:57:46 +0000 (07:57 +0000)]
Merge branch 'split-masto-api/media' into 'develop'
Extract media actions from `MastodonAPIController` to `MediaController`
See merge request pleroma/pleroma!1756
Egor Kislitsyn [Tue, 1 Oct 2019 07:36:35 +0000 (14:36 +0700)]
Extract media actions from `MastodonAPIController` to `MediaController`
kaniini [Tue, 1 Oct 2019 07:11:54 +0000 (07:11 +0000)]
Merge branch 'split-masto-api/polls' into 'develop'
Extract poll actions from `MastodonAPIController` to `PollController`
See merge request pleroma/pleroma!1755
Egor Kislitsyn [Tue, 1 Oct 2019 04:44:34 +0000 (11:44 +0700)]
Extract poll actions from `MastodonAPIController` to `PollController`
kaniini [Mon, 30 Sep 2019 16:25:45 +0000 (16:25 +0000)]
Merge branch 'compact-undos' into 'develop'
Transmogrifier: Handle compact objects in undos.
See merge request pleroma/pleroma!1752
lain [Mon, 30 Sep 2019 16:13:05 +0000 (18:13 +0200)]
Transmogrifier: Handle compact objects in undos.
kaniini [Mon, 30 Sep 2019 15:37:03 +0000 (15:37 +0000)]
Merge branch 'ci/build-otp-maint' into 'develop'
CI: Enable OTP release building for maint/* branches
See merge request pleroma/pleroma!1749
rinpatch [Mon, 30 Sep 2019 15:23:29 +0000 (18:23 +0300)]
CI: Enable OTP release building for maint/* branches
kaniini [Mon, 30 Sep 2019 12:53:43 +0000 (12:53 +0000)]
Merge branch 'split-masto-api/mascots' into 'develop'
Extract mascot actions from `MastodonAPIController` to MascotController
See merge request pleroma/pleroma!1745
kaniini [Mon, 30 Sep 2019 12:53:28 +0000 (12:53 +0000)]
Merge branch 'update/admin-fe-
20190930' into 'develop'
update admin fe
See merge request pleroma/pleroma!1747
Ariadne Conill [Mon, 30 Sep 2019 12:52:28 +0000 (12:52 +0000)]
update admin fe
Egor Kislitsyn [Mon, 30 Sep 2019 12:32:43 +0000 (19:32 +0700)]
Extract mascot actions from `MastodonAPIController` to MascotController
kaniini [Mon, 30 Sep 2019 12:21:16 +0000 (12:21 +0000)]
Merge branch 'split-masto-api/accounts' into 'develop'
Extract account actions from `MastodonAPIController` to `AccountController`
See merge request pleroma/pleroma!1731
Egor Kislitsyn [Mon, 30 Sep 2019 12:06:17 +0000 (19:06 +0700)]
Fix warning in TransmogrifierTest
Egor Kislitsyn [Mon, 30 Sep 2019 08:47:01 +0000 (15:47 +0700)]
Move update_credentials to MastodonAPI.AccountController
Egor Kislitsyn [Mon, 30 Sep 2019 09:08:29 +0000 (16:08 +0700)]
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
Egor Kislitsyn [Mon, 30 Sep 2019 07:43:54 +0000 (14:43 +0700)]
Move account_lists test to MastodonAPI.AccountControllerTest
Egor Kislitsyn [Mon, 30 Sep 2019 07:28:37 +0000 (14:28 +0700)]
Disable async in DomainBlockControllerTest
Egor Kislitsyn [Mon, 30 Sep 2019 07:28:12 +0000 (14:28 +0700)]
Add PleromaAPI.AccountController
Egor Kislitsyn [Mon, 30 Sep 2019 12:10:54 +0000 (19:10 +0700)]
Fix merge
kaniini [Mon, 30 Sep 2019 11:41:39 +0000 (11:41 +0000)]
Merge branch 'fix/report-controller-test' into 'develop'
Fix ReportControllerTest
See merge request pleroma/pleroma!1746
Egor Kislitsyn [Mon, 30 Sep 2019 11:30:10 +0000 (18:30 +0700)]
Fix ReportControllerTest
kaniini [Mon, 30 Sep 2019 11:21:49 +0000 (11:21 +0000)]
Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
kaniini [Mon, 30 Sep 2019 11:17:30 +0000 (11:17 +0000)]
Merge branch 'split-masto-api/reports' into 'develop'
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
kaniini [Mon, 30 Sep 2019 10:49:40 +0000 (10:49 +0000)]
Merge branch 'split-masto-api/conversations' into 'develop'
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
kaniini [Mon, 30 Sep 2019 10:46:34 +0000 (10:46 +0000)]
Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop'
Remove subscription_notifications table if it existed
See merge request pleroma/pleroma!1742
kaniini [Mon, 30 Sep 2019 10:45:00 +0000 (10:45 +0000)]
Merge branch 'feature/scrobbling' into 'develop'
media scrobbling ("now playing" API)
See merge request pleroma/pleroma!1732
Egor Kislitsyn [Mon, 30 Sep 2019 10:04:03 +0000 (17:04 +0700)]
Extract report actions from `MastodonAPIController` to `ReportController`
Update MastodonAPI.ReportView
Ariadne Conill [Sun, 29 Sep 2019 02:18:34 +0000 (02:18 +0000)]
change new scrobble endpoint
Ariadne Conill [Sun, 29 Sep 2019 00:35:40 +0000 (00:35 +0000)]
test: fix scrobble controller tests
projects / akkoma / log