1568 Commits

Author	SHA1	Message	Date
lain	205313e541	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-06 11:44:30 +02:00
Maksim Pechnikov	fb38b7339c	Merge branch 'develop' into issue/1276-2	2020-05-06 05:55:39 +03:00
lain	42a2acac46	Merge branch 'feature/1720-status-view' into 'develop' ... Admin API fetch status by id Closes #1720 See merge request pleroma/pleroma!2475	2020-05-05 13:40:12 +00:00
Alexander Strizhakov	e7d8ab8303	admin_api fetch status by id	2020-05-05 16:18:56 +03:00
Egor Kislitsyn	cc922e7d8c	Document configuration for Pleroma.Web.ApiSpec.CastAndValidate	2020-05-05 15:01:33 +04:00
Egor Kislitsyn	decaa64f75	Merge branch 'develop' into global-status-expiration	2020-05-05 14:28:54 +04:00
lain	7ff2a7dae2	Docs: Add Chat mark_as_read docs	2020-05-04 13:12:21 +02:00
lain	c40afe5ba0	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-04 10:43:20 +02:00
Maksim Pechnikov	fe7a0d660e	Merge branch 'develop' into issue/1276-2	2020-05-04 06:08:49 +03:00
lain	095635453a	Replace deprecated Roma by Fedi.	2020-05-02 18:10:50 +00:00
rinpatch	3126f8a334	Merge branch 'feature/1710-consolidate-instance-info' into 'develop' ... Feature/1710 consolidate instance info Closes #1710 See merge request pleroma/pleroma!2430	2020-05-02 16:44:55 +00:00
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	2020-05-01 11:47:58 +00:00
Maksim Pechnikov	a92c713d9c	Merge branch 'develop' into issue/1276-2	2020-05-01 06:21:59 +03:00
Alexander Strizhakov	631e8c1feb	docs update	2020-04-30 16:09:23 +03:00
Alexander Strizhakov	1fd40532ae	docs fix	2020-04-30 16:09:23 +03:00
Alexander Strizhakov	1c1b7e22af	list of options for pack metadata	2020-04-30 16:09:22 +03:00
Alexander Strizhakov	ddb757f743	emoji api packs changes in routes with docs update	2020-04-30 16:09:18 +03:00
Alexander Strizhakov	95759310ab	docs update	2020-04-30 15:45:56 +03:00
Alexander Strizhakov	5839e67eb8	return data only for updated emoji	2020-04-30 15:24:02 +03:00
lain	528ea779a6	Apply suggestion to docs/API/chats.md	2020-04-29 17:56:24 +00:00
Egor Kislitsyn	8148d76ec5	Document captcha_answer_data parameter	2020-04-29 21:26:07 +04:00
lain	0c491b904d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-29 13:19:04 +02:00
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	2020-04-28 19:56:20 +03:00
lain	30ea6bb167	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-28 17:48:05 +02:00
Mark Felder	4b3298133b	Document DELETE /api/v1/notifications/destroy_multiple	2020-04-28 10:13:58 -05:00
lain	b5dc59c8fa	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-28 14:16:21 +02:00
Egor Kislitsyn	764b4f95a8	Merge branch 'develop' into global-status-expiration	2020-04-28 14:13:53 +04:00
Maksim Pechnikov	270c3fe446	fix markdown format	2020-04-28 06:45:59 +03:00
lain	b550ef5611	Docs: Align chat api changes with docs.	2020-04-27 17:52:16 +02:00
lain	4cadaf7e96	Docs: Add /api/v1/instance information	2020-04-27 14:33:21 +02:00
lain	e62f8542a1	Docs: Add chat motivation and api description.	2020-04-27 13:48:09 +02:00
Egor Kislitsyn	f1ca917bb0	Merge branch 'develop' into openapi/account	2020-04-27 14:33:00 +04:00
lain	c86143ed73	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-27 12:07:08 +02:00
Alex Gleason	1bd9749a8f	Let blob: pass CSP	2020-04-26 00:29:42 -05:00
Egor Kislitsyn	c56c0a3d23	Merge branch 'develop' into global-status-expiration	2020-04-24 18:37:58 +04:00
lain	8480f84615	Update differences_in_mastoapi_responses.md	2020-04-24 15:43:54 +03:00
Alexander	be34672d67	formatting	2020-04-24 15:43:54 +03:00
Alexander	6e625a427c	reply filtering	2020-04-24 15:43:49 +03:00
lain	a51cdafc01	Docs: Add documentation about chatmessages	2020-04-23 16:55:50 +02:00
Egor Kislitsyn	1b06a27746	Update Flake ID description	2020-04-22 20:20:19 +04:00
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	2020-04-22 18:51:59 +03:00
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.	2020-04-22 18:50:25 +03:00
lain	c466e739b6	Merge branch 'docs/debian-packages' into 'develop' ... debian_based_*.md: Use erlang-nox metapackage See merge request pleroma/pleroma!2268	2020-04-22 12:10:27 +00:00
lain	568f48435e	Apply suggestion to docs/installation/debian_based_en.md	2020-04-22 12:10:20 +00:00
Ivan Tashkinov	f685cbd309	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	2020-04-21 16:29:19 +03:00
Egor Kislitsyn	364eecc49f	Merge branch 'develop' into global-status-expiration	2020-04-20 20:37:56 +04:00
Alex Gleason	bedc558809	Merge remote-tracking branch 'upstream/develop' into accept-deletes	2020-04-20 10:15:40 -05:00
Alex Gleason	b54c8813d6	Add :reject_deletes option to SimplePolicy	2020-04-20 10:11:06 -05:00
lain	617a9f6208	Merge branch 'mrf-docs-update' into 'develop' ... Expand MRF SimplePolicy docs See merge request pleroma/pleroma!2370	2020-04-20 12:57:45 +00:00
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	2020-04-17 09:19:35 +00:00
Alexander Strizhakov	72ef6cc4f2	added need_reboot endpoint to admin api	2020-04-16 16:03:26 +03:00
Maksim Pechnikov	4b3b1fec4e	added an endpoint for getting unread notification count	2020-04-15 21:19:43 +03:00
Ilja	aa0a4a1e78	small fix in the rewrite_policy example	2020-04-15 19:03:27 +02:00
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	2020-04-14 16:32:22 +00:00
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	2020-04-13 21:19:27 +03:00
Alex Gleason	ed894802d5	Expand MRF SimplePolicy docs	2020-04-12 18:46:47 -05:00
Egor Kislitsyn	7f692343c8	Merge branch 'develop' into global-status-expiration	2020-04-10 14:20:48 +04:00
lain	b87b798ca1	Merge branch 'fix/1658-invite-send' into 'develop' ... Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344	2020-04-09 10:42:43 +00:00
Alexander Strizhakov	c8bfbf511e	Apply suggestion to docs/API/admin_api.md	2020-04-09 10:17:24 +00:00
Maksim Pechnikov	2b7d7bbd2d	Merge branch 'develop' into issue/1276	2020-04-07 14:09:43 +03:00
lain	1d4ab06505	Merge branch 'featureflag/emoji_reactions' into 'develop' ... Add emoji reactions to features in nodeinfo See merge request pleroma/pleroma!2313	2020-04-06 12:51:35 +00:00
Alexander Strizhakov	b59ac37b2c	tests for emoji mix task	2020-04-06 11:13:59 +03:00
Egor Kislitsyn	8a0ffaa9ea	Fix formatting in documentation	2020-04-02 23:10:13 +04:00
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	2020-04-02 14:47:17 +03:00
Alexander Strizhakov	2d64500a9d	error improvement for email_invite endpoint	2020-04-01 20:26:33 +03:00
Alexander Strizhakov	7af0959a07	updating docs	2020-03-31 18:30:19 +03:00
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	2020-03-30 12:15:23 +03:00
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	2020-03-29 06:57:34 +03:00
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	2020-03-24 17:34:13 +00:00
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	2020-03-23 10:44:47 +03:00
Egor Kislitsyn	80e1571610	Merge branch 'develop' into global-status-expiration	2020-03-20 22:08:34 +04:00
Alexander Strizhakov	9bae9b1b1b	Merge branch 'develop' into gun	2020-03-20 20:47:54 +03:00
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	2020-03-20 16:36:20 +03:00
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	2020-03-20 13:18:12 +03:00
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	2020-03-18 14:08:21 +03:00
rinpatch	69341cbcba	Merge branch 'feature/1530-removing-with_move' into 'develop' ... Feature/1530 removing with move Closes #1530 See merge request pleroma/pleroma!2306	2020-03-18 10:12:50 +00:00
eugenijm	13cce9c0de	Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.	2020-03-16 20:42:37 +03:00
eugenijm	d198e7fa2a	Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password	2020-03-16 20:32:07 +03:00
Alexander Strizhakov	f3791add99	removing with_move parameter	2020-03-16 20:07:45 +03:00
Mark Felder	8dd01b24d2	Improve documentation of mrf_object_age	2020-03-16 11:44:53 -05:00
Egor Kislitsyn	421e35b578	Merge branch 'develop' into global-status-expiration	2020-03-16 15:31:31 +04:00
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	2020-03-16 14:25:55 +03:00
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	2020-03-15 19:15:20 +00:00
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	2020-03-15 15:59:17 +03:00
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	2020-03-14 15:37:02 +03:00
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	2020-03-13 18:58:22 +00:00
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	2020-03-12 18:31:10 +03:00
Egor Kislitsyn	d1c7f8e576	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-12 16:02:24 +04:00
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	2020-03-12 12:07:07 +03:00
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	2020-03-11 20:26:50 +00:00
Haelwenn (lanodan) Monnier	6316726a5f	CLI_tasks: Use manpage formatting conventions ... - [] for options - <> for mandatory arguments - foo ... when foo can be repeated [ci skip]	2020-03-11 08:48:50 +01:00
Haelwenn (lanodan) Monnier	a06104b9d5	CLI_tasks/user.md: Fix pleroma.user new documentation ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621 [ci skip]	2020-03-11 08:36:25 +01:00
Ivan Tashkinov	972889550d	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-11 09:15:55 +03:00
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	2020-03-10 11:49:23 +01:00
lain	841e4e4d83	Merge branch 'patch-1' into 'develop' ... Better advice for vacuuming after restoring. See merge request pleroma/pleroma!2233	2020-03-09 13:36:21 +00:00
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	2020-03-08 14:10:59 +03:00
Alexander Strizhakov	b2eb1124d1	Merge branch 'develop' into gun	2020-03-07 12:41:37 +03:00
Ivan Tashkinov	027714b519	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-06 11:48:30 +03:00
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	2020-03-04 18:22:37 +00:00
Alexander Strizhakov	b34bc669b9	adding descriptions	2020-03-04 20:09:18 +03:00
Alexander Strizhakov	8d9dee1ba9	retry_timeout description change	2020-03-04 08:56:36 +03:00
Alexander Strizhakov	8854770fc4	retry and retry_timeout settings default change	2020-03-03 18:01:35 +03:00
Alexander Strizhakov	28ed4b41d0	naming for checkin from pool timeout	2020-03-03 13:05:28 +03:00
Alexander Strizhakov	df3c59d928	Apply suggestion to docs/configuration/cheatsheet.md	2020-03-03 09:45:18 +00:00
Alexander Strizhakov	509c81e4b1	Merge branch 'develop' into gun	2020-03-03 10:08:07 +03:00
Haelwenn (lanodan) Monnier	9b6c7843d6	debian_based_*.md: Use erlang-nox metapackage	2020-03-03 05:00:25 +01:00
Egor Kislitsyn	0f386110c6	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-03 00:32:34 +04:00
Mark Felder	f987d83885	Clarify in docs how to control connections_pool for Gun. ... It could easily be confused with the Hackney settings.	2020-03-02 13:00:05 -06:00
Ivan Tashkinov	b4367125e9	[#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.	2020-03-02 21:43:18 +03:00
lain	4c02e04935	Merge branch 'prepared-statements-settings' into 'develop' ... Prepared statements settings See merge request pleroma/pleroma!2238	2020-03-02 17:00:04 +00:00
eugenijm	7af431c150	Exclude reblogs from GET /api/pleroma/admin/statuses by default	2020-03-02 16:47:31 +03:00
ilja	036e8a40a2	fix for :fetch_initial_posts ... A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now	2020-03-02 10:29:24 +01:00
Haelwenn (lanodan) Monnier	deb5f5c40e	pleroma_api.md: direct_conversation_id vs. conversation_id ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1594	2020-03-02 04:01:37 +01:00
Ilja	53ef8c11b9	Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users) ... I also made a more explicit distinction between OTP and from source installs in the general explanation	2020-03-01 19:16:54 +00:00
Alexander Strizhakov	d9e4b77f8b	Merge branch 'develop' into gun	2020-03-01 12:48:49 +03:00
rinpatch	ffcebe7e22	timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user	2020-03-01 01:13:08 +03:00
rinpatch	19e559fe51	Merge branch 'rate-limiter-runtime-settings' into 'develop' ... RateLimiter improvements: runtime configurability, no default limits in tests See merge request pleroma/pleroma!2250	2020-02-29 21:52:33 +00:00
Alexander Strizhakov	814b275af7	Merge branch 'develop' into gun	2020-02-29 11:34:50 +03:00
Ivan Tashkinov	6f2efb1c45	Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.	2020-02-27 18:46:05 +03:00
eugenijm	4ab07cf0d5	Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses	2020-02-26 22:35:57 +03:00
Alexander Strizhakov	6b012ddd69	some docs	2020-02-25 19:01:29 +03:00
lain	e4804137b3	Document database default changes	2020-02-25 11:53:51 +01:00
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	2020-02-25 07:22:56 +03:00
eugenijm	7ad5c51f23	Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope	2020-02-24 21:46:37 +03:00
Ilja	c0146f4859	DOCS Theming your instance ... I added a new file to explain * where a custom theme can be created * where themes can be downloaded * where to add the theme on the server * how to make the theme available on the instance * how to set the theme as default on the instance	2020-02-24 17:48:18 +00:00
lain	c05cbc47f9	Better advice for vacuuming after restoring.	2020-02-22 13:14:30 +00:00
Ivan Tashkinov	8f0ca19b9c	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # CHANGELOG.md # config/config.exs	2020-02-22 09:31:43 +03:00
Igeljäger	1ed485ec1d	added why doing a vacuum after restoring a backup is so important	2020-02-21 15:30:52 +00:00
Egor Kislitsyn	011ede4536	Update documentation	2020-02-21 14:42:43 +04:00
Alexander Strizhakov	13918cb545	Merge branch 'develop' into gun	2020-02-21 10:02:37 +03:00
Haelwenn	c5570e0493	Merge branch 'single_emoji_reaction' into 'develop' ... Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226	2020-02-20 23:50:40 +00:00
lain	3eddd9caa6	Merge branch 'require-signature' into 'develop' ... Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071	2020-02-20 12:13:21 +00:00
lain	d536a00d42	Merge branch 'docs_updating' into 'develop' ... DOCS Add OTP to updating.md See merge request pleroma/pleroma!2108	2020-02-20 12:03:21 +00:00
Ivan Tashkinov	0c65a8c3d0	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # config/config.exs	2020-02-20 15:00:48 +03:00
lain	e0b2de6385	Merge branch 'feature/new-registrations-digest' into 'develop' ... New users digest email Closes #1514 See merge request pleroma/pleroma!2128	2020-02-20 11:58:37 +00:00
lain	3af6d3f8e2	Emoji Reactions: Add documentation	2020-02-19 17:17:05 +01:00
feld	53a7680c16	Merge branch 'develop' into 'fix/mrf-sample-doc' ... # Conflicts: # docs/configuration/mrf.md	2020-02-18 20:58:15 +00:00
feld	3416948cdf	Merge branch 'fix/mrf-docs' into 'develop' ... Fix MRF documentation See merge request pleroma/pleroma!2187	2020-02-18 20:57:23 +00:00
Mark Felder	cf94349287	Merge branch 'develop' into gun	2020-02-18 09:06:27 -06:00
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-18 17:46:09 +03:00
lain	c07efd5b42	Merge branch 'need-reboot-flag' into 'develop' ... need_reboot flag for adminFE See merge request pleroma/pleroma!2188	2020-02-18 14:32:03 +00:00
Alexander Strizhakov	514c899275	adding gun adapter	2020-02-18 08:19:01 +03:00
Ivan Tashkinov	269d592181	[#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).	2020-02-15 20:41:38 +03:00
Mark Felder	589bffa57d	Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc	2020-02-14 11:06:04 -06:00
Mark Felder	31749559e1	Fix MRF docs further. I don't think anyone has actually tested with the old docs.	2020-02-14 11:04:27 -06:00
feld	6caf6a86c5	Apply suggestion to docs/configuration/mrf.md	2020-02-14 16:55:52 +00:00
Mark Felder	88a76d0142	Update suggested path for location of your custom MRF	2020-02-14 10:55:18 -06:00
Egor Kislitsyn	0ddcd67d32	Update cheatsheet.md and config/description.exs	2020-02-14 16:53:53 +04:00
Mark Felder	2c95b0fab9	Make the sample code actually compile	2020-02-13 15:19:01 -06:00
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	2020-02-13 09:20:34 +03:00
lain	24c526a0b1	Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge	2020-02-11 13:58:36 +01:00
lain	2f1c61255f	Merge branch 'doc/unlisted-search' into 'develop' ... differences_in_mastoapi_responses.md: Add note about unlisted results Closes #1164 See merge request pleroma/pleroma!2195	2020-02-11 11:44:33 +00:00
Egor Kislitsyn	6875ccb6bf	Merge branch 'develop' into feature/new-registrations-digest	2020-02-11 13:54:55 +04:00
lain	5ebffd5224	Merge branch 'docs/kyclos' into 'develop' ... clients.md: Add Kyclos See merge request pleroma/pleroma!2196	2020-02-11 08:04:58 +00:00
Maksim Pechnikov	58574ef156	Merge branch 'develop' into issue/1276	2020-02-11 08:35:26 +03:00
Haelwenn (lanodan) Monnier	209e4d8432	clients.md: Add Kyclos	2020-02-11 02:27:40 +01:00
Haelwenn (lanodan) Monnier	ad16f38b9c	differences_in_mastoapi_responses.md: Add note about unlisted results ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164	2020-02-11 01:59:27 +01:00
rinpatch	94e5ca1105	Merge branch 'issue/1383' into 'develop' ... [#1383] Switch periodic jobs from quantum to oban See merge request pleroma/pleroma!2015	2020-02-11 00:04:06 +00:00
Ilja	a9e946b99a	DOCS Backup/Restore/Migrate your instance ... * Added "Migrate" to the title because these steps can also be used to migrate the instance to another server * Added an optional step to reinstall pleroma (esp. for migrating servers) * Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types' * I added a new step to drop and recreate an empty pleroma-database * I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working * This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15	2020-02-10 23:53:26 +00:00
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	2020-02-10 07:59:52 +03:00
Alexander Strizhakov	dad23e3766	need_reboot flag	2020-02-08 13:00:02 +03:00
Egor Kislitsyn	815f659ed8	Fix MRF documentation	2020-02-07 22:17:08 +04:00
lain	57098713c0	Apply suggestion to docs/API/pleroma_api.md	2020-02-07 15:18:05 +00:00
lain	713645d5c5	Apply suggestion to docs/API/pleroma_api.md	2020-02-07 15:17:42 +00:00
Lain Soykaf	ce95882009	EmojiReactions: Add docs and Changelog	2020-02-07 14:59:26 +01:00
rinpatch	f13b7878b4	Merge branch 'rename_emoji_reactios' into 'develop' ... EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181	2020-02-07 10:35:37 +00:00
Alexander Strizhakov	01da001da1	fix	2020-02-07 10:48:10 +03:00
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	2020-02-06 18:09:57 +01:00
feld	e12bf05f23	Merge branch 'fix/dymamic-docs' into 'develop' ... Simplify in-database config docs See merge request pleroma/pleroma!2178	2020-02-06 16:03:29 +00:00
rinpatch	6769ecd948	Merge branch 'develop' into fix/dymamic-docs	2020-02-06 15:04:21 +03:00
rinpatch	6722dade42	Simplify in-database config docs ... Large part of it was no longer true (i.e none of the changes need recompilation anymore and you can't brick an instance by changing them, it's not necessary to manually truncate the db manually anymore)	2020-02-06 15:00:33 +03:00
Alexander Strizhakov	c85aa6e87f	removing confusing error	2020-02-06 12:50:36 +03:00
Alexander Strizhakov	5db6ac8ee4	removing migrate_from_db endpoint from admin api	2020-02-05 20:36:21 +03:00
rinpatch	49e80a1537	Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' ... Restarting pleroma from outside application See merge request pleroma/pleroma!2144	2020-02-05 16:59:21 +00:00
Lain Soykaf	90b862e7ab	Add cheatsheet entry	2020-02-04 16:22:13 +01:00
Maksim Pechnikov	2c40c8b4a2	Merge branch 'develop' into issue/1383	2020-02-03 21:42:36 +03:00
lain	774cba84f5	Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop' ... Re-enable rate limiter and enable remote ip See merge request pleroma/pleroma!2164	2020-01-30 18:47:44 +00:00
lain	01537cc1d6	Apply suggestion to docs/configuration/cheatsheet.md	2020-01-30 18:28:28 +00:00
rinpatch	ff4bef140a	Apply suggestion to docs/configuration/cheatsheet.md	2020-01-30 13:24:24 +00:00
rinpatch	889965141a	RemoteIp: only trust X-Forwarded-For ... Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.	2020-01-30 00:06:58 +03:00
rinpatch	f5cb2af85a	cheatsheet: improve rate limiter docs and add new limiters	2020-01-30 00:06:58 +03:00
lain	d378550d2d	Emoji Reactions: Document changes	2020-01-29 11:40:57 +01:00
Maksim Pechnikov	ba5e8a6444	Merge branch 'develop' into issue/1276	2020-01-28 21:11:13 +03:00
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	2020-01-28 20:39:20 +03:00
lain	12b6fcdb8c	Merge branch 'features/task-test-email' into 'develop' ... Create pleroma.email mix task Closes #1061 See merge request pleroma/pleroma!2118	2020-01-28 16:42:57 +00:00
Haelwenn (lanodan) Monnier	4eb935be78	Create pleroma.email mix task ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061	2020-01-28 16:49:38 +01:00
Ilja	c8964cc438	DOCS General update for the "Introduction to Pleroma" section ... * Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check) * Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check) * Added a newline above the bulletpoints because otherwise they are broken on docs-develop * Remove the 😄 thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis * Add a link to fediverse.network * Update to add new stuff and fix things that aren't correct (any more)	2020-01-28 12:57:06 +00:00
Alexander Strizhakov	7c6e5c541d	docs update	2020-01-27 19:48:20 +03:00
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	2020-01-27 13:21:50 +00:00
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	2020-01-27 15:20:47 +03:00
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	2020-01-27 08:48:19 +03:00
lain	9a994878f1	Emoji reactions: Update docs and changelog	2020-01-24 10:53:01 +01:00
Maksim Pechnikov	5fc2fa8908	Merge branch 'develop' into issue/1383	2020-01-23 11:11:18 +03:00
Haelwenn	dddebee047	Merge branch 'emoji-notifications' into 'develop' ... Emoji notifications See merge request pleroma/pleroma!2130	2020-01-23 02:12:03 +00:00
Farhan Khan	89eeadc2a8	Updated OpenBSD installation guide for version OpenBSD 6.6 ... * initdb command now requires explicit -U and -D flags * acme-client now requires version v02 API endpoint * Added step to add admin user, per other installation guides * Corrected setup_db.psql path	2020-01-22 17:33:10 -05:00
Mark Felder	4c59e9477a	Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest	2020-01-22 15:59:37 -06:00
lain	85f45c7689	Document new EmojiReaction notifications	2020-01-22 20:11:18 +01:00
Egor Kislitsyn	b8b90d967a	Update documentation	2020-01-22 22:28:06 +04:00
Maksim Pechnikov	cf19bf3c7c	Merge branch 'develop' into issue/1383	2020-01-22 20:20:39 +03:00
feld	be27777156	Merge branch 'admin-be' into 'develop' ... Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976	2020-01-22 17:13:17 +00:00
Maksim	e761d76e4f	Apply suggestion to docs/configuration/cheatsheet.md	2020-01-22 16:58:50 +00:00
Maksim	d43c9ab286	Apply suggestion to docs/configuration/cheatsheet.md	2020-01-22 16:58:43 +00:00
Alexander Strizhakov	f3e074e949	little fixes	2020-01-22 18:22:54 +03:00
Alexander Strizhakov	a9c6f119ac	docs update	2020-01-22 18:08:53 +03:00
lain	043cd5aa54	Emoji reactions: Document changes	2020-01-22 13:58:02 +01:00
Alexander Strizhakov	32a643a159	Merge branch 'develop' into admin-be	2020-01-22 11:22:31 +03:00
Maksim Pechnikov	b8d5c09f48	Merge branch 'develop' into issue/1383	2020-01-22 09:30:30 +03:00
Alexander Strizhakov	f01ab6cd29	some refactor and tests	2020-01-21 18:42:00 +03:00
lain	4c5b5f14dc	StatusView: Add emoji_reactions	2020-01-20 16:24:20 +01:00
ilja	e02eb8de3e	Add OTP to updating.md ... * I removed the Update section from the OTP install and added it to updating.md * I also added a link to the updating.md from the OTP install page * I added a Questions section to the OTP install, similar to the debian_based_en.md * Restructured the updating.md a bit I would very much also like to link to the changelog, but I don't know how to do it because I can't find the page in the docs?	2020-01-15 09:12:24 +01:00
Alexander Strizhakov	70c7a26de8	Merge branch 'develop' into admin-be	2020-01-14 14:52:00 +03:00
Maksim Pechnikov	b7908844f2	Merge branch 'develop' into issue/1383	2020-01-13 12:41:07 +03:00
Alibek Omarov	e1308f10bd	docs: API: update Mastodon API link	2020-01-11 05:06:40 +00:00
Alexander Strizhakov	d933fd3d61	more renamings	2020-01-10 19:51:32 +03:00
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	2020-01-10 19:34:19 +03:00
Alexander Strizhakov	958d0452e4	fix for pleroma assets group update	2020-01-10 18:18:09 +03:00
Alexander Strizhakov	00aff5f78c	syncing new setting to descriptions.exs	2020-01-10 17:54:54 +03:00
Alexander	bb9a43c3ae	typo fix	2020-01-10 15:52:01 +03:00
Alexander	fea734ca70	errors on endpoints	2020-01-10 15:52:00 +03:00
Alexander	5cacb988b9	partially settings update	2020-01-10 15:52:00 +03:00
Alex S	2753285b77	config editing through database	2020-01-10 15:51:59 +03:00
RX14	b55f2563d0	Fix SMTP mailer example ... `ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the same SMTP connection, causing it to fail.	2020-01-05 19:00:48 +00:00
Haelwenn	11e010fc77	Merge branch 'feat/doc-improvements' into 'develop' ... Documentation imrpovements See merge request pleroma/pleroma!2084	2019-12-24 19:57:41 +00:00
Maksim Pechnikov	54c9db38c8	Merge branch 'develop' into issue/1383	2019-12-21 20:38:59 +03:00
rinpatch	c51e93978e	Merge branch 'feature/custom-runtime-modules' into 'develop' ... Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039	2019-12-21 11:56:24 +00:00
Egor Kislitsyn	fc79c69173	Remove /api/account/register documentation from pleroma_api.md	2019-12-20 19:47:44 +07:00
Egor Kislitsyn	36d66d9655	Fix typo	2019-12-17 02:06:58 +07:00
Egor Kislitsyn	a12b6454bb	Add an option to require fetches to be signed	2019-12-16 22:24:03 +07:00
Maksim Pechnikov	67cb46e15d	Merge branch 'develop' into issue/1383	2019-12-14 21:44:10 +03:00
Egor Kislitsyn	7528322f83	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-13 01:51:52 +07:00
Egor Kislitsyn	e536796984	Add native captcha and enable it by default.	2019-12-12 17:39:39 +07:00
Egor Kislitsyn	c6f2735ffa	Remove runtime modules config example	2019-12-12 14:37:57 +07:00
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	2019-12-12 02:16:23 +03:00
minibikini	43d9c06a2a	Merge branch 'develop' into 'feature/custom-runtime-modules' ... # Conflicts: # CHANGELOG.md	2019-12-10 13:38:25 +00:00
lain	1ae976ac51	Merge branch 'develop' into '1427-oauth-admin-scopes' ... # Conflicts: # CHANGELOG.md	2019-12-10 13:34:54 +00:00
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	2019-12-10 13:19:26 +00:00
Ivan Tashkinov	835ac2157c	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md	2019-12-10 08:55:14 +03:00
Egor Kislitsyn	c098dec473	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-10 00:16:43 +07:00
rinpatch	d237e9b11d	docs: drop CentOS 7 install guide	2019-12-09 20:11:39 +03:00
rinpatch	8dbe2dfde1	docs: use tabs and improve grammar in OTP install guide	2019-12-09 20:09:47 +03:00
rinpatch	0a8b32a661	docs: remove overoptimistic OTP benefits and use tabs in migration from source	2019-12-09 20:08:31 +03:00
rinpatch	b0505b2cc7	docs: fix incorrect display in digest task docs	2019-12-09 20:07:43 +03:00
Maksim Pechnikov	2b821036c4	Merge branch 'develop' into issue/1383	2019-12-09 19:41:43 +03:00
lain	e4ea0e20b3	Merge branch 'issue/1342' into 'develop' ... [#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920	2019-12-09 14:30:35 +00:00
lain	4692919ea6	Update pleroma_api.md	2019-12-09 14:15:59 +00:00
rinpatch	990cd7ef5d	Merge branch 'feat/docs-otp-source-picker' into 'develop' ... docs: add OTP/From source tabs to CLI tasks See merge request pleroma/pleroma!2046	2019-12-09 10:27:43 +00:00
Egor Kislitsyn	b4027e7187	Document with_move parameter of the notification API	2019-12-09 14:46:06 +07:00
rinpatch	eb9ea8475b	docs: add OTP/From source tabs to CLI tasks	2019-12-09 04:07:16 +03:00
Maksim Pechnikov	e260a16c05	update docs	2019-12-08 22:09:15 +03:00
Maksim Pechnikov	6fbafb1cdc	Merge branch 'develop' into issue/1276	2019-12-08 20:14:28 +03:00
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	2019-12-08 19:52:46 +03:00
Maxim Filippov	00c38cf28d	Docs	2019-12-08 11:29:33 +03:00
Ivan Tashkinov	93a80ee915	[#1427] Bugfix for enforce_oauth_admin_scope_usage. Admin API documentation entry.	2019-12-06 16:56:23 +03:00
Egor Kislitsyn	157bceeda9	Move runtime configuration from :instance to :modules	2019-12-06 15:04:46 +07:00
Egor Kislitsyn	48ae3c4347	Add support for custom modules	2019-12-05 20:18:25 +07:00
Maksim Pechnikov	49bb0a130f	Merge branch 'develop' into issue/1276	2019-12-05 12:22:19 +03:00
lain	9487995e8b	Cheat Sheet: Addg chat_limit information.	2019-12-04 12:51:06 +01:00
Maksim Pechnikov	29a98b86b7	Merge branch 'develop' into issue/1383	2019-12-04 09:34:44 +03:00
Maxim Filippov	4b60d41db9	Add report notes	2019-12-04 00:26:37 +09:00
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	2019-12-02 16:26:19 +00:00
Maksim Pechnikov	b7c449118b	Merge branch 'develop' into issue/1383	2019-11-28 21:27:01 +03:00
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	2019-11-27 17:52:02 +07:00
Maksim Pechnikov	0e9be6bafa	moved OAuth.Token.CleanWorker to Oban Periodic jobs	2019-11-25 14:32:20 +03:00
Sadposter	e2dc89069d	move documentation section for http client	2019-11-25 11:26:42 +00:00
Sadposter	d3656c2725	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
lain	bd62946020	Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' ... AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994	2019-11-22 15:39:19 +00:00
rinpatch	c2ad9fd5f9	Merge branch 'list-users' into 'develop' ... Add CLI list users command See merge request pleroma/pleroma!1990	2019-11-21 20:33:11 +00:00
Alex Schroeder	fbc379d689	Add CLI list users command	2019-11-21 21:07:06 +01:00
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	2019-11-19 20:14:02 +09:00
Egor Kislitsyn	36686f5245	Support authentication via x-admin-token HTTP header	2019-11-19 15:58:20 +07:00
feld	adacf1b5e1	Remove deprecated endpoint from docs that is fully removed from backend now	2019-11-18 16:16:27 +00:00
rinpatch	9e3868425a	Merge branch 'mix-task-warning' into 'develop' ... Documentation: Add warning about database mix tasks. See merge request pleroma/pleroma!1984	2019-11-15 19:38:52 +00:00
lain	234c27cb20	Documentation: Add warning about database mix tasks.	2019-11-15 14:30:59 +01:00
Ariadne Conill	29f49bf5fa	docs: document MRF ObjectAgePolicy	2019-11-14 19:47:54 -06:00
feld	1afeaf82fa	Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' ... Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815	2019-11-14 13:35:41 +00:00
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	2019-11-14 16:39:45 +07:00
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	2019-11-14 08:47:10 +00:00
Egor Kislitsyn	3350cd8d96	Fix formatting in OpenBSD install manual	2019-11-13 18:49:29 +07:00
Egor Kislitsyn	e6d7e27bd6	Add allow_following_move setting to User	2019-11-12 18:45:28 +07:00
rinpatch	04473677cc	docs: move static-fe docs under a proper category	2019-11-11 23:24:15 +03:00
kaniini	2cc043591c	Merge branch 'feature/static-fe' into 'develop' ... Static frontend See merge request pleroma/pleroma!1917	2019-11-11 19:10:44 +00:00
Egor Kislitsyn	ab2e61238e	Add a warning about Pg version to the RUM related docs	2019-11-11 19:13:07 +07:00
Maxim Filippov	46787b9fe1	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-11 19:18:12 +09:00
Maxim Filippov	31343e4321	Code style fixes	2019-11-11 19:06:09 +09:00
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-11-10 11:32:50 +00:00
Phil Hagelberg	6ef8049664	Add changelog entry, cheatsheet docs, and alphabetize.	2019-11-09 18:09:29 -08:00
rinpatch	518b0193a1	Big config cheatsheet revamp ... Categorize things, remove old deprecation warnings, consistently place dots in unordered lists, fix links, etc.	2019-11-10 03:33:36 +03:00
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	2019-11-08 13:27:11 +01:00
Maxim Filippov	b14bf9044f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-08 18:30:49 +09:00
eugenijm	7888803ffe	Mastodon API: Add the recipients parameter to GET /api/v1/conversations	2019-11-07 08:26:24 +03:00
Maxim Filippov	43ea16870f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-05 02:12:48 +03:00
Maxim Filippov	ab5c8ec9fa	Update docs	2019-11-01 20:27:16 +03:00
Maksim Pechnikov	58da7f6620	updated docs\changelog	2019-10-31 17:34:17 +03:00
Mark Felder	752d0c6833	Relocate to configuration subdir	2019-10-22 15:14:04 -05:00
Mark Felder	47a551837a	Remove proxy_cache_lock suggestion	2019-10-22 15:13:42 -05:00
Mark Felder	b9d164fb89	Formatting	2019-10-22 14:12:01 -05:00
Mark Felder	a1ad8dc349	Leverage nginx proxy cache to store items with a 1 year TTL with no size limit. ... It does not purge items when they expire, but will only update them if the origin's copy has changed for some reason. If origin is offline/unavailable or gone forever it will still serve the cached copies.	2019-10-22 14:07:59 -05:00
Mark Felder	c077dc7af5	Initial doc about storing remote media	2019-10-22 11:52:21 -05:00
Ivan Tashkinov	ee04fbc35a	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	2019-10-20 22:29:56 +03:00
Ivan Tashkinov	c6fdfbc4f1	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	2019-10-20 20:43:18 +03:00
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	2019-10-20 13:42:42 +03:00
Haelwenn	f01dbc450c	Merge branch 'feature/mastofe-pwa' into 'develop' ... MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834	2019-10-19 20:11:58 +00:00
eugenijm	52ed2f8f2d	Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read	2019-10-19 15:24:06 +03:00
KokaKiwi	df3c2dfd8b	Add documentation for PWA manifest configuration.	2019-10-19 12:15:16 +02:00
Maxim Filippov	2473702be2	Merge branch 'develop' into feature/relay-list	2019-10-18 10:24:29 +02:00
Maxim Filippov	da0e4879bc	DELETE /api/pleroma/admin/users now accepts nicknames array	2019-10-15 17:33:29 +02:00
feld	3b1bc079af	Merge branch 'exclude-visibilities-for-timelines' into 'develop' ... Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints See merge request pleroma/pleroma!1818	2019-10-14 19:40:40 +00:00
rinpatch	0e9243e8a2	Preparations for renaming master to stable	2019-10-14 18:38:51 +03:00
eugenijm	a97b642289	Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints	2019-10-14 02:57:21 +03:00
Maxim Filippov	cc6875b582	Add GET /api/pleroma/admin/relay endpoint - lists all followed relays	2019-10-11 19:12:29 +03:00
Maxim Filippov	aaa4252f41	Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it	2019-10-11 15:58:45 +03:00
Maxim Filippov	f5104f36bb	Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it	2019-10-11 00:24:31 +03:00
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	2019-10-09 17:03:54 +03:00
Maxim Filippov	35068baf65	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-10-07 15:41:41 +03:00
Maxim Filippov	7aceaa517b	Admin API: Reports, grouped by status	2019-10-07 15:39:07 +03:00
lain	6c278cfe09	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-07 12:31:51 +00:00
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
lain	61097ba6ab	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-06 08:11:47 +00:00
eugenijm	8249924485	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-05 20:12:00 +03:00
lain	1ed8fbc4d9	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 15:10:57 +02:00
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	2019-10-05 10:00:05 +00:00
lain	d9aaea44ff	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 10:42:29 +02:00
kaniini	5c04e81724	Merge branch 'user-info-unread-direct-conversation' into 'develop' ... Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737	2019-10-04 17:33:18 +00:00
Maxim Filippov	795ea5dfc2	Move HTTP verb to the header (admin_api.md)	2019-10-04 18:58:44 +03:00
lain	27110793a7	Merge branch 'featrue/job-monitor' into 'develop' ... Add Pleroma.JobQueueMonitor Closes #1274 See merge request pleroma/pleroma!1721	2019-10-04 12:52:11 +00:00
Haelwenn (lanodan) Monnier	e4ab9a05dd	cheatsheet.md: link to pleroma-fe docs for :frontend_configurations	2019-10-04 00:10:28 +02:00
eugenijm	06d9df79c5	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-04 00:53:23 +03:00
rinpatch	69784eb75a	Add a missing language specification	2019-10-03 15:10:04 +03:00
rinpatch	1cae564b5d	Move config task docs to a separate file and mark it as WIP	2019-10-03 14:12:57 +03:00
rinpatch	6baa037903	Move database maintenance tasks docs to a separate file	2019-10-03 11:17:29 +03:00
rinpatch	8e08d5b233	MkDocs does not like if a paragraph doesn't have a newline after it	2019-10-03 11:02:07 +03:00
rinpatch	2656f41818	Remove silent mode note as it's no longer relevant	2019-10-03 10:57:27 +03:00
rinpatch	aefb4dcff5	Cheatsheet: Use note/warning blocks instead of bold text	2019-10-03 10:54:41 +03:00
rinpatch	e560d65db3	Fix a typo in activity expirations	2019-10-03 10:45:40 +03:00
rinpatch	25849157aa	Remove fe settings from :instance as they no longer do anything	2019-10-03 10:43:38 +03:00
rinpatch	4e70009490	Move bold text in RemoveIp description into a proper warning	2019-10-03 10:39:53 +03:00
rinpatch	cb162678df	Add missing language spec	2019-10-03 10:37:34 +03:00
rinpatch	66450f8615	Cheatsheet: Move the deprecated config warning into a warning block	2019-10-03 10:36:01 +03:00
rinpatch	2cbe2dcbde	Oops	2019-10-03 10:31:59 +03:00
rinpatch	b4ca864c6b	Move user tasks docs to a separate file	2019-10-03 10:15:24 +03:00
rinpatch	8fd47a4a5a	Use consistent command signature	2019-10-03 09:38:24 +03:00
rinpatch	f5372bfb4a	Fix up some headings	2019-10-03 09:36:35 +03:00
rinpatch	d39ccc2e7f	Move uploads task docs to a separate file	2019-10-03 09:35:21 +03:00
rinpatch	808d0a0170	Move relay docs to a separate file	2019-10-03 09:10:31 +03:00
rinpatch	6435ba83cd	Move instance CLI task docs to a text file	2019-10-03 09:06:06 +03:00
rinpatch	a54739a530	Improve styling of CLI tasks	2019-10-03 08:51:57 +03:00
rinpatch	869ea2ab90	Move digest email docs to a separate file and improve styling	2019-10-03 01:10:36 +03:00
rinpatch	bd9c7807fb	Move emoji task docs to a separate file	2019-10-03 01:03:47 +03:00
rinpatch	2767c413fb	Remove a reference to inline docs since everything it describes is ... described in the cheatsheet already and add A TODO	2019-10-03 00:36:18 +03:00
rinpatch	0ba5c1a9d7	Fix more links	2019-10-03 00:22:14 +03:00
rinpatch	b8e5e46fa8	Fix references to other pages	2019-10-03 00:18:32 +03:00
rinpatch	74d682a09e	Remove Small customizations as it's contents have been integrated into ... static_dir.md	2019-10-03 00:02:01 +03:00
rinpatch	838ff12ec5	Remove "General tips for customizing Pleroma FE" because it's no longer ... relevant and we have actual fe docs now	2019-10-02 23:58:57 +03:00
rinpatch	03e1898917	Rename "Configuration" to "Configuration Cheat Sheet" and explain a bit ... about how Pleroma Configuration works	2019-10-02 23:54:55 +03:00
rinpatch	acc62f327d	Rename some directories because MkDocs uses them for categories	2019-10-02 23:28:45 +03:00
lain	0e41951eab	Pleroma API Readme: Document unreaction endpoint.	2019-10-02 18:20:40 +02:00
Egor Kislitsyn	93f966ea4b	Update CHANGELOG and pleroma_api.md	2019-10-02 14:51:30 +07:00
lain	b923842e96	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-30 13:57:54 +02:00
Ariadne Conill	1d7cbdaf7b	change new scrobble endpoint	2019-09-30 10:39:48 +00:00
Ariadne Conill	a6e1469767	router: change scrobble timeline route from now-playing to scrobbles	2019-09-30 10:39:48 +00:00
Ariadne Conill	5fd29edac4	docs: add scrobble API description	2019-09-30 10:39:17 +00:00
Haelwenn (lanodan) Monnier	717cb4f933	admin_api.md: Put data-type info as the values ... Similar to how the other responses examples are done, this also makes it proper JSON (as it doesn’t have comments).	2019-09-29 02:14:53 +02:00
Maxim Filippov	0e59d1dc04	Update admin_api.md	2019-09-29 00:01:35 +03:00
minibikini	f9380289eb	Add remote_ip plug	2019-09-27 21:59:23 +00:00
kaniini	c4fbb56984	Merge branch 'patch-2' into 'develop' ... Minor corrections and clarification for Alpine standard v.3.10 See merge request pleroma/pleroma!1594	2019-09-27 03:50:36 +00:00
kaniini	0e280354d9	Merge branch 'update/docs-jp' into 'develop' ... Update Japanese document to follow English document See merge request pleroma/pleroma!1615	2019-09-27 03:49:00 +00:00
kaniini	01a7e20c32	Merge branch 'list-packs-docs' into 'develop' ... Add list_from endpoint to the pleroma_api docs See merge request pleroma/pleroma!1720	2019-09-27 03:46:53 +00:00
kaniini	8df3a63ce9	Merge branch 'patch-1' into 'develop' ... Fix code block for admin api document See merge request pleroma/pleroma!1722	2019-09-27 03:46:34 +00:00
Maxim Filippov	39a4892929	Add docs	2019-09-26 19:20:47 +03:00
kPherox	f249b2381f	Fix code block for admin api document	2019-09-26 16:10:34 +00:00
Ekaterina Vaartis	fc16bec317	Add list_from endpoint to the pleroma_api docs	2019-09-26 09:50:53 +02:00
Maxim Filippov	5e9759cd7d	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-24 13:00:48 +03:00
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' ... Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	2019-09-23 22:42:34 +00:00
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' ... Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	2019-09-23 22:41:31 +00:00
Rachel Fae Fox	63af6951fa	add tunable for stream uploads, as needed for jortage to work.	2019-09-23 20:38:53 +00:00
rinpatch	fd48bd80eb	Merge branch 'better-emoji-packs' into 'develop' ... Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551	2019-09-23 18:20:08 +00:00
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-22 16:58:39 +03:00
Maxim Filippov	f89fe3ac06	Update docs	2019-09-22 16:45:38 +03:00
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	2019-09-22 16:08:07 +03:00
lain	fe4db3b94e	API Docs: Document conversation ids.	2019-09-19 21:01:05 +02:00
Haelwenn	c1e011624d	Merge branch 'docs/clients-update' into 'develop' ... docs/clients.md: Update source code urls See merge request pleroma/pleroma!1697	2019-09-19 18:01:49 +00:00
Egor Kislitsyn	cf3041220a	Add support for rel="ugc"	2019-09-19 14:56:10 +07:00
Haelwenn (lanodan) Monnier	c3856bed0c	docs/clients.md: Update source code urls	2019-09-18 23:17:15 +02:00
Ekaterina Vaartis	86795d5ac2	Document emoji pack listing in the api docs	2019-09-19 00:16:33 +03:00
vaartis	43022c347f	Apply suggestion to docs/api/pleroma_api.md	2019-09-19 00:16:33 +03:00
vaartis	8aed05ac15	Apply suggestion to docs/api/pleroma_api.md	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	d51e5e447e	Move emoji reloading to admin api	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	dd818bdd48	Add documentation for the emoji endpoints	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	ee620ecbf1	Add caching for emoji pack sharing	2019-09-19 00:16:33 +03:00
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	2019-09-18 21:13:15 +00:00
Alex S	a18f1e7cd7	namings	2019-09-18 10:49:14 +03:00
Alex S	17ff63b3c3	docs fix	2019-09-18 10:49:14 +03:00
Alex S	4faf2b1555	post for creating invite tokens in admin api	2019-09-18 10:49:14 +03:00
rinpatch	ef2e2c5e12	Merge branch 'feature/return-total-for-reports' into 'develop' ... Admin API: Return total for reports See merge request pleroma/pleroma!1628	2019-09-17 19:09:56 +00:00
eugenijm	450bf7a63c	Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)	2019-09-17 14:45:47 +03:00
Egor Kislitsyn	d6ab78e610	Set account_field_value_length limit to 2048 by default	2019-09-16 21:48:01 +07:00
Maxim Filippov	219dca1b00	Merge branch 'develop' into feature/return-total-for-reports	2019-09-16 14:40:17 +03:00
Ivan Tashkinov	3b8ec98b0e	[#1149] Reinstated docs/config.md changes.	2019-09-15 10:15:57 +03:00
Alex S	c625fe6f09	config.md back	2019-09-13 19:03:39 +03:00
lain	a7f31bf06c	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-13 16:31:27 +02:00
lain	f649a2e972	Pleroma API Docs: Documented Emoji reaction endpoints.	2019-09-13 16:19:50 +02:00
Haelwenn	0d9609894f	Merge branch 'feature/change-email' into 'develop' ... Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580	2019-09-13 12:46:16 +00:00
rinpatch	f884987ace	Merge branch 'admin-config-description' into 'develop' ... Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611	2019-09-13 12:36:24 +00:00
Egor Kislitsyn	7b5c81b391	Add a note about compatibility with Mastodon	2019-09-13 13:09:37 +07:00
Egor Kislitsyn	25d8216804	Add email change endpoint	2019-09-13 13:09:35 +07:00
Angelina Filippova	528a88a686	Fix admin api docs for creating users	2019-09-13 03:31:16 +00:00
Alex S	aa7fb22008	placeholder for config.md	2019-09-11 09:25:33 +03:00
Alex S	ab4960cc7f	deleting old config.md file	2019-09-11 09:25:33 +03:00
Egor Kislitsyn	30f0cec49a	Add note about limit to the doc	2019-09-10 13:39:45 +07:00
Egor Kislitsyn	b40b10b53d	Add an endpoint to get multiple statuses by IDs	2019-09-10 13:39:45 +07:00
minibikini	11e12b5761	Add Pleroma.Plugs.Cache	2019-09-09 18:53:08 +00:00
Maxim Filippov	af746fa4a8	Return total for reports	2019-09-04 20:08:13 +03:00
rinpatch	3face45467	Mastodon API: Add pleroma.thread_muted to Status entity ... Needed for pleroma-fe!941	2019-09-04 14:17:23 +03:00
rinpatch	328b2612cd	Clarify that read notifications are returned	2019-09-04 13:39:39 +03:00
rinpatch	377aa9fb90	Apply suggestion to docs/api/pleroma_api.md	2019-09-04 10:37:43 +00:00
rinpatch	c2b6c1b089	Extend /api/pleroma/notifications/read to mark multiple notifications ... as read and make it respond with Mastoapi entities	2019-09-04 12:38:27 +03:00
AkiraFukushima	7808eee9aa	Update Japanese document to follow English document	2019-08-31 16:23:15 +09:00
ultem	880307e0d5	minor: Fix version dot	2019-08-30 19:41:31 +00:00
Egor Kislitsyn	fd076def0a	Fix typo	2019-08-27 02:24:14 +07:00
Egor Kislitsyn	66c1966688	Disable rate limiter by default	2019-08-26 20:36:44 +07:00
Maxim Filippov	37dd3867bb	Log admin/moderator actions	2019-08-25 19:39:37 +00:00
lain	24994f3e0c	Activity expiration: Fix docs.	2019-08-24 17:28:19 +02:00
lain	cc6c0b4ba6	Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration	2019-08-24 15:48:33 +02:00
ultem	ef9930ed80	Minor corrections and clarification for Alpine standard v.3.10	2019-08-24 10:16:27 +00:00
aries	e5f76a54e6	Fix default config of account fields length	2019-08-23 21:28:52 +00:00
lain	8340fe8fcc	Merge branch 'digest-template' into 'develop' ... Improve digest email template See merge request pleroma/pleroma!1565	2019-08-20 12:55:51 +00:00
lain	ef43016b2c	Merge branch 'feature/custom-fields' into 'develop' ... Add custom profile fields See merge request pleroma/pleroma!1488	2019-08-20 12:44:14 +00:00
Egor Kislitsyn	158231cd20	Add configurable colors and logo for the digest template	2019-08-16 18:32:25 +07:00
lain	560dbad538	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	2019-08-14 15:30:40 +02:00
Egor Kislitsyn	a2e1db5632	Increase max account fields limits	2019-08-14 14:58:38 +07:00
Egor Kislitsyn	e457fcc479	Add :max_remote_account_fields config option	2019-08-14 14:58:06 +07:00
Egor Kislitsyn	2c35d4b0b0	Add configurable account field name length limit	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	db3c05f6b4	Add configurable account field value length limit	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	e0ac5c7a66	Add custom profile fields	2019-08-14 14:52:54 +07:00
rinpatch	9ef31767f2	Merge branch 'feature/mrf-vocabulary' into 'develop' ... MRF Vocabulary See merge request pleroma/pleroma!1559	2019-08-13 22:51:15 +00:00
Ariadne Conill	5983f98f26	docs tweak	2019-08-13 22:40:18 +00:00
rinpatch	83a3de8cc4	Merge branch 'length-limit-bio' into 'develop' ... Add configurable length limits for `User.bio` and `User.name` See merge request pleroma/pleroma!1515	2019-08-13 22:40:13 +00:00
Ariadne Conill	3cfaac39e2	docs: document mrf_vocabulary module settings	2019-08-13 20:55:42 +00:00
Ariadne Conill	f46cd7e9c7	config: remove legacy activitypub accept_blocks setting ... Anyone who is interested in dropping blocks can write their own MRF policy at this point. This setting predated the MRF framework. Disabling the side effect (unsubscription) is still a config option per policy.	2019-08-13 02:15:21 +00:00
lain	60231ec7bd	Conversation: Add endpoint to get a conversation by id.	2019-08-12 13:58:04 +02:00
Maksim	11d08c2de0	tests for Pleroma.Uploaders	2019-08-10 18:46:26 +00:00
lain	29807ef6a5	Merge branch 'feature/digest-email' into 'develop' ... Feature/digest email See merge request pleroma/pleroma!1078	2019-08-08 14:38:33 +00:00
lain	a2b98f6d58	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	2019-08-08 16:04:20 +02:00
lain	a49c92f6ae	Participation: Setting recipients will always add the owner.	2019-08-06 14:51:17 +02:00
lain	ddabe7784b	Pleroma Conversations: Document differences.	2019-08-05 15:58:14 +02:00
x0rz3q	3411f506b3	Replace "impode" with "implode" for	2019-08-04 14:35:45 +00:00
Pierce McGoran	9b9453ceaf	Fix some typos and rework a few lines in howto_mediaproxy.md	2019-08-04 03:12:38 +00:00
Alexander Strizhakov	de0f3b73dd	Admin fixes	2019-08-03 18:16:09 +00:00
Roman Chvanikov	9d4f34fbcb	Merge branch 'develop' into feature/digest-email	2019-08-02 18:16:04 +03:00
Egor Kislitsyn	9ca4506355	Add configurable length limits for User.bio and User.name	2019-08-01 15:53:37 +07:00
Alexander Strizhakov	51b3b6d816	Admin changes	2019-07-30 16:36:05 +00:00
Sachin Joshi	242f5c585e	add account confirmation email resend in mastodon api	2019-07-28 20:30:10 +00:00
Mike Verdone	2c83eb0b15	Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" ... This reverts commit 2981821db8.	2019-07-24 17:09:59 +02:00
Mike Verdone	2981821db8	squash! Expose expires_at datetime in mastoAPI only for the activity actor ... NOTE: rewrite the commit msg	2019-07-24 16:51:09 +02:00
Roman Chvanikov	d2da3d30f3	Merge branch 'develop' into feature/digest-email	2019-07-24 16:37:52 +03:00
Mike Verdone	3cb471ec06	Expose expires_at datetime in mastoAPI only for the activity actor ... In the "pleroma" section of the MastoAPI for status activities you can see an expires_at item that states when the activity will expire, or nothing if the activity will not expire. The expires_at date is only visible to the person who posted the activity. This is the conservative approach in case some attacker decides to write a logger for expiring posts. However, in the future of OCAP, signed requests, and all that stuff, this attack might not be that likely. Some other pleroma dev should remove the restriction in the code at that time, if they're satisfied with the security implications of doing so.	2019-07-24 14:47:22 +02:00
Mike Verdone	704960b3c1	Add support for activity expiration to common and Masto API ... The "expires_at" parameter accepts an ISO8601-formatted date which defines when the activity will expire. At this point the API will not give you any feedback about if your post will expire or not.	2019-07-24 14:45:14 +02:00
Mike Verdone	378f5f0fbe	Add activity expiration worker ... This is a worker that runs every minute and deletes expired activities. It's based heavily on the scheduled activities worker.	2019-07-24 13:14:52 +02:00
kaniini	0be548b90a	Merge branch 'Fix-static-dir-doc' into 'develop' ... Fix static_dir docs See merge request pleroma/pleroma!1465	2019-07-24 01:59:41 +00:00
aries	9638da43e9	Add text about gitignore	2019-07-24 01:50:56 +00:00
Maxim Filippov	f46805bb40	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-24 02:42:28 +03:00
Maxim Filippov	03471151d6	AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)	2019-07-24 01:51:36 +03:00
Alexander Strizhakov	5e72554f3c	Admin config fix	2019-07-23 19:17:00 +00:00
Aries	1e7d68e8bf	Fix the sentence and add the setting example	2019-07-23 09:55:58 +09:00
aries	63924ee712	Fix static_dir docs	2019-07-22 18:46:32 +09:00
Roman Chvanikov	8292331b35	Merge branch 'develop' into feature/digest-email	2019-07-20 16:41:58 +03:00
Roman Chvanikov	36049f08ef	Merge develop	2019-07-20 01:03:25 +03:00
feld	93df0796f0	Merge branch 'feature/matstodon-statuses-by-name' into 'develop' ... Feature/matstodon statuses by name See merge request pleroma/pleroma!1211	2019-07-19 21:59:18 +00:00
Mark Felder	9169f331b6	Merge branch 'develop' into feature/matstodon-statuses-by-name	2019-07-19 16:55:10 -05:00
kaniini	33729bbb28	Merge branch 'feature/richmedia-ttl' into 'develop' ... add the rich media ttl based on image exp time See merge request pleroma/pleroma!1438	2019-07-19 21:36:36 +00:00
tom79	5c4a555b1d	Fix domain for the contact clients.md	2019-07-19 08:40:47 +00:00
tom79	b0b9eca37d	Update clients.md for Fedilab ... - Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features	2019-07-19 08:39:22 +00:00
Sachin Joshi	581756ccc5	update the docs	2019-07-19 11:50:47 +05:45
Sachin Joshi	de9906ad56	change the structure of image ttl parsar	2019-07-19 11:43:42 +05:45
Maxim Filippov	9570a5be40	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-18 23:38:38 +03:00
kaniini	f9a0014681	Merge branch 'feature/signed-object-fetches' into 'develop' ... signed object fetches See merge request pleroma/pleroma!1446	2019-07-18 13:27:50 +00:00
aries	129078eddc	Fix redirect setting not working	2019-07-18 21:08:31 +09:00
tallship	cffe8229a5	Update clients.md - added Homepage for Fedilab Android app	2019-07-17 23:03:46 +00:00
Bradley D. Thornton	cdecef2a08	Update otp_en.md - Added creation of initial admin user	2019-07-17 22:35:16 +00:00
Ariadne Conill	b2a8ccf37f	config: add sign_object_fetches option	2019-07-17 21:38:06 +00:00
kaniini	ce73d5f6a5	Merge branch 'feature/mention-mrf' into 'develop' ... Add MRF MentionPolicy for dropping posts which mention specific actors See merge request pleroma/pleroma!1439	2019-07-17 15:28:41 +00:00
RX14	96a2890a9e	Add MRF MentionPolicy for dropping posts which mention specific actors	2019-07-17 15:16:55 +01:00
Sachin Joshi	18234cc44e	add the rich media ttl based on image exp time	2019-07-17 00:20:34 +05:45
Ivan Tashkinov	2ba07b63f4	Apply suggestion to docs/config.md	2019-07-16 16:59:02 +00:00
Ivan Tashkinov	889dc17abd	[#1094] Rate-limited follow & unfollow actions.	2019-07-16 19:18:30 +03:00
Roman Chvanikov	9bca70b10a	Merge develop	2019-07-16 16:19:19 +03:00
Eugenij	520ee6c591	Add pleroma.deactivated to the Account entity (Mastodon API)	2019-07-16 11:14:46 +00:00
Mark Felder	ffb4eb9779	Merge branch 'develop' into feature/matstodon-statuses-by-name	2019-07-15 17:10:27 -05:00
Eugenij	345a38778e	Remove dead link from the installation docs	2019-07-15 21:43:04 +00:00
Egor Kislitsyn	0c66bb5857	Update documentation	2019-07-15 14:27:56 +07:00
Egor Kislitsyn	64a946643e	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-07-15 14:11:54 +07:00
Roman Chvanikov	c729883936	Merge branch 'develop' into feature/digest-email	2019-07-14 21:43:30 +03:00
Alex S	7af27c143d	changelog & docs	2019-07-14 09:23:43 +03:00
Maxim Filippov	418ae6638d	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-14 00:39:06 +03:00
Maxim Filippov	a9459ff98f	Admin API: Endpoint for fetching latest user's statuses	2019-07-14 00:37:26 +03:00
Ariadne Conill	0cc638b968	docs: note that exclusions usage will be included in the transparency metrics if used	2019-07-13 19:00:03 +00:00
Ariadne Conill	80c46d6d8b	nodeinfo: implement MRF transparency exclusions	2019-07-13 18:53:14 +00:00
Ivan Tashkinov	b74d11e20a	[#1041] Added documentation on existing rate limiters.	2019-07-13 15:13:26 +03:00
Mark Felder	360e4cdaa2	Move these to pleroma namespace in Mastodon API	2019-07-12 11:25:58 -05:00
Roman Chvanikov	eae991b06a	merge develop	2019-07-12 18:08:27 +03:00
Alexander Strizhakov	846ad9a463	admin api configure changes	2019-07-11 13:02:13 +00:00
Egor Kislitsyn	182f7bbb11	Merge branch 'develop' into feature/addressable-lists	2019-07-11 13:26:59 +07:00
Alex S	beba7bbc85	removing synchronization worker	2019-07-10 17:42:18 +03:00
Maksim	12b1454245	[#1062] added option to disable send email	2019-07-10 05:34:21 +00:00
Roman Chvanikov	371d39e160	Merge develop	2019-07-09 21:21:09 +03:00
feld	c91b5c87ff	Docs/more mastodon api	2019-07-09 18:20:36 +00:00
Mark Felder	9a9b60cfbc	Merge branch 'develop' into feature/allow-user-query-via-id	2019-07-09 12:49:04 -05:00
Alexander Strizhakov	d6b0fce6e9	Fix/1019 correct count remote users	2019-07-09 17:36:35 +00:00
Ivan Tashkinov	dd5a41e2a4	Apply suggestion to docs/config.md	2019-07-09 10:39:36 +00:00
Maxim Filippov	9f23502856	Fix docs	2019-07-06 15:16:56 +03:00
Ivan Tashkinov	ad8d86e7c6	Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit	2019-07-06 10:17:06 +03:00
Maxim Filippov	6c50fbcd14	Admin API: Allow querying user by ID	2019-07-05 19:33:53 +03:00
Haelwenn	3b05f834f4	Merge branch 'fix/docs-dry-run' into 'develop' ... OTP Release install docs: Remove --dry-run in cron certbot command See merge request pleroma/pleroma!1366	2019-07-01 04:52:42 +00:00
Maxim Filippov	611f6665ac	Update changelog and admin API docs with tags, display_name, avatar additions	2019-07-01 03:36:42 +03:00
Roman Chvanikov	d2cb18b2a3	Merge branch 'develop' into feature/digest-email	2019-06-30 21:23:35 +03:00
Ivan Tashkinov	a799418573	[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit ... # Conflicts: # CHANGELOG.md	2019-06-30 16:05:00 +03:00
Ivan Tashkinov	2b9d914089	[#161] Refactoring, documentation.	2019-06-30 15:58:50 +03:00
rinpatch	044eb039c2	OTP Release install docs: Remove --dry-run in cron certbot command	2019-06-30 13:06:10 +03:00
Maksim	acd20f166b	[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text	2019-06-30 07:28:35 +00:00
deorsum	4c40ada7a5	Add a caveat for docker deployment in the config docs	2019-06-29 21:14:11 +10:00
rinpatch	eddcebf8ae	Add a warning about service files assuming installation paths	2019-06-29 11:35:42 +03:00
rinpatch	b6cfc8f98b	Merge branch 'patch-3' into 'develop' ... Move all upload contents despite upload folder itself. See merge request pleroma/pleroma!1352	2019-06-29 06:01:33 +00:00
Yuji Nakao	ab6de9b478	Move all upload contents despite upload folder itself.	2019-06-29 04:24:44 +00:00
Yuji Nakao	b2548e65db	Update migrating_from_source_otp_en.md: Replace reload-daemon with daemon-reload.	2019-06-29 04:17:49 +00:00
William Pitcock	074ffee0b2	docs: add documentation for MediaProxyWarmingPolicy	2019-06-28 23:20:17 +00:00
Roman Chvanikov	657277ffc0	Resolve conflicts	2019-06-29 00:52:50 +03:00
Julien Wehmschulte	e556c96661	Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files	2019-06-28 18:25:21 +00:00
lain	2286f62a36	Merge branch 'release-docs' into 'develop' ... Docs on OTP releases See merge request pleroma/pleroma!1315	2019-06-28 15:26:09 +00:00
rinpatch	eeb419e3a0	Add a note about the develop branch	2019-06-28 09:42:45 +03:00
rinpatch	4f44732100	Add a note on what OTP releases are	2019-06-27 09:45:13 +03:00
Alexander Strizhakov	c6705144a2	don't delete config settings on admin update	2019-06-27 04:19:44 +00:00
rinpatch	f5f1bb35c3	Instructions on getting the flavour	2019-06-26 15:24:06 +03:00
rinpatch	877f91c0c4	Do not assume ~pleroma == /opt/pleroma	2019-06-26 15:20:22 +03:00
rinpatch	e404335af8	Add all the remaining sections to Switching to OTP releases	2019-06-26 11:34:58 +03:00
kaniini	9f8e645dce	Merge branch 'feature/configurable-pack-extensions' into 'develop' ... Make default pack extensions configurable and default to png and gif See merge request pleroma/pleroma!1338	2019-06-26 05:34:02 +00:00
rinpatch	41e4752950	Make default pack extensions configurable and default to png and gif	2019-06-26 06:48:59 +03:00
Maksim	ec01b7c934	Apply suggestion to docs/config.md	2019-06-26 03:23:26 +00:00
Maksim Pechnikov	4ad15ad2a9	add ignore hosts and TLDs for rich_media	2019-06-25 22:25:37 +03:00
rinpatch	44aa895b78	Add a note that OTP releases don't contain revision history	2019-06-25 05:50:25 +03:00
rinpatch	57d18b06ab	Remove the useless specification of test size and make the main points bold	2019-06-25 04:55:41 +03:00
rinpatch	687f0aee51	Basic skeleton of "Switching a from-source install to OTP releases"	2019-06-24 11:51:02 +03:00
aries	550302c041	Apply suggestion to docs/config.md	2019-06-24 01:09:28 +00:00
rinpatch	7fc226e0fe	Remove the warning about alpine as the issue is now solved	2019-06-24 02:50:28 +03:00
aries	7daaaf84f1	Fix markdown mistakes	2019-06-24 01:28:01 +09:00
aries	4bac13966b	modify config.md for S3	2019-06-24 01:10:55 +09:00
kaniini	8b7860f12f	Merge branch 'admin-config' into 'develop' ... Admin config See merge request pleroma/pleroma!1328	2019-06-23 05:42:37 +00:00
rinpatch	40a62839ff	Use build-base instead of individual packages	2019-06-23 08:35:35 +03:00
Alex S	982cad0268	support for config groups	2019-06-23 08:16:16 +03:00
rinpatch	1d3c5e434d	releases_en.md -> otp_en.md	2019-06-23 07:44:10 +03:00
rinpatch	66e92dc0ca	Add a Further Reading section to the OTP install guide	2019-06-23 07:43:45 +03:00
rinpatch	299cefa2bd	Add a section on executing mix tasks	2019-06-23 03:05:02 +03:00
rinpatch	18eabca978	Add a section about updating	2019-06-23 02:55:43 +03:00
rinpatch	9d487ba579	Add docs about SSL certificate auto-renew	2019-06-23 02:42:53 +03:00
rinpatch	7a4c4518b8	Remove a note about needing to add RUM to config manually, as it is now ... in the config generator	2019-06-22 21:18:34 +03:00
Haelwenn (lanodan) Monnier	ab79a18b77	docs/clients.md: Remove tootdon ... Of course a proprietary client would send the messages home :D	2019-06-22 19:34:30 +02:00
Alex S	410add1c30	support for tuples with more than 2 values	2019-06-22 17:30:53 +03:00
rinpatch	e00e4c0e7a	Add a warning about OTP releases on Alpine 3.10	2019-06-22 13:41:17 +03:00
rinpatch	177faf15c2	Correct dependencies for RUM on alpine and remove installcheck	2019-06-22 08:36:36 +03:00
rinpatch	50e3cf9d5e	Correct a typo in the apk command	2019-06-22 08:31:02 +03:00
rinpatch	dd05dc65d3	Do not exit on fail in the one-liner because it closes ssh connection and fix dependencies for alpine	2019-06-22 08:30:32 +03:00
rinpatch	1d2332ce79	Use uname -m instead of arch for more portability	2019-06-22 05:20:36 +03:00
rinpatch	120f84c83d	Executing create is unnecessary after the postgres script is executed	2019-06-22 04:35:22 +03:00
rinpatch	23608149bc	Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command	2019-06-22 02:21:02 +03:00
rinpatch	d1d648b0ec	Correct the psql command	2019-06-22 02:09:45 +03:00
rinpatch	452d5d3231	Merge branch 'develop' into release-docs	2019-06-22 02:00:18 +03:00
rinpatch	743bd64883	Apply suggestion to docs/installation/releases_en.md	2019-06-21 17:00:12 +00:00
rinpatch	de77d7621a	Apply suggestion to docs/installation/releases_en.md	2019-06-21 16:59:56 +00:00
rinpatch	8b170b96c7	Apply suggestion to docs/installation/releases_en.md	2019-06-21 16:59:48 +00:00
rinpatch	4bec121798	Do not set ownership group in chown commands	2019-06-21 06:39:03 +03:00
rinpatch	e824025c52	Remove a useless echo	2019-06-21 06:37:38 +03:00
rinpatch	16e9304cec	Change to long adduser options because the short ones only work on busybox	2019-06-21 06:32:34 +03:00
rinpatch	4669a56aa3	Add notes on RUM indexes	2019-06-21 06:22:34 +03:00
rinpatch	f9515a3611	Add a note about RUM indexes package on Debian/Ubuntu	2019-06-21 06:14:02 +03:00
rinpatch	d3d98beaad	Correct package names for Debian	2019-06-21 06:04:39 +03:00
rinpatch	dd23888774	OTP release install guide sceleton	2019-06-21 05:48:13 +03:00
William Pitcock	630ac6a921	docs: better description for mrf anti link spam	2019-06-20 03:01:03 +00:00
William Pitcock	736d8ad6be	implement anti link spam MRF	2019-06-19 15:58:32 +00:00
lain	6745bc951c	Documentation: Document chat token response.	2019-06-15 11:11:45 +02:00
rinpatch	62ffc00a5d	Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' ... AccountView: Add user background. See merge request pleroma/pleroma!1280	2019-06-14 16:49:28 +00:00
Alexander Strizhakov	c2ca1f22a2	it is changed in compile time ... we can't change module attributes and endpoint settings in runtime	2019-06-14 15:45:05 +00:00
lain	774637a2f4	Mastodon API: Document changes.	2019-06-14 11:24:09 +02:00
lain	4265608097	Merge branch 'chore/tagpolicy_docs' into 'develop' ... Document TagPolicy in `rewrite_policy` section See merge request pleroma/pleroma!1271	2019-06-12 09:52:55 +00:00
rinpatch	ced59be1ae	Document TagPolicy in rewrite_policy section	2019-06-11 22:15:28 +03:00
Egor Kislitsyn	6f29865d43	Add option to restrict all users to local content	2019-06-11 21:25:53 +07:00
Hakaba Hitoyo	5d5a9a3a35	Better default parameters for suggestion	2019-06-11 11:34:22 +00:00
Egor Kislitsyn	ad04d12de6	Replace MastodonAPIController.account_register/2 rate limiter	2019-06-11 16:06:03 +07:00
Egor Kislitsyn	2e5affce61	Add RateLimiter	2019-06-11 14:27:41 +07:00
Roman Chvanikov	01fe5abad1	Resolve conflicts	2019-06-07 01:20:50 +03:00
Egor	f82382de22	[#943] Make the unauthenticated users limitation optional	2019-06-06 12:17:49 +00:00
Egor Kislitsyn	cfa5572d28	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-05 17:53:15 +07:00
Ivan Tashkinov	3eefb274f4	OAuth consumer: tests fix, comments, Keycloak config notes.	2019-06-05 13:02:13 +03:00
kaniini	e4babb1c9f	Merge branch 'explicit-addressing' into 'develop' ... Explicit addressing See merge request pleroma/pleroma!1239	2019-06-05 08:28:20 +00:00
Egor Kislitsyn	6ba9055b51	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-05 12:54:30 +07:00
Roman Chvanikov	b1b1a270e8	Fix conflict	2019-06-05 02:45:21 +03:00
Maksim Pechnikov	96121315f3	fix merge	2019-06-04 12:41:24 +03:00
Egor Kislitsyn	9ce928d823	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-04 16:28:23 +07:00
lain	4cab98b7bf	Merge remote-tracking branch 'origin/develop' into explicit-addressing	2019-06-04 11:23:46 +02:00
lain	25198d48f7	Docs: Add Explicit addressing to Readme and changelog.	2019-06-04 10:49:57 +02:00
Maksim Pechnikov	4f2e359687	Merge branch 'develop' into issue/941	2019-06-04 09:49:08 +03:00
kaniini	9f0d0d0805	Merge branch 'feature/mrf-subchain' into 'develop' ... MRF: subchain policy See merge request pleroma/pleroma!1233	2019-06-04 05:49:54 +00:00
kaniini	9d2563a3de	Merge branch 'generic-fe-settings' into 'develop' ... Generic settings store for frontend user settings See merge request pleroma/pleroma!1221	2019-06-04 05:43:43 +00:00
kaniini	a536f515dd	Merge branch 'ueberauth_config_extension' into 'develop' ... Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification See merge request pleroma/pleroma!1234	2019-06-04 05:42:49 +00:00
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
Maksim Pechnikov	f13d6c7f78	update api to set skip_thread_containment	2019-06-03 21:02:57 +03:00
Maksim Pechnikov	080e1aa70e	add option skip_thread_containment	2019-06-03 16:13:37 +03:00
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 11:14:52 +03:00
Ivan Tashkinov	83663caa81	Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.	2019-06-02 17:45:32 +03:00
William Pitcock	c724d8df98	docs: document mrf_subchain	2019-06-02 10:14:56 +00:00
rinpatch	65db5e9f52	Resolve merge conflicts	2019-06-01 16:29:58 +03:00
Haelwenn (lanodan) Monnier	5d3ece2861	Remove now useless flavours switching	2019-06-01 01:44:10 +02:00
lain	10fe02acef	Documentation: Document Settings store mechanism.	2019-05-31 14:59:24 +02:00
feld	88414151b4	Formatting	2019-05-30 21:35:31 +00:00
feld	75a37a68d4	Install docs should clone from master branch	2019-05-30 21:30:42 +00:00
Mark Felder	e912f81c82	Update docs to reflect we accept nickname for id for both of these endpoints	2019-05-29 12:22:14 -05:00
Roman Chvanikov	ce47017c89	Merge develop	2019-05-29 18:18:22 +03:00
Egor Kislitsyn	f333041a0a	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-24 21:05:57 +07:00
kaniini	75e78d4e23	Merge branch 'feature/mrf-user-filter' into 'develop' ... mrf: add support for filtering users See merge request pleroma/pleroma!1188	2019-05-22 19:03:14 +00:00
kaniini	f0516d9114	Merge branch 'ssh-fixes' into 'develop' ... Ssh fixes Closes #869 and #925 See merge request pleroma/pleroma!1191	2019-05-22 18:57:34 +00:00
William Pitcock	7d9b33b3ce	update documentation for the new MRF features [no-ci]	2019-05-22 18:53:30 +00:00
Maksim	620908a2db	[#699] add worker to clean expired oauth tokens	2019-05-22 15:44:50 +00:00
lambda	714d8d4ef9	Merge branch 'feature/object-pruning' into 'develop' ... Object pruning See merge request pleroma/pleroma!1181	2019-05-22 11:04:30 +00:00
lain	b22145cbc4	Documentation: Specify PEM format for SSH keys. ... Otherwise openssh-client 7.9 will generate a different format that can't be used by esshd.	2019-05-22 10:44:26 +02:00
kaniini	79c2cef2fb	Merge branch 'mongooseim-support' into 'develop' ... MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172	2019-05-22 04:06:54 +00:00
William Pitcock	16b260fb19	add mix task to prune the object database using a configured retention period	2019-05-21 21:38:56 +00:00
lain	d378b342ba	MongooseIM: Add documentation.	2019-05-21 18:57:36 +02:00
rinpatch	76a7429bef	Add poll limits to /api/v1/instance and initial state	2019-05-21 09:13:10 +03:00
kaniini	943d1b2f26	Merge branch 'feature/user-configurable-mascot' into 'develop' ... Feature: user configurable mascot See merge request pleroma/pleroma!1177	2019-05-20 18:17:42 +00:00
Aaron Tinio	5aa107d912	Document MRF.Simple :report_removal	2019-05-21 00:59:12 +08:00
Sadposter	daeae8e2e7	Move default mascot configuration to config/	2019-05-20 16:12:55 +01:00
Sadposter	54e9cb5c2d	Add API endpoints for a custom user mascot	2019-05-20 12:39:23 +01:00
Egor Kislitsyn	557f0e33a7	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-17 19:57:14 +07:00
lain	412a3d8a0f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index	2019-05-17 12:26:59 +02:00
kaniini	bf84d50c76	Merge branch 'feature/890-add-report-uri' into 'develop' ... Feature/890 add report uri Closes #890 See merge request pleroma/pleroma!1164	2019-05-16 20:11:12 +00:00
Sergey Suprunenko	e2b3a27204	Add Reports to Admin API	2019-05-16 19:09:18 +00:00
Egor Kislitsyn	fc7246d715	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-16 17:54:24 +07:00
Alex S	8355d0607e	trailing spaces	2019-05-16 17:03:12 +07:00
Alex S	9d14214eb9	Merge branch 'develop' into feature/890-add-report-uri	2019-05-16 12:54:06 +07:00
Alex S	aa11fa4864	add report uri and report to	2019-05-16 12:49:40 +07:00
kaniini	a2771869a3	Merge branch 'docs/update_debian_instructions' into 'develop' ... Added package to dependency list documentation See merge request pleroma/pleroma!1161	2019-05-16 05:03:37 +00:00
Angelina Filippova	107c83ab2b	Note that nicknames is an array	2019-05-16 01:48:53 +03:00
Angelina Filippova	0641e685c1	Note that nicknames is an array	2019-05-16 01:46:43 +03:00
Angelina Filippova	1d2923e5d0	Update tag/untag docs	2019-05-16 01:36:26 +03:00
PolymerWitch	0ae15c2306	Added package to dependency list ... Added the erlang-ssh package to the dependency list and the installation command instructions. The project wouldn't build otherwise.	2019-05-15 15:36:20 -07:00
lain	f1e67bdc31	Search: Add optional rum indexing / searching.	2019-05-15 15:28:01 +02:00
Egor Kislitsyn	a7a8f3bc2c	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-15 14:31:24 +07:00
Egor Kislitsyn	fc9b4410c4	Add documentation	2019-05-14 20:27:40 +07:00
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-14 18:15:56 +07:00
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	2019-05-13 18:35:45 +00:00
Sachin Joshi	f01f995816	make url uniform in admin api	2019-05-11 14:46:00 +05:45
Roman Chvanikov	f1f7a11222	Merge develop	2019-05-11 14:45:54 +07:00
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	2019-05-08 14:34:36 +00:00
Roman Chvanikov	b6b5b16ba4	Merge develop	2019-05-08 17:08:06 +07:00
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-07 16:51:11 +07:00
Alex S	f46295faa7	unused config paramater	2019-05-07 09:07:06 +07:00
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	2019-05-06 17:51:03 +00:00
lambda	aacac9da0b	Merge branch 'feature/bbs' into 'develop' ... BBS / SSH See merge request pleroma/pleroma!997	2019-05-06 17:17:03 +00:00
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	2019-05-06 16:45:22 +00:00
lain	6ad8ddfd29	Merge remote-tracking branch 'origin/develop' into feature/bbs	2019-05-04 15:00:45 +02:00
xse	2982061dfa	Fix syntax highlighting + clarify :frontend_configuration	2019-05-01 01:26:14 +02:00
Roman Chvanikov	0f0cc2703b	Merge develop	2019-04-30 20:17:52 +07:00
rinpatch	ce3789e39a	Add default_scope to /api/v1/update_credentials	2019-04-27 23:55:54 +03:00
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	2019-04-26 02:41:35 +00:00
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	2019-04-25 18:11:47 -05:00
rinpatch	dfc8425659	Move settings to Source subentity	2019-04-25 10:31:14 +03:00
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	2019-04-25 13:41:10 +07:00
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	2019-04-24 20:01:42 +03:00
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	2019-04-23 02:47:43 +00:00
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	2019-04-23 02:43:53 +00:00
kaniini	7dcac0bac0	Merge branch 'develop' into 'develop' ... Add shortcode_globs setting to documentation See merge request pleroma/pleroma!1087	2019-04-23 02:41:21 +00:00
ilja	74ef14b04e	Add :emoji settings to config.md	2019-04-22 19:42:02 +02:00
Alex S	d35246c449	added healthcheck setting to instance config	2019-04-22 17:00:06 +07:00
ilja	c876b04aeb	Add shortcode_globs setting to documentation	2019-04-22 11:17:53 +02:00
rinpatch	f60d072bbb	Add pleroma.in_reply_to_account_acct to MastoAPI status entity	2019-04-22 11:54:27 +03:00
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	2019-04-22 07:19:53 +00:00
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-22 13:08:30 +07:00
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	2019-04-22 02:07:19 +00:00
Roman Chvanikov	b87ad13803	Move comments for email_notifications config to docs	2019-04-21 19:36:31 +07:00
Haelwenn (lanodan) Monnier	d086319733	differences_in_mastoapi_responses.md: content_type parameter of post submission	2019-04-21 12:48:40 +02:00
Ekaterina Vaartis	8f93d4c423	Remove most finmoji mentions where appropriate	2019-04-20 15:42:14 +03:00
Ekaterina Vaartis	31cff7dbca	Document the pleroma.emoji task	2019-04-20 15:06:07 +03:00
witches.live	8166cefa21	Include explicit warning for emerge config line as it will vary more widely based on current version of postgres	2019-04-20 07:11:06 +00:00
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	2019-04-19 07:50:21 +00:00
Mark Felder	1aa4994f6d	Do not require authentication for user search in MastoAPI	2019-04-18 12:44:25 -05:00
kaniini	73df3046e0	Merge branch 'feature/788-separate-email-addresses' into 'develop' ... Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040	2019-04-16 18:44:07 +00:00
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`.	2019-04-16 22:20:56 +08:00
lain	088f378408	Custom Emoji docs: Make it clear that config.exs is not for lewd.	2019-04-15 15:51:17 +02:00
Egor Kislitsyn	38926a063a	add /api/pleroma/disable_account to docs/api/pleroma_api.md	2019-04-15 16:39:42 +07:00
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	2019-04-13 22:41:54 +02:00
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	2019-04-13 12:24:38 +07:00
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	2019-04-12 10:41:09 +00:00
Alex S	fe511a6c65	Merge branch 'develop' into feature/788-separate-email-addresses	2019-04-10 18:06:54 +07:00
Alex S	fe13a1d78c	adding notify_email setting for trigger emails	2019-04-10 17:57:41 +07:00
lambda	e5d553aa45	Merge branch 'feature/767-multiple-use-invite-token' into 'develop' ... Feature/767 multiple use invite token See merge request pleroma/pleroma!1032	2019-04-10 10:10:08 +00:00
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
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	2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier	1791ee8ec4	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
kaniini	97395e013e	Merge branch 'notification-pleroma-settings' into 'develop' ... Notification controls Closes #738 See merge request pleroma/pleroma!988	2019-04-10 02:10:31 +00:00
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	2019-04-09 23:20:31 +03:00
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	2019-04-08 16:01:28 +07:00
Alex S	b810aac117	added docs to docs/api/admin_api.md ... code style and little renamings	2019-04-07 19:48:52 +07:00
Sadposter	e6778003ab	JSON need quotes!	2019-04-06 16:24:21 +01:00
Sadposter	c05fe4da0a	Document subscription endpoints, fix typos ... Also adds a quick error case on the subscription endpoints to avoid 500s	2019-04-06 16:20:06 +01:00
Mark Felder	da64a5aece	Document the admin API endpoints for controlling follow/unfollow	2019-04-05 11:29:34 -05:00
feld	3b12eeda19	Add ability to ship logs to a Slack channel	2019-04-04 19:52:22 +00:00
rinpatch	79cb34a4b0	Fix preview not being usable in form data	2019-04-02 23:07:16 +03:00
lambda	a79ce94dd4	Merge branch 'feature/fake-statuses' into 'develop' ... Add fake status submit See merge request pleroma/pleroma!995	2019-04-02 14:17:43 +00:00
rinpatch	fdb4357e9b	Rename fake param to preview and make the tests check that the object was not inserted to the db	2019-04-02 14:31:18 +03:00
rinpatch	e2b94d8f33	Make only important note bold rather than the whole paragraph because it looks better that way	2019-04-01 19:24:50 +03:00
rinpatch	a309b49c2d	Remove outdated howto change config and port and move it to config.md instead	2019-04-01 19:19:06 +03:00
rinpatch	949cfde065	restart makes no sense here as we instructed to stop the service before	2019-04-01 16:26:46 +03:00
rinpatch	bff8cde0cf	Instruct to stop the service only after git pulling and getting deps to minimize downtimes	2019-04-01 16:23:32 +03:00
rinpatch	7c69c6f624	change bold text to be proper geadings in introduction.md	2019-04-01 16:22:12 +03:00
rinpatch	b46e6f0949	Fix backup/restore page to have proper headings	2019-04-01 16:10:47 +03:00
lain	3fc4ea45df	BBS: Add documentation.	2019-03-31 18:14:51 +02:00
rinpatch	42b779527c	document fake option	2019-03-29 22:15:20 +03:00
rinpatch	afbc905a1c	qs	2019-03-29 16:38:18 +03:00
rinpatch	11584488d1	Improve PleromaJobQeue config documentation	2019-03-29 16:11:22 +03:00
Egor	9a39d1d846	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00
lambda	749d53e2b2	Merge branch 'sayonara-gitlab-wiki' into 'develop' ... Move out of Gitlab Wiki See merge request pleroma/pleroma!990	2019-03-29 10:24:52 +00:00
rinpatch	634e09e1a8	Remove duplicated header from i2p.md	2019-03-28 20:29:46 +03:00
rinpatch	9bd80e6044	did it really take me 4 commits to fix this?	2019-03-28 20:27:01 +03:00
rinpatch	d16e2a2e04	Remove duplicated header from admin_api.md	2019-03-28 20:16:59 +03:00
rinpatch	e4601b2c1d	remove admin tasks as they have their page in mix tasks category already	2019-03-28 20:16:14 +03:00
rinpatch	d0026761b7	cringe	2019-03-28 20:13:22 +03:00
rinpatch	dfae0050af	Move out of Gitlab Wiki ... I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just * Gets everything from gitlab wiki * Removes some specific gitlab hacks * Formats all documentation file names to be in snake case so they look the same way as our code does	2019-03-28 19:46:30 +03:00
eugenijm	cd90695a34	Add PUT /api/pleroma/notification_settings endpoint	2019-03-28 18:55:16 +03:00
eugenijm	10c81fc902	Add user show endpoint for Pleroma admin API	2019-03-27 21:44:15 +03:00
Maxim Filippov	3cf7539bca	Add more user filters + move search to its own module	2019-03-27 03:51:59 +05:00
kaniini	1c3d3d0c2b	Merge branch 'safe-mentions' into 'develop' ... Add safe dm mode option. See merge request pleroma/pleroma!958	2019-03-22 00:50:24 +00:00
William Pitcock	ae8fa5d0aa	docs: document conversation_id extension	2019-03-21 23:27:42 +00:00
Quentin Rameau	80bc9ed2ba	Add a gopher url port config option ... This lets the user advertise a different port in the gopher urls, for example listening locally on port 7070 but telling clients to connect to the regular port 70.	2019-03-21 19:59:43 +03:00
lain	8468f3f6d4	Add safe dm mode option.	2019-03-20 21:09:36 +01:00
Mark Felder	325c106cb5	Document additional pleroma changes to /api/v1/accounts/:id	2019-03-18 19:48:56 +00:00
eugenijm	9971bf5be1	Added documentation for Pleroma-specific is_seen in Mastodon API	2019-03-18 10:40:10 +03:00
eugenijm	43fb03be5a	Allow to mark a single notification as read	2019-03-15 23:56:14 +03:00
kaniini	8b352af4dd	Merge branch 'feature/openldap-support' into 'develop' ... OpenLDAP support Closes #203 See merge request pleroma/pleroma!859	2019-03-15 19:57:09 +00:00
Haelwenn (lanodan) Monnier	f5b54acc81	Fix headers and add !929 docs to extras ... [ci skip]	2019-03-15 10:58:15 +01:00
Haelwenn	41fc67aa49	Merge branch 'mastoapi/mime_type' into 'develop' ... Extend MastoAPI to provide attachment mimetypes See merge request pleroma/pleroma!938	2019-03-15 09:48:50 +00:00
rinpatch	d7a34b604b	Extend MastoAPI to provide attachment mimetypes	2019-03-15 11:58:12 +03:00
kaniini	c708656b5e	Merge branch 'robotstxt' into 'develop' ... Add robots.txt Closes #723 See merge request pleroma/pleroma!929	2019-03-15 02:50:27 +00:00
William Pearson	3dadaa4432	robots.txt ... Add default robots.txt that allows bots access to all paths. Add mix task to generate robots.txt taht allows bots access to no paths. Document custom emojis, MRF and static_dir static_dir documentation includes docs for the robots.txt Mix task.	2019-03-15 02:28:18 +00:00
rinpatch	cbdd11c381	Merge develop to bump elixir version in the CI so I don't get failing formatting	2019-03-14 22:33:20 +03:00
rinpatch	e2fe796c63	Add some tests	2019-03-14 22:02:48 +03:00
link0ff	54e7087ab4	Merge remote-tracking branch 'upstream/develop' into feature/openldap-support	2019-03-14 17:43:30 +02:00
link0ff	9338f061a3	Support LDAP method start_tls	2019-03-12 18:20:02 +02:00
lain	3474066f6d	MastoAPI Accounts: Add fetching by nickname. ... This is to make it easier for the frontends to handle domain.com/users/nickname urls.	2019-03-11 15:18:32 +01:00
lambda	2c8deecdd2	Merge branch 'add-local-field-to-status' into 'develop' ... MastoAPI StatusView: Add locality indicator. See merge request pleroma/pleroma!920	2019-03-11 13:26:12 +00:00
lambda	66774b5567	Update Differences-in-MastodonAPI-Responses.md	2019-03-11 13:21:03 +00:00
lain	4811eefa6e	MastoAPI StatusView: Add locality indicator.	2019-03-11 13:48:27 +01:00