alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,887 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

2887 Commits

Author SHA1 Message Date
href 8e0e20631c
Reverse proxy: default max read duration at 30 secs. 2018-11-30 19:12:03 +01:00
lambda e99bab8f27 Merge branch 'config-delete' into 'develop' 
Add Pleroma.Config.delete/1

See merge request pleroma/pleroma!484
 2018-11-30 17:57:06 +00:00
lambda 9c471a2443 Merge branch 'supervisor-order' into 'develop' 
Fix supervisor order

See merge request pleroma/pleroma!485
 2018-11-30 17:56:05 +00:00
href 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.
 2018-11-30 18:31:15 +01:00
href 253da275bd
Pleroma.Config.delete/1 2018-11-30 18:27:27 +01:00
href 7282937f33
MIME: video/audio ogg detection 2018-11-30 18:02:52 +01:00
href 680716b3c9
Config docs 2018-11-30 18:02:51 +01:00
href 65e7307d68
Upload: bring back base_url 2018-11-30 18:02:50 +01:00
href 5d92431350
Fix deprecation warnings 2018-11-30 18:02:50 +01:00
href 1d537bc74f
remove eal 
i like you eal don't take it personally<3
 2018-11-30 18:02:49 +01:00
href 02d3dc6869
Uploads fun, part. 2 2018-11-30 18:02:37 +01:00
href 97b00d366f
reverse_proxy: more headers 2018-11-30 18:00:57 +01:00
href a2640c8088
Parse correctly content-type & do not forward content-length 2018-11-30 18:00:57 +01:00
href b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
lain d0ec2812bd Merge remote-tracking branch 'origin' into validate-user-info 2018-11-30 17:34:20 +01:00
lain 8f1fffebc6 Fix transmogrifier test. 2018-11-30 17:31:05 +01:00
lain d088ac6286 Fix OStatus user updates. 
Breaks banner updating.
 2018-11-30 17:21:58 +01:00
lain 48b95a9b95 Assorted fixes. 2018-11-30 17:08:02 +01:00
lain d407f662af Fix TwitterApiController. 2018-11-30 17:07:37 +01:00
lain a6812bc9df Remove "most recent notification" endpoint. 2018-11-30 16:47:37 +01:00
kaniini 52ce368562 Merge branch 'bugfix/server-true-in-prod' into 'develop' 
config/prod.exs: Remove server: true

See merge request pleroma/pleroma!483
 2018-11-30 04:36:20 +00:00
Haelwenn (lanodan) Monnier 761ed2355f
config/prod.exs: Remove server: true 
This breaks mix tasks in regular Elixir
 2018-11-30 03:05:34 +01:00
lambda c86d14a84d Merge branch 'enable-ci-cache' into 'develop' 
[CI] Enable CI caching for _build and deps

See merge request pleroma/pleroma!482
 2018-11-29 09:34:46 +00:00
rinpatch 72f038bdf2 Only jobs for one branch are allowed to use the same cache 2018-11-29 12:20:47 +03:00
rinpatch 36826b11a6 Cache _build 2018-11-29 12:09:32 +03:00
rinpatch 2a58f5dcaa Add dependency caching 2018-11-29 11:45:14 +03:00
lain 6ac5d48575 More fixes 2018-11-29 00:25:43 +01:00
lambda 73101c1fc1 Merge branch 'fix-list-stream-privacy' into 'develop' 
Streamer: Don't send unwanted DMs to list streams

See merge request pleroma/pleroma!478
 2018-11-28 21:10:20 +00:00
kaniini 7049ed5936 Merge branch 'revert-02e43d44' into 'develop' 
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"

See merge request pleroma/pleroma!481
 2018-11-27 23:20:12 +00:00
kaniini 4a019827b2 Revert "Merge branch 'chore/mix-lock-update' into 'develop'" 
This reverts merge request !480
 2018-11-27 23:19:30 +00:00
kaniini 02e43d44d3 Merge branch 'chore/mix-lock-update' into 'develop' 
Add ex_doc & makeup_elixir to mix.lock

See merge request pleroma/pleroma!480
 2018-11-27 22:59:01 +00:00
Maxim Filippov 0314f04c2a Add ex_doc & makeup_elixir to mix.lock 2018-11-28 01:12:11 +03:00
KokaKiwi 87098d1676 Streamer: Don't send unwanted DMs to list streams 2018-11-27 20:50:19 +01:00
lain e002858071 Fix ostatus test. 2018-11-27 18:37:46 +01:00
lain 3c61df6b9e Webfinger fixes. 2018-11-27 18:31:44 +01:00
lain 5bd3b3a215 More and more fixes. 2018-11-27 18:21:05 +01:00
lain badbe2656c More fixes. 2018-11-27 18:12:03 +01:00
kaniini 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
 2018-11-27 17:10:08 +00:00
kaniini b9bc83097d Merge branch 'ogg-theora-detection' into 'develop' 
Add Theora detection to upload.ex

See merge request pleroma/pleroma!479
 2018-11-27 16:55:56 +00:00
lain ec464ef20a HTTP sig fixes. 2018-11-27 17:42:45 +01:00
lain f983c1d0c6 Fix CommonApi tests. 2018-11-27 17:31:14 +01:00
rinpatch 0d229613df Fix lint error 2018-11-27 19:07:58 +03:00
rinpatch 7f20a3cf1f Add Theora detection to upload.ex 2018-11-27 17:51:02 +03:00
Haelwenn 5ae6088d37 Merge branch 'feature/mrf-user-allowlist' into 'develop' 
MRF: user allowlist module

See merge request pleroma/pleroma!477
 2018-11-27 00:12:03 +00:00
kaniini a76058fc1d Merge branch 'fix/pleromafe-title' into 'develop' 
Replace hardcoded <title>

See merge request pleroma/pleroma!476
 2018-11-26 23:59:30 +00:00
William Pitcock 6979eeda34 config: document mrf_user_allowlist 2018-11-26 23:54:46 +00:00
William Pitcock 271f9f1335 nodeinfo: add mrf_user_allowlist data 2018-11-26 23:52:19 +00:00
William Pitcock 8c05d19c7f MRF: add user allowlist module 2018-11-26 23:51:58 +00:00
Mark Felder 6cc94404d7 Replace this hardcoded <title> 2018-11-26 22:51:25 +00:00
kaniini 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
 2018-11-26 22:24:21 +00:00