a75d4a41e0
Add a test for custom runtime modules
2019-12-06 17:05:09 +07:00
157bceeda9
Move runtime configuration from `:instance` to `:modules`
2019-12-06 15:04:46 +07:00
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
2019-12-06 00:26:31 +03:00
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
48ae3c4347
Add support for custom modules
2019-12-05 20:18:25 +07:00
aa97fe8f17
ChatChannel: Ignore messages that are too long.
2019-12-04 12:48:34 +01:00
652cc6ba4b
updated ScheduledActivity
2019-12-04 09:12:17 +03:00
b7c449118b
Merge branch 'develop' into issue/1383
2019-11-28 21:27:01 +03:00
d55859f5a4
remove `quantum` package
2019-11-27 16:35:12 +03:00
a4f834a687
moved DigestEmail to Oban Periodic jobs
2019-11-27 15:59:13 +03:00
c5766a8100
moved ActivityExpiration to Oban Periodic jobs
2019-11-27 13:36:03 +03:00
6f202a401b
moved ScheduledActivity to Oban Periodic jobs
2019-11-27 09:26:37 +03:00
f673e3deef
Default log level for syslog in prod should also be :warn
2019-11-26 05:46:48 -06:00
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
2019-11-26 10:54:30 +03:00
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
2019-11-25 14:32:20 +03:00
d3656c2725
add ability to set a custom user-agent string
2019-11-25 09:53:11 +00:00
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
dc9303eac5
Revert "Merge branch 'patch-1' into 'develop'"
...
This reverts merge request !1829
2019-11-21 15:03:27 +00:00
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
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
1c17f18329
Be specific about format for logs in test as we have tests that check it
2019-11-20 09:14:27 -06:00
cb513a599c
Allow test builds to have info and debug logs stripped
2019-11-19 16:21:30 -06:00
ff9133b978
Allow mix tasks to always run with debug logging
2019-11-19 16:01:17 -06:00
1d33eeca72
config: add configuration for MRF ObjectAgePolicy
2019-11-14 18:26:06 -06:00
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
72cc92259e
Default config: Use extended nickname format
2019-11-11 12:49:18 +00:00
4499a7a075
Disable attachment links by default
...
Closes #1394
2019-11-10 15:02:47 +03:00
e08bd99bab
Apply suggestion to config/config.exs
2019-11-10 11:02:34 +00:00
4885d403fe
Apply suggestion to config/config.exs
2019-11-10 10:44:23 +00:00
9d0b989521
add subject to atom feed
2019-11-10 11:10:20 +03:00
886a07ba57
Move static_fe config to its own section instead of in :instance.
2019-11-09 18:08:45 -08:00
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
9434e151a9
Blacklist myhtmlex nodes from swarm
2019-10-29 01:16:22 +03:00
05d111b622
Use the default scrubber before mediaproxy transformation
2019-10-29 01:15:28 +03:00
638457ba94
MastoFE: Add PWA manifest.
2019-10-19 12:15:14 +02:00
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
c6de0cbb4a
config: disable Websub and Salmon publisher modules
2019-10-18 14:50:09 +00:00
fb5dce481c
Fix https://git.pleroma.social/pleroma/pleroma/issues/1289
2019-10-10 20:05:54 +00:00
ecd7ac855b
Benchmark config: Don't use the sql sandbox.
2019-10-10 15:42:54 +02:00
2629493804
Benchmark config: Database adjustments.
2019-10-10 15:01:06 +02:00
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +02:00
02f8e2a8ab
Gitlab: Run benchmark in CI.
2019-10-10 14:24:54 +02:00
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
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
b8b98ac40f
Add missing extended_nickname_format setting to the default config
2019-10-03 10:40:49 -05:00
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
f9380289eb
Add `remote_ip` plug
2019-09-27 21:59:23 +00:00
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
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
2019-09-23 20:38:53 +00:00
d639cdcecb
Update "config/description.exs"
2019-09-19 14:56:10 +07:00
cf3041220a
Add support for `rel="ugc"`
2019-09-19 14:56:10 +07:00
3e972c0456
Add :shared_pack_cache_seconds_per_file to description.exs
2019-09-19 00:23:18 +03:00
ee620ecbf1
Add caching for emoji pack sharing
2019-09-19 00:16:33 +03:00
7e4c8b56ea
Add tests for emoji pack sharing
2019-09-19 00:16:33 +03:00
32d64102cb
description.exs: uncomment type for email logo
2019-09-17 23:05:27 +02:00
c0c5628200
description.exs: remove empty strings on descriptions
2019-09-17 23:05:26 +02:00
50ec445b2c
description.exs: remove empty strings and arrays
2019-09-17 23:05:13 +02:00
35dcea3e13
Remove [true,false] for booleans, it is implicit
2019-09-17 21:47:32 +02:00
e7afb67c5c
[ #1260 ] Rate-limiting for create authentication and related requests.
2019-09-17 16:16:11 +03:00
d6ab78e610
Set `account_field_value_length` limit to 2048 by default
2019-09-16 21:48:01 +07:00
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
e127b9ab6d
[ #1149 ] Rewritten readme as config/description.exs.
2019-09-14 16:28:59 +03:00
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
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
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
e47089cf55
web_cache_ttl description
2019-09-11 09:32:58 +03:00
10827eecad
formatting
2019-09-11 09:25:33 +03:00
5db2920644
Apply suggestion to config/description.exs
2019-09-11 09:25:33 +03:00
65bc9e66ad
Apply suggestion to config/description.exs
2019-09-11 09:25:33 +03:00
6721301086
some changes
2019-09-11 09:25:33 +03:00
171cefd889
description.exs
2019-09-11 09:25:33 +03:00
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
db690bede9
temp commit
2019-09-05 16:02:20 +03:00
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-05 11:30:41 +03:00
bd8b92ea5e
Remove dynamic config as default, add healthcheck
2019-09-03 09:31:52 -04:00
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
2019-09-02 14:57:40 +03:00
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
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
66c1966688
Disable rate limiter by default
2019-08-26 20:36:44 +07:00
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-24 09:29:54 +03:00
e5f76a54e6
Fix default config of account fields length
2019-08-23 21:28:52 +00:00
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
2019-08-23 18:28:23 +03:00
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
2019-08-23 09:23:10 +03:00
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-22 21:01:28 +03:00
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
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
8d899d6197
Add `:ap_routes` rate limit
2019-08-20 22:10:36 +07:00
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
158231cd20
Add configurable colors and logo for the digest template
2019-08-16 18:32:25 +07:00
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
a2e1db5632
Increase max account fields limits
2019-08-14 14:58:38 +07:00
e457fcc479
Add `:max_remote_account_fields` config option
2019-08-14 14:58:06 +07:00
2c35d4b0b0
Add configurable account field name length limit
2019-08-14 14:52:54 +07:00
db3c05f6b4
Add configurable account field value length limit
2019-08-14 14:52:54 +07:00
e0ac5c7a66
Add custom profile fields
2019-08-14 14:52:54 +07:00
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
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
3fdbeb7087
MRF: add vocabulary policy module
2019-08-13 20:55:38 +00:00
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
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
2019-08-09 20:08:01 +03:00
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
39c7bbe18f
Remove longfox emoji set
2019-08-04 04:32:45 +00:00
4007717534
Run mix format
2019-08-03 13:42:57 -04:00
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
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
2019-08-01 15:53:37 +07:00
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
2019-07-31 14:12:29 +03:00
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
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
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
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
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
1345e0c2bf
tests: add tests for signed object fetches
2019-07-17 23:06:16 +00:00
b2a8ccf37f
config: add sign_object_fetches option
2019-07-17 21:38:06 +00:00
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
2019-07-16 21:44:50 +00:00
18234cc44e
add the rich media ttl based on image exp time
2019-07-17 00:20:34 +05:45
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
2019-07-16 19:18:30 +03:00
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
f4447d82b8
parsers configurable
2019-07-14 09:21:56 +03:00
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
2019-07-13 18:53:14 +00:00
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
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
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
2019-07-13 14:49:39 +03:00
fa7e0c4262
Workaround for remote server certificate chain issues
2019-07-12 23:53:21 +03:00
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
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
59e16fc45a
enable synchronization by default
2019-07-10 18:55:11 +03:00
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
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
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
2019-07-09 15:35:28 +00:00
abe2e8881f
Testing: Don't federate in testing.
2019-07-09 15:30:51 +09:00
682f1897b7
Enable OpenGraph and TwitterCard by default
...
Closes #1034
2019-07-08 13:00:45 +03:00
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
f8ec3e129f
In my experience syslog tags are usually lowercase
2019-06-27 13:00:22 -05:00
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
41e4752950
Make default pack extensions configurable and default to png and gif
2019-06-26 06:48:59 +03:00
4ad15ad2a9
add ignore hosts and TLDs for rich_media
2019-06-25 22:25:37 +03:00
875100de01
Bind to 127.0.0.1 instead of 0.0.0.0 by default
2019-06-23 09:31:39 +03:00
32320c1ee9
Fixes for dynamic configuration
2019-06-20 17:43:57 +00:00
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
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
ce823fa88e
Fix rate limit test
2019-06-14 19:24:31 +07:00
ac3d43e620
Set instance static/uploads to be outside of application directory in release config
...
In case of releases the application directory changes with each version
so the contents will not be accessible
2019-06-14 01:42:56 +03:00
822a9f28d0
Merge branch 'release-config-import' into 'develop'
...
Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing
See merge request pleroma/pleroma!1269
2019-06-12 09:58:16 +00:00
f0d96534a4
Import release config from env variable or /etc/pleroma/config.exs and
...
warn if the file is missing
2019-06-11 18:55:55 +03:00
6f29865d43
Add option to restrict all users to local content
2019-06-11 21:25:53 +07:00
5d5a9a3a35
Better default parameters for suggestion
2019-06-11 11:34:22 +00:00
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
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
2019-06-11 16:06:03 +07:00
bc8f059367
Add rate limiting for search endpoints
2019-06-11 14:28:39 +07:00
e343e4ff91
Merge branch 'change-containment-default' into 'develop'
...
Configuration: Skip thread containment by default
See merge request pleroma/pleroma!1256
2019-06-11 02:38:13 +00:00
3ecfe2a6d4
Merge branch 'develop' into feature/releases
2019-06-09 13:55:32 +03:00
b6d2db42a7
Fix wrong placement of serve_endpoints
2019-06-08 21:27:39 +03:00
4f5149c93b
Set default loglevel to `warn` in prod
...
It's rare that info logs are needed to debug the issue, so I would
suggest setting them to warn in prod by default to make finding the
relevant parts easier and potentially even decrease cpu usage on bigger
instances
Closes #962
2019-06-08 18:02:57 +03:00
4b98a7ce4e
Set serve_endpoints to true in prod config as setting it in runtime
...
config would cause issues with mix tasks
2019-06-08 17:17:28 +03:00
3d374bf7df
Basic release skeleton
2019-06-08 17:16:15 +03:00
76fc4c92bb
Fix tests.
2019-06-07 17:16:56 +02:00
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
c0fa000147
Set default config for digest to false
2019-06-07 01:22:35 +03:00
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
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
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
3eefb274f4
OAuth consumer: tests fix, comments, Keycloak config notes.
2019-06-05 13:02:13 +03:00
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
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
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
bd325132ca
Fix tests
2019-06-04 03:07:49 +03:00
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
2019-06-02 17:45:32 +03:00
561a21986d
formatting
2019-06-02 10:29:15 +00:00
4087ccdab8
mrf: add subchain policy
2019-06-02 10:07:42 +00:00
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
f1890d2cac
Merge branch 'dokku' into 'develop'
...
Dokku CI support - On-Demand review instances
See merge request pleroma/pleroma!1216
2019-05-31 23:09:06 +00:00
4e45f7bc87
CI: Add auto-deployment via dokku.
2019-05-31 10:55:35 +02:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
56fd7dbdd7
remove @websub and @ostatus module-level constants
2019-05-25 04:43:11 +00:00
80d55d428f
tests: websub: check only that signature validation succeeds or fails
2019-05-25 04:34:16 +00:00
9bec891eb4
kill @httpoison
2019-05-25 04:24:21 +00:00
baf72d6c58
mrf: simple policy: add the ability to strip avatars and banners from user profiles
2019-05-22 18:53:12 +00:00
620908a2db
[ #699 ] add worker to clean expired oauth tokens
2019-05-22 15:44:50 +00:00
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
2019-05-22 11:04:30 +00:00
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
2019-05-22 04:06:54 +00:00
16b260fb19
add mix task to prune the object database using a configured retention period
2019-05-21 21:38:56 +00:00
76a7429bef
Add poll limits to /api/v1/instance and initial state
2019-05-21 09:13:10 +03:00
75c7bb9289
Additional reserved usernames
2019-05-20 17:18:59 -05:00
daeae8e2e7
Move default mascot configuration to `config/`
2019-05-20 16:12:55 +01:00
2375e9a95b
Add report filtering to MRF.SimplePolicy
2019-05-20 06:02:50 +08:00
290f5b2cfe
config: make sending the user agent configurable, disable sending the user agent in tests
2019-05-17 20:28:58 +00:00
8784a7d1b4
RUM: Set rum status by the environment.
2019-05-17 15:21:24 +02:00
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
2019-05-17 11:33:04 +02:00
e39c190f04
Configuration: disable migration lock.
2019-05-17 11:30:35 +02:00
aa11fa4864
add report uri and report to
2019-05-16 12:49:40 +07:00
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
0992094bd6
Merge branch 'cleanup' into 'develop'
...
Remove unused queue from the config
See merge request pleroma/pleroma!1158
2019-05-15 15:23:13 +00:00
f1e67bdc31
Search: Add optional rum indexing / searching.
2019-05-15 15:28:01 +02:00
153c15cdb2
Merge branch 'legacy-fe-config' into 'develop'
...
remove deprecated PleromaFE configuration
See merge request pleroma/pleroma!1152
2019-05-15 10:56:19 +00:00
ee22fff5ac
remove deprecated PleromaFE configuration
2019-05-15 15:29:59 +05:45
6c9f45f4dd
Remove unused queue from the config
2019-05-15 14:40:20 +07:00
2ca8d20053
Fix rate-limiting tests
2019-05-14 23:16:34 +03:00
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
38f3393e93
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
...
As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)
Also in this commit: minor changelog improvements.
2019-05-14 22:48:16 +03:00
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
2019-05-13 18:58:04 +00:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
fedaca15a3
websub: adapt to work as a federator publishing module
2019-05-12 05:04:24 +00:00
179293e51c
salmon: refactor to work as a federator publishing module
2019-05-12 05:04:21 +00:00
10695a28d2
federator: publisher: add publish() wrapper
2019-05-12 05:04:16 +00:00
b6b5b16ba4
Merge develop
2019-05-08 17:08:06 +07:00
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
f46295faa7
unused config paramater
2019-05-07 09:07:06 +07:00
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
501af917b5
add support for bbcode
2019-04-26 22:35:02 +00:00
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
d35246c449
added healthcheck setting to instance config
2019-04-22 17:00:06 +07:00
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
0d6265cfe2
Change the default manifest to pleroma's namespace
2019-04-21 22:32:34 +03:00
b87ad13803
Move comments for email_notifications config to docs
2019-04-21 19:36:31 +07:00
64a2c6a041
Digest emails
2019-04-20 19:42:19 +07:00
8f93d4c423
Remove most finmoji mentions where appropriate
2019-04-20 15:42:14 +03:00
9bd5e2dec9
Make emoji default_manifest a config option
2019-04-20 11:17:17 +03:00
a141f0807b
Assume packs without emoji.txt only have emoji pictures, unhardcode
...
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
2019-04-20 11:17:17 +03:00
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03:00
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-19 23:27:13 +07:00
aeafa0b2ef
Add Notification.for_user_since/2
2019-04-19 22:16:17 +07:00
ada384207b
typo fix
...
docs for RelMe provider
2019-04-19 07:50:21 +00:00
2f0203a4a1
Resolve conflicts
2019-04-17 16:59:05 +07:00
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
2019-04-16 18:44:07 +00:00
10096bbf2b
add extra_cookie_attrs option to config
...
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
2019-04-16 22:20:56 +08:00
4fecd6f9a7
Config.exs: Add big warning so that nobody ever edits it.
2019-04-15 15:45:15 +02:00
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
2019-04-13 12:24:38 +07:00
Egor Kislitsyn