summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-03Fix more linksrinpatch
2019-10-03Fix references to other pagesrinpatch
2019-10-03Remove Small customizations as it's contents have been integrated intorinpatch
static_dir.md
2019-10-02Remove "General tips for customizing Pleroma FE" because it's no longerrinpatch
relevant and we have actual fe docs now
2019-10-02Rename "Configuration" to "Configuration Cheat Sheet" and explain a bitrinpatch
about how Pleroma Configuration works
2019-10-02Rename some directories because MkDocs uses them for categoriesrinpatch
2019-10-02[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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-02Move `:favourites` and `:bookmarks` actions to StatusControllerEgor Kislitsyn
2019-10-02Move `follows`, `mutes` and `blocks` actions to AccountControllerEgor Kislitsyn
2019-10-02Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'rinpatch
[#1278] Move actions from MastodonAPIController to CustomEmojiController and MastoFEController See merge request pleroma/pleroma!1772
2019-10-02Fix credo warningEgor Kislitsyn
2019-10-02Add MastoFEControllerEgor Kislitsyn
2019-10-02Add CustomEmojiControllerEgor Kislitsyn
2019-10-02Merge branch 'split-masto-api/instance' into 'develop'kaniini
Extract instance actions from `MastodonAPIController` to `InstanceController` See merge request pleroma/pleroma!1760
2019-10-02Merge branch 'accept-embedded-announce-object' into 'develop'kaniini
Inline object when Announcing a self-owned private object See merge request pleroma/pleroma!1769
2019-10-02Merge branch 'get_announce_visibility-name' into 'develop'kaniini
Rename misleading `get_announce_visibility` to `public_announce?` See merge request pleroma/pleroma!1768
2019-10-02Inline object when Announcing a self-owned private objectThibaut Girka
2019-10-02Rename misleading `get_announce_visibility` to `public_announce?`Thibaut Girka
2019-10-02Add tests for Pleroma.JobQueueMonitorEgor Kislitsyn
2019-10-02Update CHANGELOG and pleroma_api.mdEgor Kislitsyn
2019-10-02Remove `:enqueued` counterEgor Kislitsyn
2019-10-02Extract instance actions from `MastodonAPIController` to `InstanceController`Egor Kislitsyn
2019-10-02Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'kaniini
Send an identifier alongside with error message in OAuthController See merge request pleroma/pleroma!1765
2019-10-02Merge branch 'split-masto-api/auth' into 'develop'kaniini
Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759
2019-10-02Merge branch 'features/private-reblogs' into 'develop'kaniini
Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766
2019-10-02Merge branch 'update/admin-fe-20191001' into 'develop'kaniini
Update AdminFE bundle See merge request pleroma/pleroma!1767
2019-10-01Update AdminFE bundleMark Felder
2019-10-01Merge branch 'feature/expose-attachment-size' into 'develop'feld
Add upload limits to /api/v1/instance See merge request pleroma/pleroma!1614
2019-10-01Revert "Add upload limits to /api/v1/instance"feld
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01Store private announcements in object.data["announcements"], filter them on ↵Thibaut Girka
display
2019-10-01Merge branch 'feature/track-reverse-proxy-failures' into 'develop'feld
Track failed proxy urls and don't request them again Closes #1197 See merge request pleroma/pleroma!1618
2019-10-01Track failed proxy urls and don't request them againSergey Suprunenko
2019-10-01Fix returned visibility of announces in MastodonAPIThibaut Girka
2019-10-01Add tests for privately announcing statuses via APIThibaut Girka
2019-10-01Allow users to announce privately, including own private notesThibaut Girka
2019-10-01Discard identifier, if emptyMaxim Filippov
2019-10-01Add testsThibaut Girka
2019-10-01Ensure self-announces do not widen the audience of the original postThibaut Girka
2019-10-01Make activity announceable by its author.KokaKiwi
2019-10-01Send an identifier alongside with error message in OAuthControllerMaxim Filippov
2019-10-01Extract auth actions from `MastodonAPIController` to `AuthController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/apps' into 'develop'kaniini
Extract apps actions from `MastodonAPIController` to `AppController` See merge request pleroma/pleroma!1758
2019-10-01Extract apps actions from `MastodonAPIController` to `AppController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/suggestions' into 'develop'kaniini
Extract suggestions actions from `MastodonAPIController` to `SuggestionController` See merge request pleroma/pleroma!1757
2019-10-01Extract suggestions actions from `MastodonAPIController` to ↵Egor Kislitsyn
`SuggestionController`
2019-10-01Merge branch 'split-masto-api/media' into 'develop'kaniini
Extract media actions from `MastodonAPIController` to `MediaController` See merge request pleroma/pleroma!1756
2019-10-01Extract media actions from `MastodonAPIController` to `MediaController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/polls' into 'develop'kaniini
Extract poll actions from `MastodonAPIController` to `PollController` See merge request pleroma/pleroma!1755
2019-10-01Extract poll actions from `MastodonAPIController` to `PollController`Egor Kislitsyn
2019-10-01Add `rel="ugc"`kPherox
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 00:42:12 +0000