1049 Commits (1ac0969c7226c40d5d674d63996f1164a86ecb9a)

Author	SHA1	Message	Date
lain	1ac0969c72	Merge branch 'mrf-silence-2' into 'develop' ... MRF silencing alternative solution See merge request pleroma/pleroma!2820	4 years ago
lain	37b9e5e138	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Mark Felder	052833f8ee	Fix example json response	4 years ago
Mark Felder	24169ae2e6	Merge branch 'develop' into fix/configdb-otp-instructions	4 years ago
Mark Felder	cfc6484c40	OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.	4 years ago
Mark Felder	1f24186036	Attempt to fix markdown formatting	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
Mark Felder	33f0427809	Expose seconds_valid in Pleroma Captcha API endpoint	4 years ago
Alex Gleason	702f0fb822	Merge remote-tracking branch 'upstream/develop' into mrf-silence	4 years ago
Alex Gleason	93638935d7	SimpleMRF: :silence --> :followers_only	4 years ago
Alex Gleason	d8a01c9432	Merge remote-tracking branch 'upstream/develop' into hide-reactions	4 years ago
lain	a6d3bb5f30	Merge branch 'issue/1023' into 'develop' ... [#1023] added generated `pleroma.env` See merge request pleroma/pleroma!2763	4 years ago
lain	79f9ddd8b7	Merge branch 'by-approval' into 'develop' ... Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757	4 years ago
Alex Gleason	3c90f7f715	SimpleMRF: Let instances be silenced	4 years ago
Alex Gleason	3b7c454418	Let favourites and emoji reactions optionally be hidden	4 years ago
lain	81350faa8e	Cheatsheet: Add even more info.	4 years ago
lain	393128fb02	Cheatsheet: Add more info.	4 years ago
lain	08732e8a03	Docs: Add frontend info to cheat sheet.	4 years ago
Alex Gleason	520dce857e	Add :registration_reason_length to description.exs	4 years ago
Alex Gleason	6747bf2e16	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Maksim Pechnikov	67ab9a7928	Merge branch 'develop' into issue/1934-welcome-email	4 years ago
Maksim Pechnikov	5879d36854	fix sender for welcome email	4 years ago
Maksim Pechnikov	8d6f7aec21	Merge branch 'develop' into issue/1023	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
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
Maksim Pechnikov	5fcb3e8738	fix docs	4 years ago
Maksim Pechnikov	6c59fe259d	Merge branch 'develop' into issue/1023	4 years ago
Mark Felder	b2d398b1d0	Merge branch 'develop' into refactor/gun-pool-registry	4 years ago
Mark Felder	9d30bacace	Merge branch 'develop' into refactor/notification_settings	4 years ago
rinpatch	007843b75e	Add documentation for new connection pool settings and remove some ... `:retry_timeout` and `:retry` got removed because reconnecting on failure is something the new pool intentionally doesn't do. `:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because the settings are very different in their behaviour. `:checkin_timeout` got removed in favor of `:connection_acquisition_wait`, I didn't reuse the key because the settings are somewhat different. I didn't do any migrations/deprecation warnings/changelog entries because these settings were never in stable.	4 years ago
Alex Gleason	48983e9421	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Alex Gleason	20d24741af	AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint	4 years ago
Alex Gleason	33f1b29b2c	AdminAPI: Filter users by `need_approval`	4 years ago
Alex Gleason	b750129da1	AdminAPI: Return `approval_pending` with users	4 years ago
Alex Gleason	a1570ba6ad	AdminAPI: Return `registration_reason` with users	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
feld	2909dc873b	Merge branch '1940-admin-token-oauthless-auth' into 'develop' ... [#1940] Reinstated OAuth-less `admin_token` authentication Closes #1940 See merge request pleroma/pleroma!2760	4 years ago
rinpatch	8d56fb6d22	Migrate in-db config after updating to Oban 2.0	4 years ago
Ivan Tashkinov	9b225db7d8	[#1940] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.	4 years ago
Maksim Pechnikov	3062f86613	added generated `pleroma.env`	4 years ago
Mark Felder	80c21100db	Merge branch 'develop' into refactor/notification_settings	4 years ago
Mark Felder	442fe3cd45	Show examples for both OTP and source	4 years ago
Alex Gleason	51ab8d0128	Add `account_approval_required` instance setting	4 years ago
Mark Felder	0871e8b8fe	Make the query more precise	4 years ago
Mark Felder	133004e22d	Improve database config migration and add documentation	4 years ago