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
rinpatch