Commit Graph

2697 Commits

Author SHA1 Message Date
Haelwenn
e1204c6f25 Merge branch 'user_info_fixes_again' into 'develop'
User info fixes again

See merge request pleroma/pleroma!489
2018-12-02 23:07:24 +00:00
lain
e3f3d13d99 Add uuid generation extension to sample_psql.eex. 2018-12-02 11:20:49 +01:00
lain
91065e1968 Fix background updating / handling. 2018-12-02 11:20:38 +01:00
kaniini
371d96b1da Merge branch 'validate-user-info' into 'develop'
Validate user info

See merge request pleroma/pleroma!465
2018-12-01 22:11:52 +00:00
lambda
a836d7b93a Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'
#292 Replace try/rescue with File.Exists? in dev.exs

See merge request pleroma/pleroma!488
2018-12-01 15:17:41 +00:00
rinpatch
d9a4aed3b3 replace try/catch with File.Exists? in dev.exs 2018-12-01 17:38:45 +03:00
lain
f18b86fd5f More fixes for Info schema. 2018-12-01 12:46:08 +01:00
lain
93f2dc19d9 TwitterAPI: Fix banner and background update. 2018-12-01 12:01:22 +01:00
lain
4996fb07d8 Genereate uuids for existing info fields. 2018-12-01 12:00:33 +01:00
lain
347df6421d Fix masto api user updating. 2018-12-01 10:40:01 +01:00
lain
c443c9bd72 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-12-01 09:55:46 +01:00
lain
1c67277c80 Fix admin api. 2018-12-01 09:03:16 +01: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
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