Commit graph

646 commits

Author SHA1 Message Date
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
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
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
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
Steven Fuchs
fabcd82f4a add confirm field to filtered params 2020-02-28 04:27:50 +00: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
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
Egor Kislitsyn
241a3d744a
Add ActivityExpirationPolicy 2020-02-13 22:27:10 +04: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
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
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
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
Ivan Tashkinov
86e4d23acb [#1505] Background fetching of incoming activities' replies collections. 2020-01-25 10:47:30 +03: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
503d966e9f
Merge branch 'develop' into admin-be 2020-01-21 10:32:27 +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
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
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
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
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
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
Maksim Pechnikov
67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44:10 +03:00
Egor Kislitsyn
7528322f83 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-13 01:51:52 +07:00
Egor Kislitsyn
e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
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
Maksim Pechnikov
5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03: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
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
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
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
Ariadne Conill
c6de0cbb4a config: disable Websub and Salmon publisher modules 2019-10-18 14:50:09 +00: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
cf3041220a Add support for rel="ugc" 2019-09-19 14:56:10 +07:00
Ekaterina Vaartis
ee620ecbf1 Add caching for emoji pack sharing 2019-09-19 00:16:33 +03:00
Ivan Tashkinov
e7afb67c5c [#1260] Rate-limiting for create authentication and related requests. 2019-09-17 16:16:11 +03:00
Egor Kislitsyn
d6ab78e610 Set account_field_value_length limit to 2048 by default 2019-09-16 21:48:01 +07:00
Egor Kislitsyn
96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
2019-09-16 17:55:04 +07:00
kaniini
c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
Ivan Tashkinov
6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	docs/config.md
#	mix.lock
2019-09-14 16:11:44 +03:00
rinpatch
56828abf6d Use Jason for rendering responses
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59))
2019-09-11 23:06:31 +03:00
minibikini
11e12b5761 Add Pleroma.Plugs.Cache 2019-09-09 18:53:08 +00:00
Ivan Tashkinov
b49085c156 [#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper. 2019-09-02 14:57:40 +03:00
Ivan Tashkinov
a90ea8ba15 [#1149] Addressed code review comments (code style, jobs pruning etc.). 2019-08-31 19:08:56 +03:00
Ivan Tashkinov
e890ea7e82 [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	config/config.exs
2019-08-31 14:25:43 +03:00
Egor Kislitsyn
66c1966688 Disable rate limiter by default 2019-08-26 20:36:44 +07:00
lain
cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
Ivan Tashkinov
c34126f89c Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-24 09:29:54 +03:00
aries
e5f76a54e6 Fix default config of account fields length 2019-08-23 21:28:52 +00:00
Ivan Tashkinov
581123f8bb [#1149] Introduced quantum job scheduler. Documentation & config changes. 2019-08-23 18:28:23 +03:00
Ivan Tashkinov
c29686309e [#1149] Upgraded oban from 0.6.0 to 0.7.1. 2019-08-23 09:23:10 +03:00
Ivan Tashkinov
7101ba1a21 Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-22 21:01:28 +03:00
Ivan Tashkinov
256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
lain
f740d786a3 Merge branch 'rate-limit-ap-routes' into 'develop'
[#1174] Rate limit AP routes

See merge request pleroma/pleroma!1586
2019-08-21 16:45:20 +00:00
Egor Kislitsyn
8d899d6197 Add :ap_routes rate limit 2019-08-20 22:10:36 +07:00
lain
8340fe8fcc Merge branch 'digest-template' into 'develop'
Improve digest email template

See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
Egor Kislitsyn
158231cd20 Add configurable colors and logo for the digest template 2019-08-16 18:32:25 +07:00
Ivan Tashkinov
8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-14 21:44:50 +03:00
Egor Kislitsyn
a2e1db5632 Increase max account fields limits 2019-08-14 14:58:38 +07:00
Egor Kislitsyn
e457fcc479 Add :max_remote_account_fields config option 2019-08-14 14:58:06 +07:00
Egor Kislitsyn
2c35d4b0b0 Add configurable account field name length limit 2019-08-14 14:52:54 +07:00
Egor Kislitsyn
db3c05f6b4 Add configurable account field value length limit 2019-08-14 14:52:54 +07:00
Egor Kislitsyn
e0ac5c7a66 Add custom profile fields 2019-08-14 14:52:54 +07:00
rinpatch
9ef31767f2 Merge branch 'feature/mrf-vocabulary' into 'develop'
MRF Vocabulary

See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
rinpatch
83a3de8cc4 Merge branch 'length-limit-bio' into 'develop'
Add configurable length limits for `User.bio` and `User.name`

See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
Ariadne Conill
3fdbeb7087 MRF: add vocabulary policy module 2019-08-13 20:55:38 +00:00
Ariadne Conill
f46cd7e9c7 config: remove legacy activitypub accept_blocks setting
Anyone who is interested in dropping blocks can write their own MRF
policy at this point.  This setting predated the MRF framework.

Disabling the side effect (unsubscription) is still a config option
per policy.
2019-08-13 02:15:21 +00:00
Ivan Tashkinov
267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-09 20:09:56 +03:00
Ivan Tashkinov
b7fad8d395 [#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues. 2019-08-09 20:08:01 +03:00
Roman Chvanikov
9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
Ivan Tashkinov
23d279e03e [#1149] Replaced RetryQueue with oban-based retries. 2019-08-01 17:28:00 +03:00
Egor Kislitsyn
9ca4506355 Add configurable length limits for User.bio and User.name 2019-08-01 15:53:37 +07:00
Sachin Joshi
242f5c585e add account confirmation email resend in mastodon api 2019-07-28 20:30:10 +00:00
Mike Verdone
378f5f0fbe Add activity expiration worker
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
2019-07-24 13:14:52 +02:00
Roman Chvanikov
36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
kaniini
33729bbb28 Merge branch 'feature/richmedia-ttl' into 'develop'
add the rich media ttl based on image exp time

See merge request pleroma/pleroma!1438
2019-07-19 21:36:36 +00:00
Ariadne Conill
b2a8ccf37f config: add sign_object_fetches option 2019-07-17 21:38:06 +00:00
Alexander Strizhakov
10f82c88b8 mastoapi password reset
added rate limit to password reset

configure rate limit in runtime
2019-07-16 21:44:50 +00:00
Sachin Joshi
18234cc44e add the rich media ttl based on image exp time 2019-07-17 00:20:34 +05:45
Ivan Tashkinov
889dc17abd [#1094] Rate-limited follow & unfollow actions. 2019-07-16 19:18:30 +03:00
Roman Chvanikov
c729883936 Merge branch 'develop' into feature/digest-email 2019-07-14 21:43:30 +03:00
Alex S
f4447d82b8 parsers configurable 2019-07-14 09:21:56 +03:00
Ariadne Conill
80c46d6d8b nodeinfo: implement MRF transparency exclusions 2019-07-13 18:53:14 +00:00
kaniini
f4c001062e Merge branch '1041-status-actions-rate-limit' into 'develop'
Rate-limited status actions (per user and per user+status).

Closes #1041

See merge request pleroma/pleroma!1410
2019-07-13 14:17:17 +00:00
Ivan Tashkinov
369e9bb42f [#1041] Rate-limited status actions (per user and per user+status). 2019-07-13 14:49:39 +03:00
rinpatch
fa7e0c4262 Workaround for remote server certificate chain issues 2019-07-12 23:53:21 +03:00
Roman Chvanikov
eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Alex S
59e16fc45a enable synchronization by default 2019-07-10 18:55:11 +03:00
Alex S
beba7bbc85 removing synchronization worker 2019-07-10 17:42:18 +03:00
Maksim
12b1454245 [#1062] added option to disable send email 2019-07-10 05:34:21 +00:00
Roman Chvanikov
371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
Alexander Strizhakov
d6b0fce6e9 Fix/1019 correct count remote users 2019-07-09 17:36:35 +00:00
Haelwenn
1ab4e35f27 Merge branch 'enable-ogp-by-default' into 'develop'
Do not crash if metadata fails to render and enable OGP and TwitterCard by default

Closes #1034

See merge request pleroma/pleroma!1388
2019-07-09 16:07:20 +00:00
rinpatch
682f1897b7 Enable OpenGraph and TwitterCard by default
Closes #1034
2019-07-08 13:00:45 +03:00
Ivan Tashkinov
2b9d914089 [#161] Refactoring, documentation. 2019-06-30 15:58:50 +03:00
Roman Chvanikov
657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
Mark Felder
f8ec3e129f In my experience syslog tags are usually lowercase 2019-06-27 13:00:22 -05:00
kaniini
9f8e645dce Merge branch 'feature/configurable-pack-extensions' into 'develop'
Make default pack extensions configurable and default to png and gif

See merge request pleroma/pleroma!1338
2019-06-26 05:34:02 +00:00
rinpatch
41e4752950 Make default pack extensions configurable and default to png and gif 2019-06-26 06:48:59 +03:00
Maksim Pechnikov
4ad15ad2a9 add ignore hosts and TLDs for rich_media 2019-06-25 22:25:37 +03:00
rinpatch
875100de01 Bind to 127.0.0.1 instead of 0.0.0.0 by default 2019-06-23 09:31:39 +03:00
rinpatch
f30a3241d2 Deps: Update auto_linker 2019-06-18 16:08:18 +03:00
Alexander Strizhakov
c2ca1f22a2 it is changed in compile time
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
Egor Kislitsyn
6f29865d43 Add option to restrict all users to local content 2019-06-11 21:25:53 +07:00
Hakaba Hitoyo
5d5a9a3a35 Better default parameters for suggestion 2019-06-11 11:34:22 +00:00
lain
63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
Egor Kislitsyn
ad04d12de6 Replace MastodonAPIController.account_register/2 rate limiter 2019-06-11 16:06:03 +07:00
Egor Kislitsyn
bc8f059367 Add rate limiting for search endpoints 2019-06-11 14:28:39 +07:00
lain
593b8b1e6a Configuration: Skip thread containment by default
In my tests the interaction between thread containment and other restrictions
makes postgresql create some very bad query plans. This caused direct messages
to time out on soykaf, for example.
2019-06-07 14:28:14 +02:00
Roman Chvanikov
c0fa000147 Set default config for digest to false 2019-06-07 01:22:35 +03:00
Roman Chvanikov
01fe5abad1 Resolve conflicts 2019-06-07 01:20:50 +03:00
rinpatch
92213fb87c Replace Mix.env with Pleroma.Config.get(:env)
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
2019-06-06 23:59:51 +03:00
Egor
f82382de22 [#943] Make the unauthenticated users limitation optional 2019-06-06 12:17:49 +00:00
Roman Chvanikov
b1b1a270e8 Fix conflict 2019-06-05 02:45:21 +03:00
Maksim Pechnikov
4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
kaniini
9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy

See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
kaniini
a536f515dd Merge branch 'ueberauth_config_extension' into 'develop'
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification

See merge request pleroma/pleroma!1234
2019-06-04 05:42:49 +00:00
Mark Felder
6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00
Maksim Pechnikov
080e1aa70e add option skip_thread_containment 2019-06-03 16:13:37 +03:00
Ivan Tashkinov
83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification. 2019-06-02 17:45:32 +03:00
William Pitcock
561a21986d formatting 2019-06-02 10:29:15 +00:00
William Pitcock
4087ccdab8 mrf: add subchain policy 2019-06-02 10:07:42 +00:00