6f174cbb71
Delete reactivate user task
6 years ago
5f91d6b859
Fix toggle_deactivated to reactivate a deactivated user
6 years ago
fe2759bc9f
Attempt to resolve merge conflict
6 years ago
8c3ff06e35
Merge branch 'feature/anonymize-filenames' into 'develop'
...
Upload filter: anonymize filename
See merge request pleroma/pleroma!486
6 years ago
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
6 years ago
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
6 years ago
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
6 years ago
e99bab8f27
Merge branch 'config-delete' into 'develop'
...
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
6 years ago
9c471a2443
Merge branch 'supervisor-order' into 'develop'
...
Fix supervisor order
See merge request pleroma/pleroma!485
6 years ago
1d94c8f0f0
Fix supervisor order
...
This starts `Pleroma.Web.Endpoint` after all other processes and may
avoid some weird bugs (especially at start/restart).
Also properly ignores starting the gopher's gen_server if disabled.
6 years ago
253da275bd
Pleroma.Config.delete/1
6 years ago
7282937f33
MIME: video/audio ogg detection
6 years ago
680716b3c9
Config docs
6 years ago
65e7307d68
Upload: bring back base_url
6 years ago
5d92431350
Fix deprecation warnings
6 years ago
1d537bc74f
remove eal
...
i like you eal don't take it personally<3
6 years ago
02d3dc6869
Uploads fun, part. 2
6 years ago
97b00d366f
reverse_proxy: more headers
6 years ago
a2640c8088
Parse correctly content-type & do not forward content-length
6 years ago
b19597f602
reverse proxy / uploads
6 years ago
52ce368562
Merge branch 'bugfix/server-true-in-prod' into 'develop'
...
config/prod.exs: Remove server: true
See merge request pleroma/pleroma!483
6 years ago
761ed2355f
config/prod.exs: Remove server: true
...
This breaks mix tasks in regular Elixir
6 years ago
c86d14a84d
Merge branch 'enable-ci-cache' into 'develop'
...
[CI] Enable CI caching for _build and deps
See merge request pleroma/pleroma!482
6 years ago
72f038bdf2
Only jobs for one branch are allowed to use the same cache
6 years ago
36826b11a6
Cache _build
6 years ago
2a58f5dcaa
Add dependency caching
6 years ago
73101c1fc1
Merge branch 'fix-list-stream-privacy' into 'develop'
...
Streamer: Don't send unwanted DMs to list streams
See merge request pleroma/pleroma!478
6 years ago
7049ed5936
Merge branch 'revert-02e43d44' into 'develop'
...
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
See merge request pleroma/pleroma!481
6 years ago
4a019827b2
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
...
This reverts merge request !480
6 years ago
02e43d44d3
Merge branch 'chore/mix-lock-update' into 'develop'
...
Add ex_doc & makeup_elixir to mix.lock
See merge request pleroma/pleroma!480
6 years ago
0314f04c2a
Add ex_doc & makeup_elixir to mix.lock
6 years ago
87098d1676
Streamer: Don't send unwanted DMs to list streams
6 years ago
41ff86ca1d
Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'
...
fix: version string: force git abbrev size to 8 chars
Closes #389
See merge request pleroma/pleroma!472
6 years ago
b9bc83097d
Merge branch 'ogg-theora-detection' into 'develop'
...
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
6 years ago
0d229613df
Fix lint error
6 years ago
7f20a3cf1f
Add Theora detection to upload.ex
6 years ago
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
6 years ago
a76058fc1d
Merge branch 'fix/pleromafe-title' into 'develop'
...
Replace hardcoded <title>
See merge request pleroma/pleroma!476
6 years ago
6979eeda34
config: document mrf_user_allowlist
6 years ago
271f9f1335
nodeinfo: add mrf_user_allowlist data
6 years ago
8c05d19c7f
MRF: add user allowlist module
6 years ago
6cc94404d7
Replace this hardcoded <title>
6 years ago
bdb0c6e418
Merge branch 'bugfix/csp-no-https' into 'develop'
...
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
See merge request pleroma/pleroma!475
6 years ago
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
...
This fixes running mastofe with MIX_ENV=dev
6 years ago
3370924b8b
Merge branch 'add-manifest-src-to-csp' into 'develop'
...
Add manifest-src to CSP to allow manifest.json
See merge request pleroma/pleroma!474
6 years ago
591b11eafc
Add manifest-src to allow manifest.json
6 years ago
39a3b1724a
Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'
...
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
See merge request pleroma/pleroma!471
6 years ago
f70b20e499
version string: force git abbrev size to 8 chars
...
Fixes #389
Older git versions defaults to 7 chars.
6 years ago
cc8952b45f
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
6 years ago
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
6 years ago
rinpatch