1238 Commits

Author	SHA1	Message	Date
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
Alexander Strizhakov	66acfa6882	descriptions that module names are shortened	2020-04-27 10:28:05 +03:00
Egor Kislitsyn	c56c0a3d23	Merge branch 'develop' into global-status-expiration	2020-04-24 18:37:58 +04: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
Ivan Tashkinov	6e6f95c6ae	Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md	2020-04-17 16:23:58 +03:00
Ivan Tashkinov	5c76afb06c	[#2342] Removed description.exs entry for temporary configuration option.	2020-04-13 15:38:50 +03:00
Egor Kislitsyn	7f692343c8	Merge branch 'develop' into global-status-expiration	2020-04-10 14:20:48 +04:00
Ivan Tashkinov	1a4875adfa	[#1559] Support for "follow_request" notifications (configurable). ... (Not currently supported by PleromaFE, thus disabled by default).	2020-04-07 21:52:32 +03:00
Ivan Tashkinov	98b96e45ab	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses ... # Conflicts: # CHANGELOG.md	2020-04-01 20:08:14 +03:00
feld	ef7d2b0f11	Merge branch 'gun' into 'develop' ... Gun adapter Closes #945 See merge request pleroma/pleroma!1861	2020-04-01 17:05:09 +00:00
Ivan Tashkinov	2f2bd7fe72	Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. ... See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.	2020-04-01 19:49:09 +03:00
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	2020-03-30 12:15:23 +03:00
Alexander Strizhakov	eb9744cade	activities generation tasks	2020-03-30 11:42:25 +03:00
Ivan Tashkinov	012d428e1f	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	2020-03-25 09:05:17 +03:00
Ivan Tashkinov	e743c22329	Fixed incorrect usage of "relations" as a short form of "relationships".	2020-03-25 09:04:00 +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
Mark Felder	b17d8d305f	Enable Gun adapter by default ... We need devs to dogfood this before we merge it into the 2.1 release	2020-03-16 15:39:34 -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
Alexander Strizhakov	ba90a6d3e5	removing from descriptions.exs deprecated settings	2020-03-16 14:01:35 +03:00
Haelwenn	d84670b9e1	Merge branch 'f' into 'develop' ... rip out fetch_initial_posts Closes #1422 and #1595 See merge request pleroma/pleroma!2297	2020-03-15 16:14:54 +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
rinpatch	fc4496d4fa	rate limiter: disable based on if remote ip was found, not on if the plug was enabled ... The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620	2020-03-13 21:41:17 +03:00
Alexander Strizhakov	b34bc669b9	adding descriptions	2020-03-04 20:09:18 +03:00
Alexander Strizhakov	884d9710b2	refactoring for gun api modules	2020-03-03 19:24:14 +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	509c81e4b1	Merge branch 'develop' into gun	2020-03-03 10:08:07 +03:00
Egor Kislitsyn	0f386110c6	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-03 00:32:34 +04: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
Alexander Strizhakov	2622cf1190	returning repo parameters	2020-03-02 09:22:34 +03: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
Alexander Strizhakov	04b03e4762	streamer group & Oban crontab child	2020-02-29 11:26:34 +03:00
Steven Fuchs	fabcd82f4a	add confirm field to filtered params	2020-02-28 04:27:50 +00:00
Ivan Tashkinov	6f2efb1c45	Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.	2020-02-27 18:46:05 +03:00
Alexander Strizhakov	2076c9f8c8	unnecessary groups	2020-02-26 19:50:07 +03:00
lain	f71aa644b1	Add :unnamed option to default database configuration	2020-02-25 11:53:30 +01:00
Haelwenn	1e1156b645	Merge branch '1505-threads-federation' into 'develop' ... [#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129	2020-02-24 07:28:35 +00:00
Mark Felder	9fe60c3b9c	Add missing invites_enabled and account_activation_required settings	2020-02-22 09:29:05 -06: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
Egor Kislitsyn	011ede4536	Update documentation	2020-02-21 14:42:43 +04:00
Alexander Strizhakov	a03c420b84	by default don't use gun retries ... remove conn depends on retry setting from config	2020-02-21 12:32:42 +03:00
Alexander Strizhakov	13918cb545	Merge branch 'develop' into gun	2020-02-21 10:02:37 +03:00
Mark Felder	b6bb73f43e	Apply database session parameter to improve GIN full text search	2020-02-20 15:34:10 -06:00
Ivan Tashkinov	0d14c3f410	[#1505] Typo fix.	2020-02-20 15:18:28 +03: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
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
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-18 17:46:09 +03: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
Egor Kislitsyn	0ddcd67d32	Update cheatsheet.md and config/description.exs	2020-02-14 16:53:53 +04:00
Egor Kislitsyn	241a3d744a	Add ActivityExpirationPolicy	2020-02-13 22:27:10 +04:00
Mark Felder	0afff36cda	Formatting got me again	2020-02-13 12:09:11 -06:00
Mark Felder	21dc3e3812	Even more description improvements	2020-02-13 12:01:13 -06:00
Mark Felder	aac7f30eb2	Add missing Oban job for attachments_cleanup	2020-02-13 11:49:19 -06:00
Mark Felder	1c52cf933f	More description cleanup work	2020-02-13 11:45:58 -06:00
Mark Felder	9218f893d7	More description cleanups	2020-02-13 11:31:02 -06:00
feld	b312c36b8e	Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' ... # Conflicts: # config/description.exs	2020-02-13 14:37:55 +00:00
Mark Felder	571a475c7e	Formatting	2020-02-13 08:02:33 -06:00
Mark Felder	9b778dc54a	Formatting	2020-02-13 08:01:39 -06:00
feld	4f5ee26f2d	Update description.exs	2020-02-13 14:00:33 +00:00
feld	e4016f4dbd	Apply suggestion to config/description.exs	2020-02-13 13:59:47 +00:00
Mark Felder	ff9fd4ca89	Fix the confusingly named and inverted logic of "no_attachment_links" ... The setting is now simply "attachment_links" and the boolean value does what you expect. A double negative is never possible and describing the functionality is no longer a philospher's worst nightmare.	2020-02-11 15:39:19 -06:00
Mark Felder	9581d57382	First round at cleaning up descriptions	2020-02-11 15:21:36 -06:00
Egor Kislitsyn	50d9fcbe29	Hotlink logo instead of attachment	2020-02-11 23:33:05 +04:00
feld	237b2068f9	Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" ... This reverts merge request !2194	2020-02-11 16:55:18 +00:00
rinpatch	ea1631d7e6	Make Floki use fast_html	2020-02-11 16:17:21 +03:00
Egor Kislitsyn	6875ccb6bf	Merge branch 'develop' into feature/new-registrations-digest	2020-02-11 13:54:55 +04:00
Alexander Strizhakov	bfd16fe41e	set oban crontab to false in tests	2020-02-11 12:19:06 +03:00
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
Ivan Tashkinov	4e6bbdc7b5	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-08 19:59:37 +03:00
Ivan Tashkinov	d458f4fdca	[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.	2020-02-08 19:58:02 +03:00
Alexander Strizhakov	7a2e153a8d	description change	2020-02-06 13:15:23 +03:00
Alexander Strizhakov	bdf0a87be9	dropdown type	2020-02-06 12:50:37 +03:00
feld	b21e59da5f	Merge branch 'remove-linker-scheme-option' into 'develop' ... Remove AutoLinker `scheme` option from the config See merge request pleroma/pleroma!2176	2020-02-05 20:32:45 +00:00
Egor Kislitsyn	3909b5b7b3	Remove AutoLinker scheme option from the config	2020-02-05 21:13:56 +04:00
Ivan Tashkinov	e84fee5b86	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-05 07:56:36 +03:00
Maksim Pechnikov	2c40c8b4a2	Merge branch 'develop' into issue/1383	2020-02-03 21:42:36 +03:00
Roman Chvanikov	8057157ee3	Make attachments cleanup optional	2020-01-31 01:20:37 +03:00
rinpatch	7499805abf	config.exs: Re-enable rate limiter and enable remote ip	2020-01-30 00:06:58 +03:00
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	2020-01-28 20:39:20 +03:00
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	2020-01-27 13:21:50 +00:00
Alexander Strizhakov	f72727a409	little fixes	2020-01-27 12:53:21 +03:00
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	2020-01-27 08:48:19 +03:00
Alexander Strizhakov	5943d78c74	description typos, Oban verbose type fix, new keys	2020-01-25 19:45:51 +03:00
Ivan Tashkinov	86e4d23acb	[#1505] Background fetching of incoming activities' replies collections.	2020-01-25 10:47:30 +03:00
feld	0a5e792454	Merge branch 'fix/better-descriptions-for-email-fields' into 'develop' ... Better descriptions for email fields for admin-fe Closes admin-fe#67 See merge request pleroma/pleroma!2138	2020-01-24 13:54:44 +00:00
Alexander Strizhakov	e9d8a84790	better descriptions for email fields for admin-fe	2020-01-24 11:19:12 +03:00
Alexander Strizhakov	b0ae69d996	removing deleted MDII uploader from suggestions	2020-01-24 11:05:03 +03:00
Egor Kislitsyn	3c4a30c6db	Add NewUsersDigestEmail to config/description.exs	2020-01-23 18:53:11 +04:00
Mark Felder	e151dea276	Merge branch 'develop' into feature/new-registrations-digest	2020-01-22 15:59:24 -06:00
Ivan Tashkinov	cf96c40057	[#1505] Added Mastodon-compatible replies collection to Note federated representation.	2020-01-22 21:10:17 +03:00
Maksim Pechnikov	cf19bf3c7c	Merge branch 'develop' into issue/1383	2020-01-22 20:20:39 +03:00
Egor Kislitsyn	5c842e3b68	Merge branch 'develop' into feature/new-registrations-digest	2020-01-22 21:18:27 +04:00
Egor Kislitsyn	aa0f0d4edd	Disable NewUsersDigestEmail by default	2020-01-22 20:53:06 +04:00
Egor Kislitsyn	df0b8f1d08	Add new users digest email	2020-01-22 20:31:42 +04: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
Roman Chvanikov	795a5fe441	Add delete_attachments queue to config	2020-01-21 19:48:14 +03:00
Alexander Strizhakov	f01ab6cd29	some refactor and tests	2020-01-21 18:42:00 +03:00
Alexander Strizhakov	503d966e9f	Merge branch 'develop' into admin-be	2020-01-21 10:32:27 +03:00
Alexander Strizhakov	efb8ef5abe	releases support	2020-01-18 17:14:50 +03:00
Alexander Strizhakov	e699861690	full update for some subkeys	2020-01-18 12:25:56 +03:00
Ivan Tashkinov	5304c8cd21	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-15 18:12:08 +03:00
Alexander Strizhakov	41c7f34905	short labels and fixes for typos	2020-01-14 15:00:38 +03: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
feld	6cc5341d26	Merge branch 'config/benchmark' into 'develop' ... Benchmark env uses test database so we should be able to use test.secret.exs See merge request pleroma/pleroma!2057	2020-01-12 18:31:10 +00:00
Hakaba Hitoyo	0c9c62509d	Remove MDII uploader	2020-01-11 17:19:54 +00:00
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	2020-01-10 19:34:19 +03:00
Alexander Strizhakov	00aff5f78c	syncing new setting to descriptions.exs	2020-01-10 17:54:54 +03:00
Ivan Tashkinov	39ce894a07	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex	2020-01-10 16:18:32 +03:00
Alexander	0b02040327	little fixes and typos fix	2020-01-10 15:52:02 +03:00
Alexander	cda2c1fc63	fix for subgroup tuple ... added settings for swoosh adapters local	2020-01-10 15:52:01 +03:00
Alexander	f9d01068cf	suggestions fix	2020-01-10 15:52:01 +03:00
Alexander	4306769671	adapter children	2020-01-10 15:52:00 +03:00
Alex S	2753285b77	config editing through database	2020-01-10 15:51:59 +03:00
Ivan Tashkinov	6c94b7498b	[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.	2020-01-10 10:52:21 +03:00
Mark Felder	89243fee8e	Fix captcha time, which was meant to be 5 minutes	2020-01-09 15:45:46 -06:00
Egor Kislitsyn	b012e66e4e	Increase CAPTCHA expiration time to 5 minutes	2019-12-23 15:14:46 +07:00
Maksim Pechnikov	54c9db38c8	Merge branch 'develop' into issue/1383	2019-12-21 20:38:59 +03:00
Mark Felder	b7811dfb7b	Instead allow a dedicated benchmark config	2019-12-19 12:16:53 -06:00
Mark Felder	50638525db	Merge branch 'develop' into config/benchmark	2019-12-19 12:16:33 -06:00
Egor Kislitsyn	b9a87b1baa	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-16 22:34:21 +07:00
Egor Kislitsyn	a12b6454bb	Add an option to require fetches to be signed	2019-12-16 22:24:03 +07:00
Egor Kislitsyn	fc484e5ce6	Add Kocaptcha endpoint to config.exs	2019-12-16 19:35:10 +07:00
Egor Kislitsyn	8d242f52d4	Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" ... This reverts commit 82c62c5028.	2019-12-16 19:33:51 +07:00
Egor Kislitsyn	82c62c5028	Add default endpoint to Pleroma.Captcha.Kocaptcha	2019-12-16 15:32:33 +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	470a3a678d	Add Kocaptcha endpoint to the test config	2019-12-12 18:04:52 +07:00
Egor Kislitsyn	e536796984	Add native captcha and enable it by default.	2019-12-12 17:39:39 +07:00
stwf	63ffa0e3ed	try local sheduling	2019-12-11 14:57:33 -05:00
Mark Felder	df469b4468	Benchmark env uses test database so we should be able to use test.secret.exs	2019-12-11 12:52:57 -06: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
Egor Kislitsyn	ed92784e7c	Set Logger level to :info in prod	2019-12-09 19:11:54 +07:00
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	2019-12-08 19:52:46 +03:00
Egor Kislitsyn	a75d4a41e0	Add a test for custom runtime modules	2019-12-06 17:05:09 +07:00
Egor Kislitsyn	157bceeda9	Move runtime configuration from :instance to :modules	2019-12-06 15:04:46 +07:00
Ivan Tashkinov	13926537b6	Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes	2019-12-06 00:26:31 +03:00
Ivan Tashkinov	af42c00cff	[#1427] Reworked admin scopes support. ... Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).	2019-12-06 00:25:44 +03:00
Egor Kislitsyn	48ae3c4347	Add support for custom modules	2019-12-05 20:18:25 +07:00
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01:00
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	2019-12-04 09:12:17 +03:00
Maksim Pechnikov	b7c449118b	Merge branch 'develop' into issue/1383	2019-11-28 21:27:01 +03:00
Maksim Pechnikov	d55859f5a4	remove quantum package	2019-11-27 16:35:12 +03:00
Maksim Pechnikov	a4f834a687	moved DigestEmail to Oban Periodic jobs	2019-11-27 15:59:13 +03:00
Maksim Pechnikov	c5766a8100	moved ActivityExpiration to Oban Periodic jobs	2019-11-27 13:36:03 +03:00
Maksim Pechnikov	6f202a401b	moved ScheduledActivity to Oban Periodic jobs	2019-11-27 09:26:37 +03:00
Mark Felder	f673e3deef	Default log level for syslog in prod should also be :warn	2019-11-26 05:46:48 -06:00
Maksim Pechnikov	ac3abb5414	moved Pleroma.Stats to Oban Periodic jobs	2019-11-26 10:54:30 +03:00
Maksim Pechnikov	0e9be6bafa	moved OAuth.Token.CleanWorker to Oban Periodic jobs	2019-11-25 14:32:20 +03:00
Sadposter	d3656c2725	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
rinpatch	dedb1ad5d6	Merge branch 'revert-5c6c3026' into 'develop' ... Revert "Merge branch 'patch-1' into 'develop'" See merge request pleroma/pleroma!2002	2019-11-21 15:20:05 +00:00
rinpatch	dc9303eac5	Revert "Merge branch 'patch-1' into 'develop'" ... This reverts merge request !1829	2019-11-21 15:03:27 +00:00
Mark Felder	edaae845af	Some tasks try to set log level in test environment, but we were stripping logs belog :warn. ... Ensure console backend logs in test environment are :warn, but mix tasks run in test env do not run with :debug because it's far too verbose.	2019-11-20 11:55:30 -06:00
Mark Felder	c65190c799	Console backend's log format should be prefixed and suffixed with newlines. ... This is how upstream does it by default.	2019-11-20 11:18:42 -06:00
Mark Felder	1c17f18329	Be specific about format for logs in test as we have tests that check it	2019-11-20 09:14:27 -06:00
Mark Felder	cb513a599c	Allow test builds to have info and debug logs stripped	2019-11-19 16:21:30 -06:00
Mark Felder	ff9133b978	Allow mix tasks to always run with debug logging	2019-11-19 16:01:17 -06:00
Ariadne Conill	1d33eeca72	config: add configuration for MRF ObjectAgePolicy	2019-11-14 18:26:06 -06: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
lain	72cc92259e	Default config: Use extended nickname format	2019-11-11 12:49:18 +00:00
rinpatch	4499a7a075	Disable attachment links by default ... Closes #1394	2019-11-10 15:02:47 +03:00
lain	e08bd99bab	Apply suggestion to config/config.exs	2019-11-10 11:02:34 +00:00
lain	4885d403fe	Apply suggestion to config/config.exs	2019-11-10 10:44:23 +00:00
Maksim Pechnikov	9d0b989521	add subject to atom feed	2019-11-10 11:10:20 +03:00
Phil Hagelberg	886a07ba57	Move static_fe config to its own section instead of in :instance.	2019-11-09 18:08:45 -08:00
rinpatch	2f4e9a068f	Bump fast_sanitize to 0.1.1 ... The parser C-Node has been completely rewritten to not use the deprecated `erl_interface` api. Closes #1378 since Nodex was ripped out and the replacement randomizes master node name.	2019-11-08 00:51:04 +03:00
rinpatch	9434e151a9	Blacklist myhtmlex nodes from swarm	2019-10-29 01:16:22 +03:00
rinpatch	05d111b622	Use the default scrubber before mediaproxy transformation	2019-10-29 01:15:28 +03:00
KokaKiwi	638457ba94	MastoFE: Add PWA manifest.	2019-10-19 12:15:14 +02:00
rinpatch	5c6c3026ea	Merge branch 'patch-1' into 'develop' ... Fix a typo in default static directory configuration for OTP releases Closes #1289 See merge request pleroma/pleroma!1829	2019-10-18 22:29:04 +00:00
Ariadne Conill	c6de0cbb4a	config: disable Websub and Salmon publisher modules	2019-10-18 14:50:09 +00:00
yalh76	fb5dce481c	Fix https://git.pleroma.social/pleroma/pleroma/issues/1289	2019-10-10 20:05:54 +00:00
lain	ecd7ac855b	Benchmark config: Don't use the sql sandbox.	2019-10-10 15:42:54 +02:00
lain	2629493804	Benchmark config: Database adjustments.	2019-10-10 15:01:06 +02:00
lain	c54ae662dc	Merge remote-tracking branch 'origin/develop' into benchmark-finishing	2019-10-10 14:40:59 +02:00
lain	02f8e2a8ab	Gitlab: Run benchmark in CI.	2019-10-10 14:24:54 +02:00
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
Ivan Tashkinov	f459aabdfa	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-10-06 09:30:49 +03:00
Mark Felder	b8b98ac40f	Add missing extended_nickname_format setting to the default config	2019-10-03 10:40:49 -05:00
Ivan Tashkinov	6ffa2b5f66	[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-09-30 17:41:20 +03:00
minibikini	f9380289eb	Add remote_ip plug	2019-09-27 21:59:23 +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
Egor Kislitsyn	d639cdcecb	Update "config/description.exs"	2019-09-19 14:56:10 +07:00
Egor Kislitsyn	cf3041220a	Add support for rel="ugc"	2019-09-19 14:56:10 +07:00
Ekaterina Vaartis	3e972c0456	Add :shared_pack_cache_seconds_per_file to description.exs	2019-09-19 00:23:18 +03:00
Ekaterina Vaartis	ee620ecbf1	Add caching for emoji pack sharing	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7e4c8b56ea	Add tests for emoji pack sharing	2019-09-19 00:16:33 +03:00
Haelwenn (lanodan) Monnier	32d64102cb	description.exs: uncomment type for email logo	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	c0c5628200	description.exs: remove empty strings on descriptions	2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier	50ec445b2c	description.exs: remove empty strings and arrays	2019-09-17 23:05:13 +02:00
Haelwenn (lanodan) Monnier	35dcea3e13	Remove [true,false] for booleans, it is implicit	2019-09-17 21:47:32 +02:00
Ivan Tashkinov	e7afb67c5c	[#1260] Rate-limiting for create authentication and related requests.	2019-09-17 16:16:11 +03:00