Commit graph

1913 commits

Author SHA1 Message Date
Rin Toshaka
cbe22deb51 Lint fix 2018-12-02 19:20:50 +01:00
Rin Toshaka
faf1f2b304 Move gen.instance to instance.ex 2018-12-02 19:18:06 +01:00
Rin Toshaka
7983b0bdfe Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users. 2018-12-02 18:05:59 +01:00
Rin Toshaka
31b3ac05ac Lint fix 2018-12-02 10:01:17 +01:00
Rin Toshaka
a8ef6b1190 Add admin option to pleroma.user new. Add user existence checking to toggle_activated 2018-12-02 09:36:31 +01:00
rinpatch
ae82852330 Move set_admin task to lib/mix/tasks/pleroma/user.ex 2018-12-01 18:55:52 +03:00
rinpatch
6f174cbb71 Delete reactivate user task 2018-12-01 18:34:26 +03:00
rinpatch
5f91d6b859 Fix toggle_deactivated to reactivate a deactivated user 2018-12-01 18:33:53 +03:00
rinpatch
fe2759bc9f Attempt to resolve merge conflict 2018-12-01 18:12:27 +03:00
href
e9982c521b
Upload filter: anonymize filename
It replaces the original filename with a randomly generated string.
2018-11-30 19:33:34 +01:00
kaniini
ca24ad2a2b Merge branch 'feature/reverse-proxy' into 'develop'
reverse proxy / uploads

See merge request pleroma/pleroma!470
2018-11-30 18:15:44 +00:00
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
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
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
KokaKiwi
87098d1676 Streamer: Don't send unwanted DMs to list streams 2018-11-27 20:50:19 +01: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
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
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
Haelwenn (lanodan) Monnier
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
This fixes running mastofe with MIX_ENV=dev
2018-11-26 21:41:36 +01:00
shibayashi
591b11eafc
Add manifest-src to allow manifest.json 2018-11-26 20:48:24 +01:00
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation 2018-11-24 08:45:45 +01:00
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level 2018-11-24 06:43:03 +01:00
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
reported by soka on CRTNet
2018-11-24 06:13:36 +01:00
kaniini
675653ceb7 Merge branch 'feature/admin-api' into 'develop'
Add a admin API

See merge request pleroma/pleroma!366
2018-11-22 00:28:04 +00:00
kaniini
182e3e8da2 Merge branch 'feature/improve-version' into 'develop'
Improved version string

See merge request pleroma/pleroma!467
2018-11-21 16:53:38 +00:00
kaniini
a591a044a9 Merge branch 'runtime-fixes' into 'develop'
Various runtime configuration fixes

See merge request pleroma/pleroma!468
2018-11-20 22:25:35 +00:00
Haelwenn
c7d08bc1cf Merge branch 'feature/retry-queue' into 'develop'
Federator: add retry queue.

See merge request pleroma/pleroma!323
2018-11-20 19:04:52 +00:00
href
bc5cf2c192
Improved version string 2018-11-20 17:55:03 +01:00
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests 2018-11-20 17:50:03 +01:00
eal
689b46efc8 RetryQueue: tiny refractor, add tests 2018-11-19 18:08:41 +02:00
href
bcecdc3ab1
Various runtime configuration fixes 2018-11-19 10:09:24 +01:00
eal
62299be094 Federator: add retry queue. 2018-11-18 17:46:29 +02:00
William Pitcock
f6be980f4f activitypub: object view: avoid leaking private details 2018-11-17 22:30:53 +00:00
William Pitcock
98795172a7 ostatus controller: respond with AS2 objects instead of activities to notice URIs 2018-11-17 22:10:15 +00:00
William Pitcock
dfcfb184b1 activitypub: transmogrifier: make deletes secure 2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier
0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit 2018-11-17 22:12:14 +01:00