1142 commits

Author	SHA1	Message	Date
Roman Chvanikov	4987ee6256	Merge branch 'develop' into feature/expire-mutes	2020-09-20 19:27:27 +03:00
feld	6c052bd5b6	Merge branch 'media-preview-proxy-nostream' into 'develop' ... Media preview proxy See merge request pleroma/pleroma!3001	2020-09-18 18:38:20 +00:00
lain	7e02f4ed3b	Merge branch 'feature/2118-web-push-encryption-http' into 'develop' ... Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Closes #2118 See merge request pleroma/pleroma!3008	2020-09-18 12:25:10 +00:00
Steven Fuchs	f2ef9735c5	Federate data through persistent websocket connections	2020-09-18 11:58:22 +00:00
Sergey Suprunenko	226fa3e486	Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter	2020-09-17 22:10:55 +02:00
Ivan Tashkinov	7cdbd91d83	[#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.	2020-09-17 17:13:40 +03:00
Roman Chvanikov	44e8b6037a	Merge branch 'develop' into feature/expire-mutes	2020-09-17 14:54:00 +03:00
Ivan Tashkinov	2f155fb89f	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	2020-09-15 20:29:39 +03:00
rinpatch	0b5e72ecf0	Remove :managed_config option. ... In practice, it was already removed half a year ago, but the description and cheatsheet entries were still there. The migration intentionally does not use ConfigDB.get_by_params, since this will break migration code as soon as we add a new field is added to ConfigDB. Closes #2086	2020-09-14 18:04:16 +03:00
Roman Chvanikov	c5830ac037	Merge develop	2020-09-13 12:24:57 +03:00
Ivan Tashkinov	0bda85857e	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ... # Conflicts: # lib/pleroma/instances/instance.ex	2020-09-11 17:19:58 +03:00
Mark Felder	55562ca936	Merge branch 'develop' into feature/gen-magic	2020-09-10 16:05:22 -05:00
Alexander Strizhakov	2c2094d4b2	configurable lifetime for ephemeral activities	2020-09-10 21:51:59 +03:00
Alexander Strizhakov	629a8de9cb	deprecation warning ... changed namespace for activity expiration configuration	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	9bf1065a06	schedule activity expiration in Oban	2020-09-10 21:50:40 +03:00
Alexander Strizhakov	7dd986a563	expire mfa tokens through Oban	2020-09-10 16:01:19 +03:00
Alexander Strizhakov	3ce658b930	schedule expired oauth tokens deletion with Oban	2020-09-10 16:01:19 +03:00
Mark Felder	4ee99dafcc	Merge branch 'develop' into media-preview-proxy	2020-09-09 11:11:36 -05:00
Mark Felder	14d07081fd	Feed provider only generates a redirect, so always activate it. ... Making this configurable is misleading.	2020-09-08 20:21:34 +03:00
Mark Felder	630444ee08	Do not make RelMe metadata provider optional. ... There's really no sound reason to turn this off anyway.	2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier	788dececff	test: remove extraneous :instances_favicons config bits	2020-09-08 16:32:54 +02:00
Roman Chvanikov	880a92ccc7	Merge branch 'develop' into feature/expire-mutes	2020-09-08 15:16:43 +03:00
Roman Chvanikov	c56e3d4f3b	Add expires_in param for account mutes	2020-09-08 13:26:44 +03:00
Alexander Strizhakov	696bf09433	passing adapter options directly without adapter key	2020-09-07 19:59:17 +03:00
Alexander Strizhakov	a83916fdac	adapter options unification ... not needed options deletion	2020-09-07 19:59:17 +03:00
Alexander Strizhakov	ee67c98e55	removing Stats worker from Oban cron jobs	2020-09-07 19:16:14 +03:00
Ivan Tashkinov	f170d47130	[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs. ... Removed :preview pool in favor of existing :media one. Misc. refactoring.	2020-09-05 20:19:09 +03:00
Mark Felder	b529616e11	Increase pool and timeout for preview so it catches slow media pool responses	2020-09-03 15:08:12 -05:00
Mark Felder	6141eb94ab	Fetch preview requests through the MediaProxy. Separate connection options are not needed. ... Use a separate pool for preview requests	2020-09-03 14:42:11 -05:00
Mark Felder	85446cc30c	Merge branch 'develop' into media-preview-proxy	2020-09-03 10:34:06 -05:00
rinpatch	19691389b9	Rich media: Add failure tracking	2020-09-02 14:59:52 +03:00
Alexander Strizhakov	c17d83cd73	improvements and fixes for http requests ... - fix for gun worker termination in some circumstances - pool for http clients (ex_aws, tzdata) - default pool timeouts for gun - gun retries on gun_down messages - s3 upload timeout if streaming enabled	2020-09-02 09:04:23 +03:00
Mark Felder	899ea2da3e	Switch to imagemagick, only support videos	2020-08-25 17:18:22 -05:00
Mark Felder	479578b148	Merge branch 'develop' into feld-2168-media-preview-proxy	2020-08-25 11:57:23 -05:00
lain	6d6e43fd09	Description: Update description.	2020-08-25 11:49:44 +02:00
lain	c1d51944c7	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	2020-08-25 11:44:51 +02:00
Angelina Filippova	6e5678b5af	Add Pleroma.Web.Preload to description.exs	2020-08-24 22:43:37 +03:00
Ivan Tashkinov	aa0a5ffb48	[#2497] Media preview proxy: added quality config setting, adjusted width/height defaults.	2020-08-21 08:59:08 +03:00
Ivan Tashkinov	4ee15e991e	[#2497] Media preview proxy config refactoring & documentation.	2020-08-19 21:36:26 +03:00
Haelwenn	3d5d8c05c9	Merge branch '2064-image-blanking' into 'develop' ... Resolve "Make default image description blank" Closes #2064 See merge request pleroma/pleroma!2899	2020-08-18 19:02:33 +00:00
Ivan Tashkinov	da116d81fb	[#2497] Added video preview proxy. Switched from exexec to Port.	2020-08-18 18:23:27 +03:00
Ivan Tashkinov	27e7999a15	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-08-18 18:02:09 +03:00
lain	83cef25794	Merge branch 'chore/improve-descriptions' into 'develop' ... Improve description for mediaproxy cache invalidation settings See merge request pleroma/pleroma!2891	2020-08-18 12:56:07 +00:00
lain	52a79506c7	Test config: Default to filename for descriptions	2020-08-18 14:37:35 +02:00
lain	aabc26a573	Pleroma.Upload: Set default upload name / description based on config.	2020-08-18 13:21:30 +02:00
Mark Felder	6c3130ef47	Improve description for mediaproxy cache invalidation settings	2020-08-14 13:07:58 -05:00
Ivan Tashkinov	95529ab709	[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).	2020-08-14 20:55:45 +03:00
feld	dfc56de167	Merge branch 'feature/update-welcome-setting-in-description' into 'develop' ... Update :welcome settings in description.exs Closes #2024 See merge request pleroma/pleroma!2843	2020-08-12 16:18:40 +00:00
Ivan Tashkinov	2def3cbf41	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # mix.lock	2020-08-11 15:13:29 +03:00
lain	d0fc48ea67	Merge branch 'develop' into 'feat/floki-fast-html-2' ... # Conflicts: # config/config.exs	2020-08-09 10:53:58 +00:00
Mark Felder	54e2af8293	Merge branch 'develop' into fix/ldap-auth-issues	2020-08-07 14:55:22 -05:00
Angelina Filippova	f21b6ebd5d	Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description	2020-08-07 21:05:44 +03:00
Angelina Filippova	8e1f7a3eff	Add new image type to settings whose values are image urls	2020-08-07 21:04:13 +03:00
rinpatch	325c7c924b	Make Floki use fast_html	2020-08-07 16:45:33 +03:00
lain	3f88366e2a	Apply 1 suggestion(s) to 1 file(s)	2020-08-07 11:07:02 +00:00
Maksim Pechnikov	8e90cc58e7	Merge branch 'develop' into feature/update-welcome-setting-in-description	2020-08-07 09:48:34 +03:00
Maksim Pechnikov	6e6276b4f8	added test	2020-08-07 09:47:05 +03:00
Ivan Tashkinov	1298a2ea2c	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock	2020-08-07 09:38:05 +03:00
Alex Gleason	e639eee82e	restricted_nicknames: Add names from MastoAPI endpoints	2020-08-06 18:01:29 -05:00
lain	03da653a12	Description: Refactor.	2020-08-06 16:41:56 +02:00
lain	bf95dfb240	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	2020-08-06 15:22:20 +02:00
Mark Felder	d5e4d8a6f3	Define default authenticator in the config	2020-08-05 09:41:17 -05:00
lain	532d6f94ae	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	2020-08-04 15:10:36 +02:00
Angelina Filippova	8bb5441547	Update descriptions in :frontends group	2020-08-04 15:10:44 +03:00
lain	988ca4ab6a	Test Config: Don't have any MRFs by default	2020-08-04 14:07:10 +02:00
lain	28584bb224	Merge branch 'email-blacklist' into 'develop' ... Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837	2020-08-04 11:00:30 +00:00
Angelina Filippova	63b1ca6a07	Add label to :restrict_unauthenticated setting, fix typos	2020-08-04 02:21:25 +03:00
Angelina Filippova	ae95472dcc	Update :welcome settings description	2020-08-04 02:04:29 +03:00
Angelina Filippova	1489c2ae5f	Fix :args settings description in Upload.Filter.Mogrify group	2020-08-04 01:45:18 +03:00
lain	e3953923ac	Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop' ... fixes 1957 Add option to send user chatmessage instead of dm Closes #1957 See merge request pleroma/pleroma!2782	2020-08-03 21:01:56 +00:00
Ilja	13e5540c2c	Apply 1 suggestion(s) to 1 file(s)	2020-08-03 16:44:56 +00:00
lain	187d9bda0f	Description: Add new fields for frontend configuration.	2020-08-03 16:39:01 +02:00
lain	56b5b9aa27	Merge branch 'follower-mrf-again' into 'develop' ... Follower mrf again See merge request pleroma/pleroma!2833	2020-08-03 14:22:11 +00:00
lain	66ebd88634	Merge branch 'config/default_ok_oldage' into 'develop' ... config: :mrf, :policies default to ObjectAgePolicy Closes #2000 See merge request pleroma/pleroma!2814	2020-08-03 12:50:29 +00:00
Alex Gleason	dc88b6f091	Add email blacklist, fixes #1404	2020-08-02 14:53:42 -05:00
Alex Gleason	e9cff69bce	Add TagPolicy as default MRF, #2010	2020-08-02 12:24:40 -05:00
Ilja	f671d7e68c	Add welcome chatmessages ... * I added the option in config/config.exs * created a new module lib/pleroma/user/welcome_chat_message.ex * Added it to the registration flow * added to the cheatsheet * added to the config/description.ex * added to the Changelog.md	2020-08-02 15:54:59 +02:00
Alex Gleason	cb1e3893aa	SimpleMRF: Add missing :followers_only to config.exs	2020-08-01 16:08:29 -05:00
lain	4b18a07392	Revert "Merge branch 'revert-1ac0969c' into 'develop'" ... This reverts merge request !2825	2020-07-31 15:18:04 +00:00
lain	010d77ec85	Revert "Merge branch 'mrf-silence-2' into 'develop'" ... This reverts merge request !2820	2020-07-31 15:17:09 +00:00
lain	1ac0969c72	Merge branch 'mrf-silence-2' into 'develop' ... MRF silencing alternative solution See merge request pleroma/pleroma!2820	2020-07-31 14:43:33 +00:00
Haelwenn (lanodan) Monnier	0309514656	Default MRF to ObjectAgePolicy, 7 days threshold	2020-07-31 12:13:08 +02:00
lain	7bcd2e948e	Config: Default to Hackney again ... Gun is still acting up.	2020-07-31 10:50:45 +02:00
lain	99bfdffb1d	Config: Add kenoma as available frontend.	2020-07-30 14:17:58 +02:00
lain	4ce4d799fd	Config: Add frontend information.	2020-07-30 14:14:58 +02:00
Alex Gleason	702f0fb822	Merge remote-tracking branch 'upstream/develop' into mrf-silence	2020-07-29 13:01:16 -05:00
Alex Gleason	93638935d7	SimpleMRF: :silence --> :followers_only	2020-07-29 12:58:08 -05:00
Alex Gleason	d8a01c9432	Merge remote-tracking branch 'upstream/develop' into hide-reactions	2020-07-29 12:43:39 -05:00
lain	d249f91b3f	Descriptions: Update with admin frontend info	2020-07-29 16:27:11 +02:00
lain	dc36d6e9d2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin	2020-07-29 16:24:22 +02:00
lain	79f9ddd8b7	Merge branch 'by-approval' into 'develop' ... Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757	2020-07-29 11:27:26 +00:00
lain	e2f82968e8	Config: Update frontend config example	2020-07-29 13:04:29 +02:00
Alex Gleason	3c90f7f715	SimpleMRF: Let instances be silenced	2020-07-28 19:06:42 -05:00
Alex Gleason	3b7c454418	Let favourites and emoji reactions optionally be hidden	2020-07-28 14:58:30 -05:00
Mark Felder	bee29f6610	Clarify location of frontends directory	2020-07-28 12:10:04 -05:00
lain	08732e8a03	Docs: Add frontend info to cheat sheet.	2020-07-28 17:46:37 +02:00
Roman Chvanikov	d64c976390	Add description for configuration.	2020-07-28 17:40:21 +02:00
Alex Gleason	520dce857e	Add :registration_reason_length to description.exs	2020-07-27 15:24:20 -05:00
Alex Gleason	6f44a0ee84	Add configurable registration_reason limit	2020-07-27 15:13:34 -05:00
Alex Gleason	6747bf2e16	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-27 12:29:18 -05:00
lain	2a3abfd326	Merge branch 'issue/1934-welcome-email' into 'develop' ... [#1934] welcome email See merge request pleroma/pleroma!2786	2020-07-27 12:34:36 +00:00
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-26 15:46:14 -05:00
Angelina Filippova	4d80cf5409	Update types in Pleroma.Formatter group	2020-07-26 01:48:50 +03:00
Maksim Pechnikov	61ef1fca4b	remove duplicate module	2020-07-24 08:35:06 +03:00
Maksim Pechnikov	67ab9a7928	Merge branch 'develop' into issue/1934-welcome-email	2020-07-23 16:36:27 +03:00
Angelina Filippova	188b0dc72d	Add related_policy field	2020-07-22 18:15:30 +03:00
Maksim Pechnikov	5879d36854	fix sender for welcome email	2020-07-22 15:34:47 +03:00
Maksim Pechnikov	b620290dd9	update description	2020-07-22 09:20:00 +03:00
lain	5b1eeb06d8	Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" ... This reverts merge request !2784	2020-07-21 22:18:17 +00:00
lain	696c13ce54	Revert "Merge branch 'linkify' into 'develop'" ... This reverts merge request !2677	2020-07-21 22:17:34 +00:00
Maksim Pechnikov	3edaecae96	added welcome email	2020-07-21 09:25:53 +03:00
Ivan Tashkinov	bdf57b8ef4	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs	2020-07-19 20:05:37 +03:00
Alex Gleason	6fdaee7cae	description.exs typofixes	2020-07-16 14:52:48 -05:00
Alex Gleason	38425ebdbf	Merge remote-tracking branch 'upstream/develop' into linkify	2020-07-16 14:51:36 -05:00
Mark Felder	b2d398b1d0	Merge branch 'develop' into refactor/gun-pool-registry	2020-07-15 13:34:27 -05:00
rinpatch	c413649a8d	Bring back oban job pruning ... Closes #1945	2020-07-15 16:20:17 +03:00
rinpatch	33747e9366	config.exs: set gun retries to 0 ... The new pooling code just removes the connection when it's down, there is no need to reconnect a connection that is just sitting idle, better just open a new one next time it's needed	2020-07-15 15:26:35 +03:00
rinpatch	9df5918974	config.exs: make gun the default again	2020-07-15 15:26:35 +03:00
rinpatch	007843b75e	Add documentation for new connection pool settings and remove some ... `:retry_timeout` and `:retry` got removed because reconnecting on failure is something the new pool intentionally doesn't do. `:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because the settings are very different in their behaviour. `:checkin_timeout` got removed in favor of `:connection_acquisition_wait`, I didn't reuse the key because the settings are somewhat different. I didn't do any migrations/deprecation warnings/changelog entries because these settings were never in stable.	2020-07-15 15:26:35 +03:00
rinpatch	4128e3a84a	HTTP: Implement max request limits	2020-07-15 15:26:35 +03:00
rinpatch	58a4f350a8	Refactor gun pooling and simplify adapter option insertion ... This patch refactors gun pooling to use Elixir process registry and simplifies adapter option insertion. Having the pool use process registry instead of a GenServer has a number of advantages: - Simpler code: the initial implementation adds about half the lines of code it deletes - Concurrency: unlike a GenServer, ETS-based registry can handle multiple checkout/checkin requests at the same time - Precise and easy idle connection clousure: current proposal for closing idle connections in the GenServer-based pool needs to filter through all connections once a minute and compare their last active time with closing time. With Elixir process registry this can be done by just using `Process.send_after`/`Process.cancel_timer` in the worker process. - Lower memory footprint: In my tests `gun-memory-leak` branch uses about 290mb on peak load (250 connections) and 235mb on idle (5-10 connections). Registry-based pool uses 210mb on idle and 240mb on peak load	2020-07-15 15:17:27 +03:00
Alex Gleason	48983e9421	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-14 18:56:40 -05:00
feld	3f65f2ea79	Merge branch 'feature/1922-media-proxy-whitelist' into 'develop' ... Support for hosts with scheme in MediaProxy whitelist setting Closes #1922 See merge request pleroma/pleroma!2754	2020-07-14 18:07:44 +00:00
Mark Felder	ce314e6fe2	Clarify description and suggestion	2020-07-14 11:24:58 -05:00
Ivan Tashkinov	9b225db7d8	[#1940] Applied rate limit for requests with bad admin_token. Added doc warnings on admin_token setting.	2020-07-14 11:58:41 +03:00
feld	5d215fd81f	Merge branch 'config-behaviours-runtime' into 'develop' ... Config/Docs: Expand behaviour suggestions modules at runtime Closes #1941 See merge request pleroma/pleroma!2755	2020-07-13 15:45:25 +00:00
feld	db529d454e	Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop' ... Update types for :headers and :options settings in Pleroma.Web.MediaProxy.Invalidation.Http See merge request pleroma/pleroma!2735	2020-07-13 15:38:56 +00:00
Alex Gleason	51ab8d0128	Add account_approval_required instance setting	2020-07-12 20:27:58 -05:00
href	4347d2de5e	Config/Docs: Expand behaviour suggestions at runtime	2020-07-12 17:23:33 +02:00
Alexander Strizhakov	b376442325	MediaProxy whitelist setting now supports hosts with scheme ... added deprecation warning about using bare domains	2020-07-12 12:41:40 +03:00
Angelina Filippova	0eeeaa37e8	Update types in MRF Keyword group	2020-07-12 01:38:16 +03:00
Angelina Filippova	98c56ff477	Remove :regex from types	2020-07-11 04:32:44 +03:00
Angelina Filippova	02b2747d42	Update types for :params, :match_actor and :replace settings	2020-07-11 04:17:21 +03:00
feld	d6f67fa91b	Merge branch 'issue/1790-updated-oban' into 'develop' ... [#1790] updated oban to 2.0.0 See merge request pleroma/pleroma!2674	2020-07-10 17:39:46 +00:00
Mark Felder	3c0c1fd2ef	Merge branch 'develop' into issue/1790-updated-oban	2020-07-10 11:34:53 -05:00
Alexander Strizhakov	b1b8f5f11a	docs and descriptions for s3 settings	2020-07-10 09:16:53 +03:00
Angelina Filippova	ac9f18de11	Update type for :replace settings	2020-07-10 03:32:53 +03:00
Angelina Filippova	6b9210e886	Update type for :groups setting	2020-07-10 03:07:55 +03:00
lain	f4469dc741	Merge branch 'features/favicons' into 'develop' ... Add support for remote favicons See merge request pleroma/pleroma!2261	2020-07-09 13:09:31 +00:00
Angelina Filippova	33e6285636	Update types for :headers and :options settings in MediaProxy Invalidation group	2020-07-09 01:33:23 +03:00
lain	6335b32aa8	Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' ... [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731	2020-07-08 10:55:03 +00:00
Haelwenn (lanodan) Monnier	312fc55f14	Add [:instances_favicons, :enabled] setting, defaults to false	2020-07-08 06:28:40 +02:00
lain	8939ff39e4	Merge branch 'remove-twitter-api' into 'develop' ... Remove some TwitterAPI endpoints See merge request pleroma/pleroma!2327	2020-07-07 18:26:07 +00:00
Ivan Tashkinov	20461137a3	[#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.	2020-07-07 20:44:16 +03:00
DYM	a784c09db8	added hyper:// to default protocols	2020-07-07 09:05:54 +02:00
lain	65fd28e0c4	Config: Remove Statusnet preloader.	2020-07-06 12:25:25 +02:00
lain	af7720237b	Upload: Restrict description length	2020-07-06 11:08:13 +02:00
Mark Felder	4695bdd81b	Merge branch 'develop' into issue/1790-updated-oban	2020-07-03 10:36:41 -05:00
Mark Felder	80076f1974	Lint, long lines	2020-07-02 10:33:27 -05:00
Mark Felder	d169e51b7e	Improve descriptions, move primary MRF settings to top for AdminFE ordering	2020-07-02 10:27:15 -05:00
Mark Felder	6b5563ed2c	Merge branch 'develop' into feature/1885-MRF-metadata	2020-07-02 09:57:57 -05:00
Ivan Tashkinov	61180ab6f4	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex	2020-07-02 16:36:54 +03:00
lain	d884b6f704	Merge branch 'feature/update-description' into 'develop' ... Update settings descriptions and labels See merge request pleroma/pleroma!2709	2020-07-02 08:43:32 +00:00
Angelina Filippova	df2d6564d5	Add labels, update descriptions and labels	2020-07-01 03:01:15 +03:00
Alex Gleason	8daacc9114	AutoLinker --> Linkify, update to latest version ... https://git.pleroma.social/pleroma/elixir-libraries/linkify	2020-06-30 16:39:15 -05:00
lain	0313520cd2	Config: Reduce default preloaders to configuration endpoints. ... Fetching the timeline is a bit heavy to do by default.	2020-06-27 12:18:37 +02:00
Alexander Strizhakov	f89390110b	added tab & labels for mrf policies	2020-06-27 12:18:34 +03:00
Alexander Strizhakov	e7bc0273e5	additional data to MRF policies in descriptions	2020-06-26 15:22:08 +03:00
Alexander Strizhakov	91cd023720	Pleroma.Upload.Filter.Mogrify args description	2020-06-26 09:03:07 +03:00
feld	8288419686	Merge branch 'preload-data' into 'develop' ... Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381	2020-06-25 21:35:39 +00:00
lain	1d0804b49f	Merge branch 'chore/remove-reference-to-distsn' into 'develop' ... Remove reference to defunct distsn.org See merge request pleroma/pleroma!2675	2020-06-25 10:42:57 +00:00
lain	f585622f85	Apply suggestion to config/description.exs	2020-06-25 10:17:16 +00:00
Maksim Pechnikov	439a1a0218	added wrapper Pleroma.HTTP for ExAws.S3	2020-06-25 07:12:29 +03:00
Maksim Pechnikov	cc837f9d15	fixed config/descpiption.exs	2020-06-24 21:21:33 +03:00
Maksim Pechnikov	721fc7c554	added wrapper Pleroma.HTTP for Tzdata.HTTPClient	2020-06-24 09:12:32 +03:00
Haelwenn	c7d69e9256	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' ... Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320	2020-06-23 16:38:27 +00:00
Mark Felder	54039100fe	Remove reference to defunct distsn.org	2020-06-23 11:17:26 -05:00
Maksim Pechnikov	a8d967762e	migrate to oban 2.0-rc1	2020-06-23 15:09:01 +03:00
Mark Felder	bf8310f380	Add missing default config value for :instance, instance_thumbnail ... Follows up on b7fc61e17b	2020-06-22 17:35:02 -05:00
Mark Felder	3462d4b995	Merge branch 'develop' into issue/1855	2020-06-17 12:50:06 -05:00
Alexander Strizhakov	ed189568f3	moving mrf settings from instance to separate group	2020-06-16 18:32:18 +03:00
href	f124f68205	Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME	2020-06-16 15:27:27 +02:00
href	ec1452fd1c	Pleroma.MIME: use gen_magic	2020-06-16 15:15:50 +02:00
Maksim Pechnikov	579763126f	Merge branch 'develop' into issue/1855	2020-06-15 15:24:55 +03:00
Egor Kislitsyn	58e4e3db8b	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	2020-06-15 16:03:40 +04:00
Maksim Pechnikov	2e8a236cef	fix invalidates media url's	2020-06-14 21:02:57 +03:00
href	cb7be6eef2	Remove use of atoms in MRF.UserAllowListPolicy	2020-06-13 12:08:46 +03:00
Mark Felder	26f710b9e3	Merge branch 'develop' into preload-data	2020-06-12 16:52:52 -05:00
Egor Kislitsyn	697cf92024	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	2020-06-12 18:25:29 +04:00
lain	4655407451	Apply suggestion to config/description.exs	2020-06-12 14:03:33 +00:00
Egor Kislitsyn	1f35acce54	Merge OGP parser with TwitterCard	2020-06-11 17:57:31 +04:00
Egor Kislitsyn	da22119c2f	Merge branch 'develop' into global-status-expiration	2020-06-08 17:21:47 +04:00
stwf	75e886b506	fix config	2020-06-03 17:32:03 -04:00
stwf	906ac57ba8	Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data ... # Conflicts: # lib/pleroma/web/preload/status_net.ex	2020-06-03 17:25:53 -04:00
stwf	5677b21e82	clean up	2020-06-03 17:24:35 -04:00
stwf	3b8180d7d1	add status_net/config	2020-06-03 16:34:03 -04:00
stwf	29ae5bb771	preload data into index.html	2020-06-03 16:34:03 -04:00
stwf	aa26dc6a13	add status_net/config	2020-06-03 13:40:48 -04:00
lain	6977500ef7	Merge branch 'tagline' into 'develop' ... Update default instance description See merge request pleroma/pleroma!2600	2020-06-02 14:10:53 +00:00
Egor Kislitsyn	a7627bdc7a	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-06-01 15:48:51 +04:00
lain	ac31f687c0	Config: Default to Hackney again ... Gun needs some server setting changes (files) and has problems with OTP 23 (wildcards), so use Hackney as a default again for now.	2020-06-01 13:35:39 +02:00
stwf	d67b302810	preload data into index.html	2020-05-29 14:15:24 -04:00
Alex Gleason	d4a18d44fe	Update default instance description	2020-05-28 11:56:30 -05:00
lain	337ca33e5e	Config: Restore old new background image ... Became lost in a settings restructure	2020-05-26 16:00:56 +02:00
Roman Chvanikov	8eb1dfadca	Update CHANGELOG and docs	2020-05-22 18:30:13 +03:00
Roman Chvanikov	cc82229ba7	Add filename_display_max_length config	2020-05-22 18:19:25 +03:00
Ivan Tashkinov	3a1e810aaa	[#2497] Customized exexec launch to support root operation (currently required by Gitlab CI).	2020-05-21 21:47:32 +03:00
eugenijm	b7fc61e17b	Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE	2020-05-21 04:41:42 +03:00
Haelwenn	42b06d78df	Merge branch 'chore/update-config-fe' into 'develop' ... Synchronize :fe settings in config.exs See merge request pleroma/pleroma!2560	2020-05-20 17:45:19 +00:00
Ivan Tashkinov	6fd4f58ead	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-05-20 20:27:03 +03:00
Ivan Tashkinov	1871a5ddb4	[#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.	2020-05-20 20:26:43 +03:00
Mark Felder	4c48626585	Also add new sidebarRight setting	2020-05-20 12:22:31 -05:00
Haelwenn	94ba5a7802	Merge branch 'exposed-background-image' into 'develop' ... InstanceView: Expose background image link. See merge request pleroma/pleroma!2545	2020-05-20 10:53:54 +00:00
lain	6dd1575c64	Merge branch 'issue/1509' into 'develop' ... [#1509] purge media from cache after delete See merge request pleroma/pleroma!2539	2020-05-20 10:35:36 +00:00
Mark Felder	918ee46417	Synchronize :fe settings in config.exs	2020-05-19 16:05:39 -05:00
lain	188b32145e	InstanceView: Expose background image link. ... This will make it easier for more clients to support this feature.	2020-05-18 13:29:30 +02:00
Maksim Pechnikov	c33a4315fb	updated docs	2020-05-18 06:48:19 +03:00
lain	64b3d81e50	Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop' ... Remove settings that shouldn't be altered Closes admin-fe#110 See merge request pleroma/pleroma!2540	2020-05-17 07:48:52 +00:00
lain	4b28d812cf	Merge branch 'restricted-relations-embedding' into 'develop' ... Restricted support for embedded relationships See merge request pleroma/pleroma!2456	2020-05-17 07:26:51 +00:00
Maksim Pechnikov	3f8d68bdf3	added example cache purge script	2020-05-17 05:56:20 +03:00
Angelina Filippova	4a925b964a	Remove description of the settings that should't be altered	2020-05-16 20:39:42 +03:00
Ivan Tashkinov	978ccf8f97	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-05-16 16:14:50 +03:00
Maksim Pechnikov	cb40602a16	added media proxy invalidation	2020-05-15 21:39:42 +03:00
Ivan Tashkinov	e4b12494d7	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock	2020-05-14 20:19:56 +03:00
Ivan Tashkinov	f1f588fd52	[#2497] Added support for :eimp for image resizing.	2020-05-14 20:18:31 +03:00
Mark Felder	54b4824186	Lint	2020-05-13 17:07:14 -05:00
Mark Felder	6f53d8815e	Clarify where the Features panel is	2020-05-13 16:57:33 -05:00
Mark Felder	2560a4aa56	Formatting	2020-05-13 16:51:23 -05:00
Mark Felder	0c82a967ec	Add missing showFeaturesPanel setting	2020-05-13 16:49:56 -05:00
Mark Felder	5131149056	add postContentType setting	2020-05-13 16:45:16 -05:00
Mark Felder	52a95a0265	Add missing nsfwCensorImage option	2020-05-13 16:40:04 -05:00
Mark Felder	923ab78807	Add missing hideSitename setting	2020-05-13 16:36:33 -05:00
Mark Felder	c86cdb76a7	Add hideFilteredStatuses and hideMutedPosts settings	2020-05-13 16:35:12 -05:00
Mark Felder	7f00698c3b	Add greentext option	2020-05-13 16:32:38 -05:00
Mark Felder	38fb5eaf6a	formattingOptionsEnabled no longer exists	2020-05-13 16:31:15 -05:00
Mark Felder	4bdde143f9	Add disableChat option	2020-05-13 16:30:24 -05:00
Mark Felder	2420d7f439	Spelling/grammar	2020-05-13 16:26:49 -05:00
Mark Felder	4aad764c1d	enableEmojiPicker is not a setting	2020-05-13 16:24:37 -05:00
Mark Felder	2e28b50132	scopeOptionsEnabled has been replaced with minimalScopesMode	2020-05-13 16:23:42 -05:00
Mark Felder	e2c80e62f1	Stickers setting does not exist	2020-05-13 16:19:17 -05:00
Mark Felder	1e48aee50e	Alpha sort FE config descriptions	2020-05-13 16:18:26 -05:00
Mark Felder	1b93581162	Synchronize suggestions with all available static/config.json settings	2020-05-13 16:03:42 -05:00
Ivan Tashkinov	fd2fb2bb2e	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs	2020-05-13 12:42:36 +03:00
Ivan Tashkinov	1b23acf164	[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.	2020-05-11 23:21:53 +03:00
Alexander Strizhakov	da6a38d205	copy/paste fix for descriptions	2020-05-11 09:35:20 +03:00
lain	7ca83e71a9	Merge branch 'shortening-modules-name' into 'develop' ... Descriptions that module names are shortened See merge request pleroma/pleroma!2428	2020-05-10 09:05:22 +00:00
Ivan Tashkinov	b0d0d8f91b	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-10 09:17:16 +03:00
Ivan Tashkinov	bbdad85568	Initial implementation of image preview proxy. Media proxy tests refactoring.	2020-05-08 23:06:47 +03:00
Mark Felder	c9344b5f2d	Minor grammar nit	2020-05-08 14:36:59 -05:00
Ivan Tashkinov	b2924ab1fb	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-08 21:37:55 +03:00
Maksim	3d0c567fbc	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
rinpatch	5482a1f6ef	Merge branch 'openapi/validation-plug' into 'develop' ... Ignore unexpected query params and ENUM values Closes #1719 See merge request pleroma/pleroma!2468	2020-05-05 12:08:58 +00: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
feld	b1c29e2de8	Merge branch 'feature/update-labels-for-activating-settings' into 'develop' ... Fix inconsistency in language for activating settings in description.exs Closes admin-fe#108 See merge request pleroma/pleroma!2469	2020-05-04 20:24:08 +00:00
Angelina Filippova	2ab52d5224	Fix inconsistency in language for activating settings	2020-05-04 22:41:14 +03:00
Egor Kislitsyn	1cb89aac1e	Enable strict validation mode in dev and test environments	2020-05-04 22:35:28 +04:00
Egor Kislitsyn	f070b5569c	Add a config option to enable strict validation	2020-05-04 22:33:05 +04:00
Ivan Tashkinov	d5cdc907e3	Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). ... Added support for :skip_notifications for accounts listing (index.json). Adjusted tests.	2020-05-01 18:45:24 +03:00
Ivan Tashkinov	92efb888c7	Made follow request notifications non-optional (removed config switch).	2020-05-01 09:51:41 +03:00