310 Commits (e7836adf21421de7a6d1d84fd605ec7d7f207cda)

Author	SHA1	Message	Date
Maxim Filippov	e7836adf21	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
kaniini	a39e065916	Merge branch 'feature/return-link-for-password-reset' into 'develop' ... Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691	5 years ago
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	5 years ago
rinpatch	d87be2ec96	Don't embed the first page in inboxes/outboxes and refactor the views to ... follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.	5 years ago
Maxim Filippov	5e9759cd7d	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' ... Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	5 years ago
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' ... Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	5 years ago
Maxim Filippov	cf1960d596	Better changelog wording	5 years ago
Maxim Filippov	79c3443b60	Update CHANGELOG	5 years ago
Maxim Filippov	c8fdf757c1	I did not put these lines in CHANGELOG	5 years ago
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	5 years ago
eugenijm	7cf1252455	Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)	5 years ago
Egor Kislitsyn	ae1d371428	Update CHANGELOG	5 years ago
eugenijm	fe5e0b7846	Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)	5 years ago
feld	ab2ca3038f	Merge branch 'hide-follower-following-count' into 'develop' ... Add a setting to hide follows/followers stats from the user profile See merge request pleroma/pleroma!1663	5 years ago
feld	25b4365656	Merge branch 'admin_api_invite_tokens' into 'develop' ... POST for creating invite tokens in admin api See merge request pleroma/pleroma!1637	5 years ago
rinpatch	a22b87b30c	Add a changelog entry for poll refetching	5 years ago
Maxim Filippov	f89728ad95	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
Alex S	4faf2b1555	post for creating invite tokens in admin api	5 years ago
rinpatch	ea6d4137da	Apply suggestion to CHANGELOG.md	5 years ago
rinpatch	bf8567996c	Sync develop changelog with master and create a new section for post-1.1 ... changes	5 years ago
rinpatch	f758e663b2	Merge branch 'feature/bump-elixir-verstion' into 'develop' ... Bump elixir version to ~> 1.8 See merge request pleroma/pleroma!1686	5 years ago
Maxim Filippov	f9dd121ad3	Admin API: Return link alongside with token on password reset	5 years ago
Maxim Filippov	e686f9be81	Apply suggestion to CHANGELOG.md	5 years ago
Maxim Filippov	228bfd8a70	Bump elixir version to ~> 1.8	5 years ago
eugenijm	450bf7a63c	Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)	5 years ago
Maxim Filippov	df15ed13d1	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
Maxim Filippov	219dca1b00	Merge branch 'develop' into feature/return-total-for-reports	5 years ago
Ivan Tashkinov	610236d6be	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md	5 years ago
Ivan Tashkinov	6bcedb693c	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md # mix.lock	5 years ago
rinpatch	5c5ebd3861	Mastodon API: Respect post privacy in favourited/reblogged endpoints	5 years ago
Haelwenn	0d9609894f	Merge branch 'feature/change-email' into 'develop' ... Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580	5 years ago
Egor Kislitsyn	25d8216804	Add email change endpoint	5 years ago
Alex S	68e45a327f	changelog	5 years ago
Egor Kislitsyn	b40b10b53d	Add an endpoint to get multiple statuses by IDs	5 years ago
Maxim Filippov	d1abf7a358	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
minibikini	11e12b5761	Add Pleroma.Plugs.Cache	5 years ago
feld	bce16f4557	Merge branch 'update-changelog' into 'develop' ... Update CHANGELOG (add a note about !1649) See merge request pleroma/pleroma!1650	5 years ago
Egor Kislitsyn	e34de00052	Update CHANGELOG (add a note about !1649)	5 years ago
Ivan Tashkinov	c3f00447af	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
rinpatch	f92dc82dda	Prioritize the removal of TwitterAPI and :accept_blocks in the changelog	5 years ago
Ivan Tashkinov	ca1ba1e272	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs	5 years ago
rinpatch	896ffabe37	Merge branch 'so-long-twitterapi' into 'develop' ... Removing TwitterAPI See merge request pleroma/pleroma!1605	5 years ago
rinpatch	b312ca3d52	Mastodon API Poll view: Fix handling of polls without an end date	5 years ago
Ivan Tashkinov	79cf629e1a	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
rinpatch	3e30f6e198	Merge branch 'fix/safe-render-notifications' into 'develop' ... Do not crash if one notification failed to render See merge request pleroma/pleroma!1630	5 years ago
rinpatch	558969a0fd	Do not crash if one notification failed to render	5 years ago
Maxim Filippov	af746fa4a8	Return total for reports	5 years ago
Maxim Filippov	3542ca6702	Merge branch 'develop' into feature/moderation-log-filters	5 years ago