summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-04ActivityPub.Utils: Fix undo test.lain
2019-10-04ActivityPub: Change addressing of Undo.lain
2019-10-04Merge branch 'develop' into 'fix/extended-nickname-format-default-config'feld
# Conflicts: # CHANGELOG.md
2019-10-04Merge branch 'featrue/job-monitor' into 'develop'lain
Add Pleroma.JobQueueMonitor Closes #1274 See merge request pleroma/pleroma!1721
2019-10-04Merge branch 'fix/nickname-fail' into 'develop'lain
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname Closes #1293 See merge request pleroma/pleroma!1777
2019-10-04Fix get_cached_by_nickname_or_id not allowing to get local users byrinpatch
nickname Closes #1293
2019-10-04Merge branch 'bugfix/notification-nil-actor' into 'develop'lain
notification_view.ex: Make sure `account` isn’t empty See merge request pleroma/pleroma!1779
2019-10-04Merge branch 'fix/oauth-controller' into 'develop'lain
Fix OAuthController Closes #1294 See merge request pleroma/pleroma!1780
2019-10-04Fix OAuthControllerEgor Kislitsyn
2019-10-04notification_view.ex: Make sure `account` isn’t emptyHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-03Merge branch 'docs/frontend_configuration' into 'develop'rinpatch
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations See merge request pleroma/pleroma!1778
2019-10-04cheatsheet.md: link to pleroma-fe docs for :frontend_configurationsHaelwenn (lanodan) Monnier
2019-10-04Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-03Merge branch 'mkdocs-migration-prep' into 'develop'rinpatch
MkDocs migration preparation See merge request pleroma/pleroma!1774
2019-10-03Remove a test branch from CIrinpatch
2019-10-03Add missing extended_nickname_format setting to the default configMark Felder
2019-10-03Add a missing language specificationrinpatch
2019-10-03Change docs build/deploy to just trigger a pipeline in the docs reporinpatch
2019-10-03Move config task docs to a separate file and mark it as WIPrinpatch
2019-10-03Mix tasks: derive moduledoc from doc filesrinpatch
2019-10-03Move database maintenance tasks docs to a separate filerinpatch
2019-10-03MkDocs does not like if a paragraph doesn't have a newline after itrinpatch
2019-10-03Remove silent mode note as it's no longer relevantrinpatch
2019-10-03Cheatsheet: Use note/warning blocks instead of bold textrinpatch
2019-10-03Fix a typo in activity expirationsrinpatch
2019-10-03Remove fe settings from :instance as they no longer do anythingrinpatch
2019-10-03Move bold text in RemoveIp description into a proper warningrinpatch
2019-10-03Add missing language specrinpatch
2019-10-03Cheatsheet: Move the deprecated config warning into a warning blockrinpatch
2019-10-03Oopsrinpatch
2019-10-03Move user tasks docs to a separate filerinpatch
2019-10-03Use consistent command signaturerinpatch
2019-10-03Fix up some headingsrinpatch
2019-10-03Move uploads task docs to a separate filerinpatch
2019-10-03Move relay docs to a separate filerinpatch
2019-10-03Move instance CLI task docs to a text filerinpatch
2019-10-03Improve styling of CLI tasksrinpatch
2019-10-03Move digest email docs to a separate file and improve stylingrinpatch
2019-10-03Move emoji task docs to a separate filerinpatch
2019-10-03Remove a reference to inline docs since everything it describes isrinpatch
described in the cheatsheet already and add A TODO
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 03:30:22 +0000