Commit Graph

177 Commits

Author SHA1 Message Date
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
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
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false 2020-07-08 06:28:40 +02: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
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
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
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
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 cc837f9d15 fixed config/descpiption.exs 2020-06-24 21:21:33 +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
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
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
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 a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-06-01 15:48:51 +04:00
Roman Chvanikov 8eb1dfadca Update CHANGELOG and docs 2020-05-22 18:30:13 +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
Mark Felder 4c48626585 Also add new sidebarRight setting 2020-05-20 12:22:31 -05: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
Angelina Filippova 4a925b964a Remove description of the settings that should't be altered 2020-05-16 20:39:42 +03:00
Mark Felder 54b4824186 Lint 2020-05-13 17:07:14 -05:00