Rin Toshaka
57c71f8468
Move generate_invite to user.ex
2018-12-02 20:26:15 +01:00
Rin Toshaka
d924b6cd3d
Refactor copypasta to a private function in instance.ex
2018-12-02 20:04:33 +01:00
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
kaniini
8c3ff06e35
Merge branch 'feature/anonymize-filenames' into 'develop'
...
Upload filter: anonymize filename
See merge request pleroma/pleroma!486
2018-12-01 03:09:20 +00: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
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
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
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
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
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
