summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-22Better changelog wordingMaxim Filippov
2019-09-22FormatMaxim Filippov
2019-09-22Admin API: Add ability to force user's password resetMaxim Filippov
2019-09-19Merge branch 'conversation-docs' into 'develop'rinpatch
API Docs: Document conversation ids. See merge request pleroma/pleroma!1701
2019-09-19API Docs: Document conversation ids.lain
2019-09-19Merge branch 'docs/clients-update' into 'develop'Haelwenn
docs/clients.md: Update source code urls See merge request pleroma/pleroma!1697
2019-09-19Merge branch 'outbox_pagination' into 'develop'lain
Fix AP outbox pagination See merge request pleroma/pleroma!1700
2019-09-19Add test for correct AP outbox paginationD Anzorge
2019-09-19Merge branch 'direct_conversation_id_on_status_creation' into 'develop'rinpatch
Return `pleroma.direct_conversation_id` when creating a direct message See merge request pleroma/pleroma!1699
2019-09-19Fix pagination in AP outbox.jsonD Anzorge
2019-09-19Mastodon API: Return `pleroma.direct_conversation_id` when creating direct ↵eugenijm
messages (`POST /api/v1/statuses`)
2019-09-18Merge branch 'issue/733' into 'develop'Haelwenn
[#733] added test for Ostatus See merge request pleroma/pleroma!1657
2019-09-18Merge branch 'chores/bump-copyright-year' into 'develop'rinpatch
Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698
2019-09-18Bump copyright years of files changed in 2019Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2019-09-18docs/clients.md: Update source code urlsHaelwenn (lanodan) Monnier
2019-09-18Merge branch 'hide-follower-following-count' into 'develop'feld
Add a setting to hide follows/followers stats from the user profile See merge request pleroma/pleroma!1663
2019-09-18Merge branch 'admin_api_invite_tokens' into 'develop'feld
POST for creating invite tokens in admin api See merge request pleroma/pleroma!1637
2019-09-18Merge branch 'restore-tests' into 'develop'feld
Restore tests for `change_password` and `delete_account` See merge request pleroma/pleroma!1658
2019-09-18Merge branch 'chore/refetch-poll-changelog-update' into 'develop'rinpatch
Add a changelog entry for poll refetching See merge request pleroma/pleroma!1696
2019-09-18Merge branch 'fix/test-upload-cleanup' into 'develop'Haelwenn
Cleanup uploads after the tests are finished See merge request pleroma/pleroma!1695
2019-09-19Add a changelog entry for poll refetchingrinpatch
2019-09-18Merge branch 'feature/poll-refresh' into 'develop'Haelwenn
Poll refetching See merge request pleroma/pleroma!1694
2019-09-18Cleanup uploads after the tests are finishedrinpatch
2019-09-18Fix credo issuesrinpatch
2019-09-18Do not refetch local objectsrinpatch
2019-09-18Preserve internal fields when reinjectingrinpatch
2019-09-18Move object internal fields to a constantrinpatch
2019-09-18Set updated_at even if the object stayed the samerinpatch
2019-09-18Fix wrong argument order when calling NaiveDateTime.diffrinpatch
2019-09-18Capture log in object refetch testsrinpatch
2019-09-18Merge branch 'bugfix/docs-formatting' into 'develop'Haelwenn
Improve generated docs formatting See merge request pleroma/pleroma!1688
2019-09-18Initial poll refresh supportrinpatch
Implement refreshing the object with an interval and call the function when getting the poll.
2019-09-18namingsAlex S
2019-09-18docs fixAlex S
2019-09-18little fixesAlex S
2019-09-18post for creating invite tokens in admin apiAlex S
2019-09-17Merge branch 'chore/changelog-separate-1.1' into 'develop'Haelwenn
Sync develop changelog with master and create a new section for post-1.1 changes See merge request pleroma/pleroma!1689
2019-09-17Apply suggestion to CHANGELOG.mdrinpatch
2019-09-17markdown.ex: put two-spaces before the description-newlineHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: end suggestions list with a newlineHaelwenn (lanodan) Monnier
Otherwise we end up with suggestion on the same level as the childs Markdown is a fuck…
2019-09-17markdown.ex: \n\n on >1 suggestions, 2-spaces on oneHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: Make suggestion(s) plural only if on >1Haelwenn (lanodan) Monnier
2019-09-17description.exs: uncomment type for email logoHaelwenn (lanodan) Monnier
2019-09-17description.exs: remove empty strings on descriptionsHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: do not fail if there is no childrenHaelwenn (lanodan) Monnier
2019-09-17docs/markdown.ex: do no print empty suggestionsHaelwenn (lanodan) Monnier
2019-09-17description.exs: remove empty strings and arraysHaelwenn (lanodan) Monnier
2019-09-18Sync develop changelog with master and create a new section for post-1.1rinpatch
changes
2019-09-17Merge branch 'feature/bump-elixir-verstion' into 'develop'rinpatch
Bump elixir version to ~> 1.8 See merge request pleroma/pleroma!1686
2019-09-17Apply suggestion to CHANGELOG.mdMaxim Filippov