989 Commits (d36182c08892723b53e801a564531ee7a463052f)

Author	SHA1	Message	Date
lain	fc42446755	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0	4 years ago
feld	fb33321fa2	Merge branch 'feature/1952-read-muted-notifications' into 'develop' ... Automatically mark notifications about statuses from muted users and threads as read Closes #1952 See merge request pleroma/pleroma!2893	4 years ago
lain	ea2b5c07e3	Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0	4 years ago
lain	c1d51944c7	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	4 years ago
Alexander Strizhakov	13f6029b4b	additional changelog entry	4 years ago
Alexander Strizhakov	fa23d5d3d3	changelog entry	4 years ago
lain	757410a177	Changelog: Add info about upload description changes	4 years ago
lain	e154fcf525	Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop' ... [#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy Closes #2046 See merge request pleroma/pleroma!2890	4 years ago
Hugo	b2d3b26511	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Hugo Müller-Downing	317b6c6c52	Start :ssl if not started when running migration or rollback	4 years ago
Sergey Suprunenko	25c69e271a	Make notifications about new statuses from muted threads read	4 years ago
Ivan Tashkinov	60ac83a4c1	[#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.	4 years ago
Alex Gleason	1a5a7ba6e8	Merge remote-tracking branch 'upstream/develop' into aliases	4 years ago
Mark Felder	54e2af8293	Merge branch 'develop' into fix/ldap-auth-issues	4 years ago
lain	ebb30128af	Changelog: Add information about the object age policy	4 years ago
lain	bf95dfb240	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	4 years ago
Mary Kate	f785dba09b	changelog for filter whole_word fix	4 years ago
Mark Felder	cb7879c7c1	Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma.Web.Auth.PleromaAuthenticator	4 years ago
lain	532d6f94ae	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	4 years ago
lain	28584bb224	Merge branch 'email-blacklist' into 'develop' ... Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837	4 years ago
lain	2f4289d455	Changelog: Add info about email blacklist	4 years ago
lain	e26f2c9135	Changelog: Update with frontend mix task.	4 years ago
Ilja	f671d7e68c	Add welcome chatmessages ... * I added the option in config/config.exs * created a new module lib/pleroma/user/welcome_chat_message.ex * Added it to the registration flow * added to the cheatsheet * added to the config/description.ex * added to the Changelog.md	4 years ago
lain	873ff5ce14	Merge branch 'hide-reactions' into 'develop' ... Let favourites and emoji reactions optionally be hidden See merge request pleroma/pleroma!2804	4 years ago
lain	20d89472e3	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Mark Felder	33f0427809	Expose seconds_valid in Pleroma Captcha API endpoint	4 years ago
Alex Gleason	026a51cb27	:show_reactions, add CHANGELOG.md, refactor test	4 years ago
lain	dc36d6e9d2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin	4 years ago
lain	f715bf1915	Changelog: Include frontend information.	4 years ago
Alex Gleason	6747bf2e16	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
lain	2a3abfd326	Merge branch 'issue/1934-welcome-email' into 'develop' ... [#1934] welcome email See merge request pleroma/pleroma!2786	4 years ago
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
feld	51627a10e5	Merge branch 'unblock-domain-via-query' into 'develop' ... Allow unblocking a domain via query params Closes #1971 See merge request pleroma/pleroma!2783	4 years ago
Mark Felder	4bfad0b483	Support blocking via query parameters as well and document the change.	4 years ago
Maksim Pechnikov	67ab9a7928	Merge branch 'develop' into issue/1934-welcome-email	4 years ago
lain	a81581472f	Merge branch 'linkify' into 'develop' ... Fix Linkify See merge request pleroma/pleroma!2792	4 years ago
Maksim Pechnikov	7991ddad58	added warning to use old keys	4 years ago
lain	1c9752cff4	Merge branch 'fix/pleroma-api-emoji-packs' into 'develop' ... Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777	4 years ago
Maksim Pechnikov	b620290dd9	update description	4 years ago
Mark Felder	b157b7dab3	Document the emoji packs API fix	4 years ago
lain	5b1eeb06d8	Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" ... This reverts merge request !2784	4 years ago
lain	696c13ce54	Revert "Merge branch 'linkify' into 'develop'" ... This reverts merge request !2677	4 years ago
lain	2b5d9eb105	Merge branch 'linkify' into 'develop' ... AutoLinker --> Linkify, update to latest version See merge request pleroma/pleroma!2677	4 years ago
Maksim Pechnikov	3edaecae96	added welcome email	4 years ago
Dym Sohin	531c3ab9f3	fix markdown rendering withing <details>; typo parent**s**_visible	4 years ago
Alex Gleason	bd1e2e3a58	Validate alias IDs	4 years ago
Mark Felder	20a496d2cb	Expose the post formats in /api/v1/instance	4 years ago
Alex Gleason	38425ebdbf	Merge remote-tracking branch 'upstream/develop' into linkify	4 years ago
Mark Felder	9d30bacace	Merge branch 'develop' into refactor/notification_settings	4 years ago
Alex Gleason	48983e9421	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Alex Gleason	e82060c472	Update CHANGELOG.md	4 years ago
feld	3f65f2ea79	Merge branch 'feature/1922-media-proxy-whitelist' into 'develop' ... Support for hosts with scheme in MediaProxy whitelist setting Closes #1922 See merge request pleroma/pleroma!2754	4 years ago
Mark Felder	80c21100db	Merge branch 'develop' into refactor/notification_settings	4 years ago
Alexander Strizhakov	b376442325	MediaProxy whitelist setting now supports hosts with scheme ... added deprecation warning about using bare domains	4 years ago
Mark Felder	6167593881	Support Exiftool for stripping EXIF data ... We really only want to strip location data anyway, and mogrify strips color profiles.	4 years ago
Mark Felder	0517d3252e	Probably worth documenting the MediaProxy fix	4 years ago
lain	b39eb6ecc5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
Haelwenn	4ac6e6283f	Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix' ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	49c4e24953	Merge branch 'develop' into fix/csp-for-captcha	4 years ago
eugenijm	c2be0da79f	Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`	4 years ago
Haelwenn (lanodan) Monnier	31fef95e35	Add changelog and documentation	4 years ago
Haelwenn	a8447c3803	Merge branch '1918-avatar-background-header-reset-2' into 'develop' ... Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729	4 years ago
Mark Felder	18438a9bf0	Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.	4 years ago
lain	92e6801c17	Changelog: Add info about avatar removal	4 years ago
Haelwenn	fa0fa4552f	Merge branch 'feature/1392-support-irreversible-filters' into 'develop' ... Updates for Feature/1392 support irreversible filters Closes #1392 See merge request pleroma/pleroma!2186	4 years ago
lain	74b88c0a8b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
lain	58da575935	Changelog: Document description limits.	4 years ago
Sergey Suprunenko	8277b29790	Restrict thread statuses that contain user's irreversible filters	4 years ago
Mark Felder	991bd78dda	Document the Captcha CSP fix	4 years ago
lain	cbf2fe9649	Update changelog	4 years ago
lain	ef4c16f6f1	Update changelog	4 years ago
Mark Felder	8121e46f25	Merge branch 'develop' into activation-meta	4 years ago
Mark Felder	02d855b2b9	Document the new API extension of /api/v1/instance	4 years ago
lain	ce9b7c0e0f	Changelog: Update with stream changes.	4 years ago
Alex Gleason	8daacc9114	AutoLinker --> Linkify, update to latest version ... https://git.pleroma.social/pleroma/elixir-libraries/linkify	4 years ago
lain	577da132da	Merge branch '1031-parent-visible' into 'develop' ... Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679	4 years ago
Mark Felder	76313e8162	Document breaking change of hide_notification_details setting	4 years ago
Mark Felder	fd5e797379	Simplify notification filtering settings further	4 years ago
Mark Felder	433c01b370	Merge branch 'develop' into refactor/notification_settings	4 years ago
lain	1702239428	Changelog: Put info under API header.	4 years ago
lain	79ee914bc2	Changelog: Add info about parent_visible field	4 years ago
Roman Chvanikov	1471b70ef1	Merge develop	4 years ago
Haelwenn	c7d69e9256	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' ... Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320	4 years ago
rinpatch	c75ba63bef	Merge branch '1865-media-only' into 'develop' ... Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned" Closes #1865 See merge request pleroma/pleroma!2650	4 years ago
lain	93ae1c8bd3	Merge branch 'feature/1854-emoji-pagination' into 'develop' ... Emoji and packs pagination Closes #1854 See merge request pleroma/pleroma!2658	4 years ago
lain	7d542450b1	Merge branch 'develop' into '1865-media-only' ... # Conflicts: # CHANGELOG.md	4 years ago
Sergey Suprunenko	b63646169d	Add support for bot field in update_credentials	4 years ago
Alexander Strizhakov	0c739b423a	changelog entry	4 years ago
Alexander Strizhakov	9a82de219c	formatting	4 years ago
Alexander Strizhakov	abda3f2d92	suggestion for changelog	4 years ago
rinpatch	281ecd6b30	CHANGELOG.md: mention minimal elixir version update	4 years ago
Haelwenn	b536e57124	Merge branch '1866-last-status-stuff' into 'develop' ... Resolve "/api/v1/conversations returns the wrong `last_status`" Closes #1866 See merge request pleroma/pleroma!2647	4 years ago
Alexander Strizhakov	ed189568f3	moving mrf settings from instance to separate group	4 years ago
href	ec1452fd1c	Pleroma.MIME: use gen_magic	4 years ago
lain	4733f6a337	Changelog: Add info about `only_media` changes.	4 years ago
Egor Kislitsyn	58e4e3db8b	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	4 years ago
lain	1092b36500	Changelog: Add info about conversation view changes.	4 years ago
eugenijm	b15cfc3d36	Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page	4 years ago
rinpatch	d050d21103	Apply suggestion to CHANGELOG.md	4 years ago
rinpatch	ffd12d3a1e	CHANGELOG.md: add 2.0.7 entry	4 years ago
Egor Kislitsyn	697cf92024	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	4 years ago
lain	e557265a03	Merge branch 'global-status-expiration' into 'develop' ... Global status expiration See merge request pleroma/pleroma!2208	4 years ago
feld	6d902916dd	Merge branch 'features/mix-task-reset-mfa' into 'develop' ... New mix task: pleroma.user reset_mfa <nickname> See merge request pleroma/pleroma!2643	4 years ago
Mark Felder	e505e59d9c	Document new mix task feature to reset mfa	4 years ago
Mark Felder	c2048f75cd	Add changelog entry for emoji pack reload command	4 years ago
Egor Kislitsyn	1f35acce54	Merge OGP parser with TwitterCard	4 years ago
rinpatch	f05f206e13	CHANGELOG.md: add 2.0.6 entry	4 years ago
Roman Chvanikov	604a83ae3e	merge develop	4 years ago
lain	e213e31577	Changelog: Add chats to changelog.	4 years ago
Egor Kislitsyn	a7627bdc7a	Merge remote-tracking branch 'origin/develop' into global-status-expiration	4 years ago
Alex Gleason	d38f28870e	Add blob: to connect-src CSP	4 years ago
Mark Felder	9eea800026	Refactor notification settings	4 years ago
rinpatch	7bc2ec0aa2	Merge branch 'mastodon-migration-compat' into 'develop' ... Add compatibility routes for converted mastodon instances Closes #1797 See merge request pleroma/pleroma!2572	4 years ago
Roman Chvanikov	8eb1dfadca	Update CHANGELOG and docs	4 years ago
lain	3506e95499	Add Changelog	4 years ago
lain	a42a0716ec	Merge branch 'features/emoji_stealer' into 'develop' ... MRF.StealEmojiPolicy: New Policy See merge request pleroma/pleroma!2385	4 years ago
lain	2a74565090	Changelog: Add background to instance	4 years ago
Roman Chvanikov	01bd6a1e54	Merge branch 'develop' into feature/admin-api-status-count-per-instance	4 years ago
Stephanie Wilde-Hobbs	3eff542678	Add Changelog entry	4 years ago
Haelwenn (lanodan) Monnier	e688d4ee69	MRF.StealEmojiPolicy: New Policy ... Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex	4 years ago
Roman Chvanikov	8a383707ae	Merge develop	4 years ago
rinpatch	6430df851d	CHANGELOG.md: add 2.0.5 entry	4 years ago
rinpatch	489201d5d5	CHANGELOG.md: mention AP C2S change	4 years ago
rinpatch	69e1f23dd3	CHANGELOG.md: Add 2.0.4 entry	4 years ago
rinpatch	0ad89762a1	insert skeletons migration: fix for non-local locals ... Apparently some instances have local users with local ap_ids that are marked as local: false. Needs more investigation into how that happened. In the meantime, the skeleton migration was patched to just ignore all known ap ids, not just locals. Doesn't seem to slow down the migration too much on patch.cx Closes #1746	4 years ago
Roman Chvanikov	4c19702390	Add docs	4 years ago
rinpatch	30eaef9d61	healthcheck: report real amount of memory allocated by beam ... as opposed to memory currently in use	4 years ago
rinpatch	f4d50fbd81	CHANGELOG.md: Add entries from 2.0.3	4 years ago
Maksim Pechnikov	8b97b6f5ba	Merge branch 'develop' into issue/1276-2	4 years ago
lain	df846eda71	Merge branch 'bugfix/sensitive_object' into 'develop' ... Transmogrifier.set_sensitive/1: Keep sensitive set to true Closes #954 See merge request pleroma/pleroma!2470	4 years ago
lain	f84c8f2f0d	Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop' ... Webfinger: Request account info with the acct scheme Closes #1728 See merge request pleroma/pleroma!2465	4 years ago
Maksim Pechnikov	fb38b7339c	Merge branch 'develop' into issue/1276-2	4 years ago
Alexander Strizhakov	e7d8ab8303	admin_api fetch status by id	4 years ago
Egor Kislitsyn	decaa64f75	Merge branch 'develop' into global-status-expiration	4 years ago
Haelwenn (lanodan) Monnier	bf0e41f0da	Transmogrifier.set_sensitive/1: Keep sensitive set to true	4 years ago
lain	7dd47bee82	Update changelog	4 years ago
Maksim Pechnikov	fe7a0d660e	Merge branch 'develop' into issue/1276-2	4 years ago
rinpatch	3126f8a334	Merge branch 'feature/1710-consolidate-instance-info' into 'develop' ... Feature/1710 consolidate instance info Closes #1710 See merge request pleroma/pleroma!2430	4 years ago
rinpatch	e0d392c04c	CHANGELOG.md: Add 2.0.3 changelog	4 years ago
rinpatch	d589f3dcfb	CHANGELOG.md: Add entry for re-registration ban	4 years ago
rinpatch	9a92e5a351	Reword changelog entry for follow relationship bug	4 years ago
eugenijm	66a8e1312d	Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`	4 years ago
Ivan Tashkinov	92efb888c7	Made follow request notifications non-optional (removed config switch).	4 years ago
Maksim Pechnikov	a92c713d9c	Merge branch 'develop' into issue/1276-2	4 years ago
Alexander Strizhakov	9855018425	changelog entry	4 years ago
Alexander Strizhakov	f3070ddae5	removing entry from changelog	4 years ago
Alexander Strizhakov	5839e67eb8	return data only for updated emoji	4 years ago
lain	4c4344b7b1	Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop' ... [#1364] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed) See merge request pleroma/pleroma!2367	4 years ago
Egor Kislitsyn	764b4f95a8	Merge branch 'develop' into global-status-expiration	4 years ago
lain	5a3a5abc0c	Changelog: Add info about `/api/v1/instance` changes	4 years ago
Egor Kislitsyn	c56c0a3d23	Merge branch 'develop' into global-status-expiration	4 years ago
lain	e2f3030c86	Apply suggestion to CHANGELOG.md	4 years ago
Alexander	6e625a427c	reply filtering	4 years ago
Ivan Tashkinov	e7fb593d13	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	4 years ago
Egor Kislitsyn	771c1ad735	Update CHANGELOG	4 years ago
Ivan Tashkinov	bb5d0eafa4	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	4 years ago
Egor Kislitsyn	364eecc49f	Merge branch 'develop' into global-status-expiration	4 years ago
Alex Gleason	bedc558809	Merge remote-tracking branch 'upstream/develop' into accept-deletes	4 years ago
Alex Gleason	b54c8813d6	Add :reject_deletes option to SimplePolicy	4 years ago
Ilja	8b4de61d64	Fix ObjectAgePolicyTest ... The policy didn't block old posts as it should. * I fixed it and tested on a test server * I added the settings to description so that this information is shown in nodeinfo * TODO: I didn't work TTD and still need to fix the tests	4 years ago
rinpatch	918a8094fc	Merge branch '1559-follow-request-notifications' into 'develop' ... [#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354	4 years ago
Ivan Tashkinov	66f55106bd	[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.	4 years ago
Ivan Tashkinov	6e6f95c6ae	Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	4d22b100b7	move changelogs entries to unreleased section	4 years ago
Haelwenn	a17bfb5fab	Merge branch 'feature/1584-client-captcha-options' into 'develop' ... Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252	4 years ago
Alexander Strizhakov	72ef6cc4f2	added need_reboot endpoint to admin api	4 years ago
Maksim Pechnikov	4b3b1fec4e	added an endpoint for getting unread notification count	4 years ago
Ivan Tashkinov	0cda80f266	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/notification.ex	4 years ago
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	4 years ago
feld	bf3afbc1a1	Merge branch 'logger-configuration' into 'develop' ... Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365	4 years ago
Ivan Tashkinov	650853fc89	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/notification.ex	5 years ago
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	dc8fa04192	Merge branch 'develop' into global-status-expiration	5 years ago
Ivan Tashkinov	a21baf89d8	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	5 years ago
Ivan Tashkinov	dc2637c188	[#2342] Removed changelog entry for temporary configuration option.	5 years ago
Alexander Strizhakov	de34c4ee6b	changelog entry	5 years ago
Ivan Tashkinov	88b16fdfb7	[#1364] Disabled notifications on activities from blocked domains.	5 years ago
Mark Felder	6ff8812ea3	Add a section for changelog entries that pertain to the next patch release. ... This will make it easier to keep changelogs synced between develop and stable branches.	5 years ago
Egor Kislitsyn	dd612f86ae	Merge remote-tracking branch 'origin/develop' into global-status-expiration	5 years ago
Egor Kislitsyn	7f692343c8	Merge branch 'develop' into global-status-expiration	5 years ago
Egor Kislitsyn	cf2a0574e7	Merge branch 'develop' into fix/support-conversations-pagination	5 years ago
rinpatch	9abf13abe0	CHANGELOG.md: update 2.0.2 release date	5 years ago
rinpatch	adeb82e496	CHANGELOG.md: add 2.0.2 update notes	5 years ago
rinpatch	0b8f9a66ae	CHANGELOG.md: add entries for funkwhale-related changes	5 years ago
rinpatch	7306d2d069	CHANGELOG.md: Add 2.0.2 entry	5 years ago
rinpatch	2a08f44b02	CHANGELOG.md: Add upgrade notes for 2.0.1	5 years ago
rinpatch	781ac28859	changelog.md: add 2.0.1 entry	5 years ago
Egor Kislitsyn	c826d5195f	Update CHANGELOG	5 years ago
Alexander Strizhakov	73134e248a	no changelog entry - bug fixed only in develop	5 years ago
Alexander Strizhakov	5739c498c0	fix for gun connections pool	5 years ago
rinpatch	a8d98ba3aa	CHANGELOG.md: update 2.0.2 release date	5 years ago
rinpatch	8593867c47	CHANGELOG.md: add 2.0.2 update notes	5 years ago
rinpatch	ae937bcaa1	CHANGELOG.md: add entries for funkwhale-related changes	5 years ago
Ivan Tashkinov	1a4875adfa	[#1559] Support for "follow_request" notifications (configurable). ... (Not currently supported by PleromaFE, thus disabled by default).	5 years ago
Maksim Pechnikov	2b7d7bbd2d	Merge branch 'develop' into issue/1276	5 years ago
lain	1d4ab06505	Merge branch 'featureflag/emoji_reactions' into 'develop' ... Add emoji reactions to features in nodeinfo See merge request pleroma/pleroma!2313	5 years ago
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	98b96e45ab	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses ... # Conflicts: # CHANGELOG.md	5 years ago
Ivan Tashkinov	2f2bd7fe72	Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. ... See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.	5 years ago
Alexander Strizhakov	df5f89c0d6	test for default features and changelog entry	5 years ago
rinpatch	78b6549611	CHANGELOG.md: Add 2.0.2 entry	5 years ago
lain	c4d3ccc7b9	Merge branch 'admin-api-change-password' into 'develop' ... Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149	5 years ago
Alexander Strizhakov	2afc7a9112	changelog fix	5 years ago
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	5 years ago
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	5 years ago
lain	1d75d0ed7a	Merge branch 'admin-api-change-password' into 'develop' ... Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149	5 years ago
Egor Kislitsyn	4a2538967c	Support pagination in conversations	5 years ago
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	5 years ago
Egor Kislitsyn	80e1571610	Merge branch 'develop' into global-status-expiration	5 years ago
Alexander Strizhakov	9bae9b1b1b	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	5 years ago
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	5 years ago
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	5 years ago
eugenijm	13cce9c0de	Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.	5 years ago
eugenijm	d198e7fa2a	Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`	5 years ago
Alexander Strizhakov	f3791add99	removing with_move parameter	5 years ago
Egor Kislitsyn	421e35b578	Merge branch 'develop' into global-status-expiration	5 years ago
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	5 years ago
rinpatch	8d15d6c3ab	CHANGELOG.md: Add upgrade notes for 2.0.1	5 years ago
rinpatch	be500f8c88	CHANGELOG.md: Add remaining entries for 2.0.1	5 years ago
rinpatch	8096bfb891	changelog.md: add 2.0.1 entry	5 years ago
Haelwenn (lanodan) Monnier	5f9fbd7d33	Formatting: Do not use \n and prefer <br> instead ... It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375	5 years ago
feld	e7837bc14e	Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246	5 years ago
Haelwenn (lanodan) Monnier	d1379c4de8	Formatting: Do not use \n and prefer <br> instead ... It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375	5 years ago
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	5 years ago
Egor Kislitsyn	d1c7f8e576	Merge remote-tracking branch 'origin/develop' into global-status-expiration	5 years ago
feld	2019f3b3ff	Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246	5 years ago
Alexander Strizhakov	d9f8941dac	Merge branch 'develop' into gun	5 years ago
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	5 years ago
Alexander Strizhakov	b2eb1124d1	Merge branch 'develop' into gun	5 years ago
rinpatch	3508ae7039	version bump changelog and mix version	5 years ago
rinpatch	69a85e9c82	changelog: sync with stable	5 years ago
Mark Felder	ec3dc462ff	Document the instance stats fix	5 years ago
Alexander Strizhakov	509c81e4b1	Merge branch 'develop' into gun	5 years ago
Egor Kislitsyn	0f386110c6	Merge remote-tracking branch 'origin/develop' into global-status-expiration	5 years ago
Egor Kislitsyn	4f3313bf80	Merge remote-tracking branch 'origin/develop' into fix/signup-without-email	5 years ago
lain	4c02e04935	Merge branch 'prepared-statements-settings' into 'develop' ... Prepared statements settings See merge request pleroma/pleroma!2238	5 years ago
Egor Kislitsyn	4a45b96a91	Merge branch 'develop' into fix/signup-without-email	5 years ago
Alexander Strizhakov	d9e4b77f8b	Merge branch 'develop' into gun	5 years ago
rinpatch	e6ccf12129	changelog: entries for timeline DoS fixes	5 years ago
Alexander Strizhakov	814b275af7	Merge branch 'develop' into gun	5 years ago
feld	f2216287a7	Merge branch 'admin-status-list' into 'develop' ... Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`) Closes #1550 See merge request pleroma/pleroma!2192	5 years ago
eugenijm	4ab07cf0d5	Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`	5 years ago
eugenijm	e2a6a40367	Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)	5 years ago
Egor Kislitsyn	f446744a6a	Allow account registration without an email	5 years ago
lain	e4804137b3	Document database default changes	5 years ago
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	5 years ago
eugenijm	7ad5c51f23	Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope	5 years ago
Ivan Tashkinov	8f0ca19b9c	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # CHANGELOG.md # config/config.exs	5 years ago
Egor Kislitsyn	011ede4536	Update documentation	5 years ago