summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-18Fix responseMaxim Filippov
2019-09-18Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-18Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.exIvan Tashkinov
2019-09-18Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes
2019-09-18[#1234] Added changelog entry, removed admin OAuth scopes.Ivan Tashkinov
2019-09-18Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions
2019-09-18[#1260] Added changelog entry.Ivan Tashkinov
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-17[#1234] Addressed code analysis issue.Ivan Tashkinov
2019-09-17[#1234] Undone reordering-related changes in router.ex.Ivan Tashkinov
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-17Admin API: Return link alongside with token on password resetMaxim Filippov
2019-09-17Apply suggestion to CHANGELOG.mdMaxim Filippov
2019-09-17[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17docs/markdown.ex: child header as "- key (type): description"Haelwenn (lanodan) Monnier
2019-09-17Remove [true,false] for booleans, it is implicitHaelwenn (lanodan) Monnier
2019-09-17Merge branch 'deps/update-tesla' into 'develop'feld
Update Tesla to 1.3 Closes #1262 See merge request pleroma/pleroma!1684
2019-09-17Bump elixir version to ~> 1.8Maxim Filippov
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-11 18:37:30 +0000