1180 Commits

Author	SHA1	Message	Date
lain	a61120f497	Documention: Add chat message deletion docs	2020-05-12 13:25:25 +02:00
lain	8cc8d960af	Documentation: Add GET /chats/:id	2020-05-10 13:27:40 +02:00
lain	17be3ff669	Documentation: Add last_message to chat docs.	2020-05-10 13:01:20 +02:00
lain	e297d8c649	Documentation: Add attachment docs	2020-05-10 12:34:12 +02:00
Roman Chvanikov	4c19702390	Add docs	2020-05-09 14:32:08 +03:00
lain	7637ef4203	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-08 13:13:37 +02:00
Maksim Pechnikov	b078e0567d	Merge branch 'develop' into issue/1276-2	2020-05-08 08:51:09 +03:00
lain	fb2d284d28	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-07 15:05:40 +02:00
Maksim	3d0c567fbc	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
lain	1748e26948	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-06 17:36:08 +02:00
Mark Felder	d7537a37c7	Add :chat to cheatsheet	2020-05-06 08:55:09 -05:00
Maksim Pechnikov	bd261309cc	added unread_notifications_count for /api/v1/accounts/verify_credentials	2020-05-06 15:08:38 +03:00
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