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
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
e127b9ab6d
[ #1149 ] Rewritten readme as config/description.exs.
2019-09-14 16:28:59 +03: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
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00: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
Alex S
e47089cf55
web_cache_ttl description
2019-09-11 09:32:58 +03:00
Alex S
10827eecad
formatting
2019-09-11 09:25:33 +03:00
Alexander Strizhakov
5db2920644
Apply suggestion to config/description.exs
2019-09-11 09:25:33 +03:00
Alexander Strizhakov
65bc9e66ad
Apply suggestion to config/description.exs
2019-09-11 09:25:33 +03:00
Alex S
6721301086
some changes
2019-09-11 09:25:33 +03:00
Alex S
171cefd889
description.exs
2019-09-11 09:25:33 +03:00
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
Alex S
db690bede9
temp commit
2019-09-05 16:02:20 +03:00
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-05 11:30:41 +03:00
Ashlynn Anderson
bd8b92ea5e
Remove dynamic config as default, add healthcheck
2019-09-03 09:31:52 -04: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
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
Hakaba Hitoyo
39c7bbe18f
Remove longfox emoji set
2019-08-04 04:32:45 +00:00
Ashlynn Anderson
4007717534
Run mix format
2019-08-03 13:42:57 -04:00
Ashlynn Anderson
4a418698db
Create docker.exs and docker-entrypoint + round out Dockerfile
...
At this point, the implementation is completely working and has been
tested running live and federating with other instances.
2019-08-03 00:21:54 -04: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
rinpatch
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
2019-07-31 14:12:29 +03: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
Mike Verdone
b729402774
Make test.exs read config in the same way as dev.exs
...
This way, if your test.secret.exs has an error, you'll actually see it.
2019-07-24 13:14:52 +02:00
rinpatch
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03: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
1345e0c2bf
tests: add tests for signed object fetches
2019-07-17 23:06:16 +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
rinpatch
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
2019-07-13 19:27:49 +03: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
Eugenij
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
2019-07-11 13:55:31 +00: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