1291 Commits (7b76fdeed3edce937514f25b818a2d4ed46f7892)

Author	SHA1	Message	Date
lain	e2772d6bf1	Merge branch 'block-behavior' into 'develop' ... Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242	3 years ago
sadposter	bd9c9136f9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	3 years ago
sadposter	1aab9b94b1	fix config	3 years ago
Haelwenn	6b3842cf50	Merge branch 'remove/mastofe' into 'develop' ... Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392	3 years ago
sadposter	b202cf15d6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	3 years ago
rinpatch	21720db859	Merge branch 'dkuku-develop-patch-66061' into 'develop' ... Update dev.exs error message to write to stderr. See merge request pleroma/pleroma!3492	3 years ago
Haelwenn	901204df22	Merge branch 'poll-notification' into 'develop' ... MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484	3 years ago
Sean King	1841bd8383	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe	3 years ago
Ilja	ee26f2c91b	Quarantine placeholders ... * kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case * The mrf simple and transparency exclusion were already OK	3 years ago
Ilja	f4028c908c	Add key- and valuePlaceholders for quarantined_instances and mrf_simple ... * I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here * I also added comments to explain why we did the _info keys (backwards compatibility)	3 years ago
Ilja	64002e92ad	config/description.exs: Update quarantine settings to tuples	3 years ago
sadposter	2519d4eb1a	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	3 years ago
Daniel	5c5571c668	use puts instead warn	3 years ago
Daniel	69ebfb29fb	Update dev.exs error message to write to stderr. Currently it dumps this message at the beginnig of the file when using vim-autoformat with mix format	3 years ago
Alex Gleason	33a19c002a	Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix	3 years ago
Alex Gleason	94db0b7cd6	Add activity+json to Phoenix :format_encoders ... Fixes ErrorView rendering	3 years ago
Alex Gleason	62bf6d67e3	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	3 years ago
Alex Gleason	0114754db2	MastodonAPI: Support poll notification	3 years ago
sadposter	e56c319e8f	merge	3 years ago
Sean King	dc4814f0cd	Fix merge conflicts with upstream	3 years ago
Haelwenn	a5dce42c85	Merge branch 'chore/rename-chat' into 'develop' ... Rename the non-federating Chat feature to Shout See merge request pleroma/pleroma!2842	3 years ago
Mark Felder	679d4c23e9	Update wording for relays in docs and config description	3 years ago
Mark Felder	297feb73f4	Formatting	3 years ago
Mark Felder	dcf84ac12e	disableChat / disableShout didn't actually do anything for PleromaFE	3 years ago
Mark Felder	8ff2d8d17d	Update description file for new shout config setting location	3 years ago
Mark Felder	d6432a65da	Move shout configuration from :instance, update docs and changelog	3 years ago
Mark Felder	36fe8950f7	Update PleromaFE settings for the old chat box	3 years ago
Mark Felder	68aa56b9e4	Just call it shout	3 years ago
Mark Felder	ff00b354fa	Rename the non-federating Chat feature to Shout	3 years ago
Snow	69aed310de	Adding description	3 years ago
feld	a833a2d76b	Merge branch 'plug-runtime-dev' into 'develop' ... Put Plugs in runtime mode in :dev, :test to speed up recompilation See merge request pleroma/pleroma!3411	3 years ago
Mark Felder	fe40f6f291	Switch from the deprecated "use Mix.config" to "import Config"	3 years ago
Alex Gleason	0461794375	Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev	3 years ago
Alex Gleason	e3173a279d	Put Plugs in runtime mode in :dev, :test to speed up recompilation	3 years ago
Alex Gleason	32ae8f4906	Merge remote-tracking branch 'pleroma/develop' into optional-config	3 years ago
Alex Gleason	b22f54eb29	Make prod.secret.exs optional (with warning)	3 years ago
sadposter	50a644a221	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	3 years ago
Alex Gleason	762be6ce10	Merge remote-tracking branch 'upstream/develop' into block-behavior	3 years ago
Sean King	fa2e62078c	Remove MastoFE configuration stuff	3 years ago
Mark Felder	2557e805a3	Support for configuration via AdminFE	4 years ago
Mark Felder	8b81d62227	Upstream original followbot implementation	4 years ago
sadposter	5f62b55a6f	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
rinpatch	f930e83fa2	Merge branch 'fix/remove_auto_nsfw' into 'develop' ... Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223	4 years ago
sadposter	292ddf730c	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
Ivan Tashkinov	882dd46843	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Haelwenn (lanodan) Monnier	3bc7d12271	Remove sensitive-property setting #nsfw, create HashtagPolicy	4 years ago
Ivan Tashkinov	8f88a90ca3	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex	4 years ago
Ivan Tashkinov	77f3da0358	[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.	4 years ago
Ivan Tashkinov	a98c4423f3	Apply i1t's suggestion(s) to 1 file(s)	4 years ago
sadposter	5f33699169	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
Mark Felder	db7d6f337f	Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote	4 years ago
Ivan Tashkinov	b981edad8a	[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.	4 years ago
rinpatch	6d66fadea7	Remove `:auth, :enforce_oauth_admin_scope_usage` ... `admin` scope has been required by default for more than a year now and all apps that use the API seems to request a proper scope by now.	4 years ago
Ivan Tashkinov	349b8b0f4f	[#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).	4 years ago
Ivan Tashkinov	5992382cf8	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex	4 years ago
Ivan Tashkinov	a996ab46a5	[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.	4 years ago
rinpatch	a52cedba62	Merge branch 'chore/descriptions-improvements' into 'develop' ... More descriptions improvements See merge request pleroma/pleroma!3307	4 years ago
Mark Felder	ce7c275fb3	Improve various descriptions and labels	4 years ago
Mark Felder	2bffa8e020	Make the suggestion match the default value	4 years ago
Mark Felder	4dbb08a19f	Improved Mailer descriptions	4 years ago
Ivan Tashkinov	d1c6dd97aa	[#3213] Partially addressed code review points. ... migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).	4 years ago
Mark Felder	f736501e97	Alpha-sort adapters ... Add various labels, descriptions and suggestions for all adapter settings and try to use the same terminology by the service provider.	4 years ago
Mark Felder	0fcf16dcb8	Move Enabled to top as it's the master control of all email. Description not really needed.	4 years ago
Mark Felder	bd828e5c9c	More description improvements	4 years ago
Mark Felder	227dd84f11	Update SMTP error description and default value	4 years ago
Mark Felder	9e3e8e2e30	Update Swoosh docs URL, lint	4 years ago
Mark Felder	cfc474c5f7	There is no reason to expose these Local adapter settings either.	4 years ago
Mark Felder	6ffe15cc9f	Remove No MX lookups setting ... This setting defaults to false so the relay host will be used in an MX query so multiple SMTP servers can be used. gen_smtp code states that all records returned from the MX query are attempted in order and only a permanent SMTP error will stop the client from attempting other servers in the list. Connection failures, TLS issues, etc will cause it to try the next host. If there is no MX record associated with the relay host, it automatically tries connecting to it directly. There is really no reason to expose this to end users. The default value is fine for everyone.	4 years ago
Mark Felder	85710b026f	Improve SMTP adapter setting descriptions	4 years ago
Mark Felder	9f98885388	No reason to suggest users try the useless "Local" mail adapter	4 years ago
Mark Felder	887db076b5	Load an emoji.txt specific to the test env	4 years ago
feld	008499f65a	Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md	4 years ago
Ivan Tashkinov	1b49b8efe5	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	4 years ago
Ivan Tashkinov	6fd4163ab6	[#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.	4 years ago
Ivan Tashkinov	9948ff3356	[#3213] Added HashtagsCleanupWorker periodic job.	4 years ago
Mark Felder	2048b93929	Add missing :ex_aws, :s3, :region setting	4 years ago
feld	d7af0294e6	Merge branch 'service-worker-allowed-header' into 'develop' ... Ability to set custom HTTP headers per each frontend See merge request pleroma/pleroma!3247	4 years ago
Alexander Strizhakov	875fbaae35	support for expires_in/expires_at in filters	4 years ago
sadposter	3aa25b008d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
Mark Felder	e709dec2eb	Add Invalidation Script url_format setting	4 years ago
Mark Felder	003402df40	Add ability to invalidate cache entries for Apache	4 years ago
eugenijm	7fcaa188a0	Allow to define custom HTTP headers per each frontend	4 years ago
eugenijm	133644dfa2	Ability to set the Service-Worker-Allowed header	4 years ago
Ivan Tashkinov	c041e9c630	[#3213] HashtagsTableMigrator: failures handling fix, retry function. ... Changed default hashtags filtering strategy to non-aggregate approach.	4 years ago
Ivan Tashkinov	2634a16b4c	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	5ade430e46	changed naming in changelog	4 years ago
Alexander Strizhakov	6d48144a9d	use proper naming ... for MediaProxyWarmingPolicy in ConcurrentLimiter	4 years ago
Alexander Strizhakov	b4ff63d020	configurable limits for ConcurrentLimiter ... Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy	4 years ago
feld	2926713fe5	Merge branch 'deprecate-public_endpoint' into 'develop' ... Deprecate Uploaders.S3, :public_endpoint See merge request pleroma/pleroma!3251	4 years ago
Mark Felder	086100e3b7	Consistent comment style for :ex_aws	4 years ago
Ivan Tashkinov	48b399cedb	[#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).	4 years ago
Mark Felder	f9e0c05ca4	Only run one attachment cleanup job per node ... The previous limit of 5 was probably causing massing performance issues due to concurrent full table scans.	4 years ago
Mark Felder	5627f3642f	Not needed in test.exs	4 years ago
Mark Felder	f0ab60189e	truncated_namespace should default to nil	4 years ago
lain	c7cd9bd591	Password: Add password module ... Replaces Pbkdf2.	4 years ago
Mark Felder	8b28dce82a	Deprecate Pleroma.Uploaders.S3, :public_endpoint	4 years ago
lain	ac1298fce8	Merge branch 'cleanup/unused-proxy-opts' into 'develop' ... Cleanup Pleroma.Upload proxy opts See merge request pleroma/pleroma!3236	4 years ago
Alex Gleason	1438fd9583	Merge remote-tracking branch 'upstream/develop' into block-behavior	4 years ago
Roger Braun	48cd336a72	allow external emoji	4 years ago
feld	5e128a6be3	Merge branch 'fix/mediaproxy-config-descriptions' into 'develop' ... Fix proxy and mediaproxy description.exs See merge request pleroma/pleroma!3219	4 years ago
Mark Felder	d69c78ceb9	Remove configurability of upload proxy opts, simplify	4 years ago
Mark Felder	8864ac65c6	Add dinosaur gif from https://gifs.cc ... "Our animations are free to be used to enhance your website."	4 years ago
lain	8e5904daa5	SideEffects.DeleteTest: asyncify. ... Replace Mock with Mox, mock out Logger.	4 years ago
sadposter	6cd0586ef9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
lain	e4f1d8f48c	Merge branch 'cachex-test' into 'develop' ... Test framework overhaul (speed, reliability) See merge request pleroma/pleroma!3209	4 years ago
Mark Felder	ce78b64db8	Formatting	4 years ago
Mark Felder	5a084d6f8d	Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE	4 years ago
lain	5db1e6c8d3	Pipeline test: Switch from Mock to Mox. ... Speeds up the test and makes it possible to run async.	4 years ago
lain	ecd39a8fe5	Test config: Raise pool size for postgres. ... Given all the async tests, this can become a bottleneck.	4 years ago
rinpatch	a05e1d4e48	config/description.exs: Remove outdated information about Oban ... The version of Oban we depend on no longer uses ShareLocks, so this note no longer applies.	4 years ago
lain	95a9bdfc37	Tests: Use NullCache for async tests. ... Caching can't work in async tests, so for them it is mocked to a null cache that is always empty. Synchronous tests are stubbed with the real Cachex, which is emptied after every test.	4 years ago
lain	9a744d49c8	Jason: Remove by now superfluous jason_types file	4 years ago
Ivan Tashkinov	62bf4a1292	[#2353] Virtually never-expiring OAuth tokens (new and already issued ones).	4 years ago
Alexander Strizhakov	cebe3c7def	Fix for dropping posts/notifs in WS when mix task is executed ... - start oban in mix tasks with empty queues, plugins and crontab - fix for update_users_following_followers_counts - fix for removed logo.png - typo in resend confirmation emails mix task docs - fix for uploads mix task (start Majic.Pool) - fix for creating user mix task (start :fast_html app)	4 years ago
Ivan Tashkinov	7fff9c1bee	Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).	4 years ago
Alexander Strizhakov	94480c6607	removing fed sockets settings	4 years ago
Alexander Strizhakov	5eef4988bf	fix for elixir 1.11 ... load runtime configs in releases with config provider	4 years ago
lain	11e0d5f9ac	Password Resets: Don't accept tokens above a certain age. ... By default, one day	4 years ago
rinpatch	2c55f7d7cb	Remove FedSockets ... Current FedSocket implementation has a bunch of problems. It doesn't have proper error handling (in case of an error the server just doesn't respond until the connection is closed, while the client doesn't match any error messages and just assumes there has been an error after 15s) and the code is full of bad descisions (see: fetch registry which uses uuids for no reason and waits for a response by recursively querying a ets table until the value changes, or double JSON encoding). Sometime ago I almost completed rewriting fedsockets from scrach to adress these issues. However, while doing so, I realized that fedsockets are just too overkill for what they were trying to accomplish, which is reduce the overhead of federation by not signing every message. This could be done without reimplementing failure states and endpoint logic we already have with HTTP by, for example, using TLS cert auth, or switching to a more performant signature algorithm. I opened https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further discussion on alternatives to fedsockets. From discussions I had with other Pleroma developers it seems like they would approve the descision to remove them as well, therefore I am submitting this patch.	4 years ago
sadposter	7947236575	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
Alexander Strizhakov	efc27f6464	fix for adminFE ... - revert UserAllowPolicy description - MRF descriptions order	4 years ago
Alexander Strizhakov	485697d96c	config descriptions for custom MRF policies	4 years ago
lain	294628d981	Merge branch 'feature/expire-mutes' into 'develop' ... Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971	4 years ago
lain	d8d4e96230	Merge branch 'default-mrf' into 'develop' ... Add TagPolicy as default MRF See merge request pleroma/pleroma!2834	4 years ago
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	4 years ago
lain	bae48c98e3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	4 years ago
sadposter	ddf36b096e	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Mark Felder	89c356d19f	Improve Keyword descriptions for AdminFE	4 years ago
Egor Kislitsyn	4a2d7a7a5d	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
feld	03a318af9a	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	291189357b	Merge branch 'develop' into feature/account-export	4 years ago
Mark Felder	9e54ef086b	Merge branch 'develop' into feature/account-export	4 years ago
feld	5aff479951	Merge branch '1668-prometheus-access-restrictions' into 'develop' ... [#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093	4 years ago
feld	e062329a17	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	4 years ago
lain	04b7505c75	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	4 years ago
feld	d6907e6e0c	Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	4 years ago
Egor Kislitsyn	e87901c424	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Ivan Tashkinov	50d4280880	[#1668] Formatting fix.	4 years ago
Egor Kislitsyn	ad605e3e16	Rename `Pleroma.Backup` to `Pleroma.User.Backup`	4 years ago
Ivan Tashkinov	3a28aa8814	[#1668] Added :prometheus group config to config/description.exs.	4 years ago
Ivan Tashkinov	524fb0e4c2	[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint. ... Added tests and documentation.	4 years ago
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	4 years ago
Mark Felder	efd6572ffb	Remove suggestions	4 years ago
Mark Felder	405f27b4f8	The suggestions are problematic as they need to be real local account names	4 years ago
Mark Felder	1b8fd7e65a	Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts	4 years ago
Mark Felder	1fb9452131	Merge branch 'develop' into feature/account-export	4 years ago
Alex Gleason	b3d6cf9022	Merge remote-tracking branch 'upstream/develop' into block-behavior	4 years ago
Mark Felder	b738f70953	Merge branch 'develop' into feature/gen-magic	4 years ago
Mark Felder	64553ebae2	Merge branch 'develop' into chore/elixir-1.11	4 years ago