217 Commits (12f45e2a8907c74c6b65d866bc3bab547b31edfa)

Author	SHA1	Message	Date
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	5 years ago
Sachin Joshi	f01f995816	make url uniform in admin api	5 years ago
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	5 years ago
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Alex S	f46295faa7	unused config paramater	5 years ago
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	5 years ago
lambda	aacac9da0b	Merge branch 'feature/bbs' into 'develop' ... BBS / SSH See merge request pleroma/pleroma!997	5 years ago
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	5 years ago
lain	6ad8ddfd29	Merge remote-tracking branch 'origin/develop' into feature/bbs	5 years ago
xse	2982061dfa	Fix syntax highlighting + clarify :frontend_configuration	5 years ago
rinpatch	ce3789e39a	Add default_scope to /api/v1/update_credentials	5 years ago
kaniini	48f68fd133	Merge branch 'feature/mastoapi-new-config' into 'develop' ... Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093	5 years ago
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	5 years ago
rinpatch	dfc8425659	Move settings to Source subentity	5 years ago
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	5 years ago
rinpatch	4baea6e6d9	Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API ... This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs	5 years ago
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	5 years ago
kaniini	10c40e13d2	Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' ... Add `in_reply_to_account_acct` to MastoAPI status entity See merge request pleroma/pleroma!1086	5 years ago
kaniini	7dcac0bac0	Merge branch 'develop' into 'develop' ... Add shortcode_globs setting to documentation See merge request pleroma/pleroma!1087	5 years ago
ilja	74ef14b04e	Add :emoji settings to config.md	5 years ago
Alex S	d35246c449	added healthcheck setting to instance config	5 years ago
ilja	c876b04aeb	Add shortcode_globs setting to documentation	5 years ago
rinpatch	f60d072bbb	Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity	5 years ago
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	5 years ago
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
kaniini	7fcbda702e	Merge branch 'rework-emoji-management' into 'develop' ... Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073	5 years ago
Haelwenn (lanodan) Monnier	d086319733	differences_in_mastoapi_responses.md: `content_type` parameter of post submission	5 years ago
Ekaterina Vaartis	8f93d4c423	Remove most finmoji mentions where appropriate	6 years ago
Ekaterina Vaartis	31cff7dbca	Document the pleroma.emoji task	6 years ago
witches.live	8166cefa21	Include explicit warning for emerge config line as it will vary more widely based on current version of postgres	6 years ago
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	6 years ago
Mark Felder	1aa4994f6d	Do not require authentication for user search in MastoAPI	6 years ago
kaniini	73df3046e0	Merge branch 'feature/788-separate-email-addresses' into 'develop' ... Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040	6 years ago
Hakurei Reimu	10096bbf2b	add extra_cookie_attrs option to config ... Allow instance admins to set their own SameSite cookie policy from the config. Default value in the config is `Lax`.	6 years ago
lain	088f378408	Custom Emoji docs: Make it clear that config.exs is not for lewd.	6 years ago
Egor Kislitsyn	38926a063a	add `/api/pleroma/disable_account` to `docs/api/pleroma_api.md`	6 years ago
Haelwenn (lanodan) Monnier	48982169dc	docs/installation/arch_linux_en.md: Remove useless ODBC ... See [1] for confirmation. 1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402	6 years ago
Alex S	c349573791	Merge develop to 788-separate-email-addresses ... Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs	6 years ago
lambda	184ae60b21	Merge branch 'bugfix/pleroma-email-naming' into 'develop' ... Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029	6 years ago
Alex S	fe511a6c65	Merge branch 'develop' into feature/788-separate-email-addresses	6 years ago
Alex S	fe13a1d78c	adding notify_email setting for trigger emails	6 years ago
lambda	e5d553aa45	Merge branch 'feature/767-multiple-use-invite-token' into 'develop' ... Feature/767 multiple use invite token See merge request pleroma/pleroma!1032	6 years ago
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	6 years ago
lambda	c8440b5e0c	Merge branch 'fix/emoji-api-nonsense' into 'develop' ... Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038	6 years ago
Haelwenn (lanodan) Monnier	1791ee8ec4	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	6 years ago
kaniini	97395e013e	Merge branch 'notification-pleroma-settings' into 'develop' ... Notification controls Closes #738 See merge request pleroma/pleroma!988	6 years ago
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	6 years ago
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	6 years ago
Alex S	b810aac117	added docs to docs/api/admin_api.md ... code style and little renamings	6 years ago