912 Commits (805ab86933d90d4284c83e4a8ebfd6bf4b0395b3)

Author	SHA1	Message	Date
lain	fb2d284d28	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim	3d0c567fbc	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	4 years ago
lain	1748e26948	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Mark Felder	d7537a37c7	Add :chat to cheatsheet	4 years ago
Maksim Pechnikov	bd261309cc	added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`	4 years ago
lain	205313e541	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	fb38b7339c	Merge branch 'develop' into issue/1276-2	4 years ago
lain	42a2acac46	Merge branch 'feature/1720-status-view' into 'develop' ... Admin API fetch status by id Closes #1720 See merge request pleroma/pleroma!2475	4 years ago
Alexander Strizhakov	e7d8ab8303	admin_api fetch status by id	4 years ago
Egor Kislitsyn	cc922e7d8c	Document configuration for Pleroma.Web.ApiSpec.CastAndValidate	4 years ago
lain	7ff2a7dae2	Docs: Add Chat mark_as_read docs	4 years ago
lain	c40afe5ba0	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	fe7a0d660e	Merge branch 'develop' into issue/1276-2	4 years ago
lain	095635453a	Replace deprecated Roma by Fedi.	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
lain	2008fa9c7f	Merge branch 'fix/captcha' into 'develop' ... Fix account registration when captcha is enabled but not provided Closes #1712 See merge request pleroma/pleroma!2438	4 years ago
Maksim Pechnikov	a92c713d9c	Merge branch 'develop' into issue/1276-2	4 years ago
Alexander Strizhakov	631e8c1feb	docs update	4 years ago
Alexander Strizhakov	1fd40532ae	docs fix	4 years ago
Alexander Strizhakov	1c1b7e22af	list of options for pack metadata	4 years ago
Alexander Strizhakov	ddb757f743	emoji api packs changes in routes with docs update	4 years ago
Alexander Strizhakov	95759310ab	docs update	4 years ago
Alexander Strizhakov	5839e67eb8	return data only for updated emoji	4 years ago
lain	528ea779a6	Apply suggestion to docs/API/chats.md	4 years ago
Egor Kislitsyn	8148d76ec5	Document `captcha_answer_data` parameter	4 years ago
lain	0c491b904d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Ivan Tashkinov	908cf22a6c	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex	4 years ago
lain	30ea6bb167	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Mark Felder	4b3298133b	Document DELETE /api/v1/notifications/destroy_multiple	4 years ago
lain	b5dc59c8fa	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	270c3fe446	fix markdown format	4 years ago
lain	b550ef5611	Docs: Align chat api changes with docs.	4 years ago
lain	4cadaf7e96	Docs: Add `/api/v1/instance` information	4 years ago
lain	e62f8542a1	Docs: Add chat motivation and api description.	4 years ago
Egor Kislitsyn	f1ca917bb0	Merge branch 'develop' into openapi/account	4 years ago
lain	c86143ed73	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Alex Gleason	1bd9749a8f	Let blob: pass CSP	4 years ago
lain	8480f84615	Update differences_in_mastoapi_responses.md	4 years ago
Alexander	be34672d67	formatting	4 years ago
Alexander	6e625a427c	reply filtering	4 years ago
lain	a51cdafc01	Docs: Add documentation about chatmessages	4 years ago
Egor Kislitsyn	1b06a27746	Update Flake ID description	4 years ago
Ivan Tashkinov	0062116e07	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex	4 years ago
Ivan Tashkinov	2958a7d246	Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.	4 years ago
lain	c466e739b6	Merge branch 'docs/debian-packages' into 'develop' ... debian_based_*.md: Use erlang-nox metapackage See merge request pleroma/pleroma!2268	4 years ago
lain	568f48435e	Apply suggestion to docs/installation/debian_based_en.md	4 years ago
Ivan Tashkinov	f685cbd309	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	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
lain	617a9f6208	Merge branch 'mrf-docs-update' into 'develop' ... Expand MRF SimplePolicy docs See merge request pleroma/pleroma!2370	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
Ilja	aa0a4a1e78	small fix in the rewrite_policy example	4 years ago
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	5 years ago
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	5 years ago
Alex Gleason	ed894802d5	Expand MRF SimplePolicy docs	5 years ago
lain	b87b798ca1	Merge branch 'fix/1658-invite-send' into 'develop' ... Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344	5 years ago
Alexander Strizhakov	c8bfbf511e	Apply suggestion to docs/API/admin_api.md	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
Alexander Strizhakov	b59ac37b2c	tests for emoji mix task	5 years ago
Egor Kislitsyn	8a0ffaa9ea	Fix formatting in documentation	5 years ago
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	5 years ago
Alexander Strizhakov	2d64500a9d	error improvement for email_invite endpoint	5 years ago
Alexander Strizhakov	7af0959a07	updating docs	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
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	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
rinpatch	69341cbcba	Merge branch 'feature/1530-removing-with_move' into 'develop' ... Feature/1530 removing with move Closes #1530 See merge request pleroma/pleroma!2306	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
Mark Felder	8dd01b24d2	Improve documentation of mrf_object_age	5 years ago
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	5 years ago
lain	fa4ec17c84	Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' ... [#1560] Restricted AP- & OStatus-related routes for non-federating instances Closes #1560 See merge request pleroma/pleroma!2235	5 years ago
rinpatch	e87a32bcd7	rip out fetch_initial_posts ... Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422	5 years ago
Ivan Tashkinov	ecb7809e92	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex	5 years ago
rinpatch	4db88242e5	Merge branch 'docs/direct_conversation_id' into 'develop' ... pleroma_api.md: direct_conversation_id vs. conversation_id See merge request pleroma/pleroma!2263	5 years ago
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	5 years ago
Ivan Tashkinov	bd40880fa0	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # test/web/activity_pub/activity_pub_controller_test.exs	5 years ago
rinpatch	00d1752031	Merge branch 'docs/new_user' into 'develop' ... CLI_tasks/user.md: Fix `pleroma.user new` documentation Closes #1621 See merge request pleroma/pleroma!2286	5 years ago
Haelwenn (lanodan) Monnier	6316726a5f	CLI_tasks: Use manpage formatting conventions ... - [] for options - <> for mandatory arguments - foo ... when foo can be repeated [ci skip]	5 years ago
Haelwenn (lanodan) Monnier	a06104b9d5	CLI_tasks/user.md: Fix `pleroma.user new` documentation ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621 [ci skip]	5 years ago
Ivan Tashkinov	972889550d	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	5 years ago
Haelwenn (lanodan) Monnier	d9134d4430	installation/otp_en.md: Fix pleroma.nginx target [deb] ... Needs to be backported to stable. Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29	5 years ago
lain	841e4e4d83	Merge branch 'patch-1' into 'develop' ... Better advice for vacuuming after restoring. See merge request pleroma/pleroma!2233	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
Ivan Tashkinov	027714b519	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	5 years ago
feld	9b740cfb23	Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop' ... Exclude reblogs from `GET /api/pleroma/admin/statuses` by default Closes #1596 See merge request pleroma/pleroma!2267	5 years ago
Alexander Strizhakov	b34bc669b9	adding descriptions	5 years ago
Alexander Strizhakov	8d9dee1ba9	retry_timeout description change	5 years ago
Alexander Strizhakov	8854770fc4	retry and retry_timeout settings default change	5 years ago
Alexander Strizhakov	28ed4b41d0	naming for checkin from pool timeout	5 years ago