Commit Graph

2723 Commits

Author SHA1 Message Date
kaniini
ec1ec32f20 Merge branch 'optional-retry-queue' into 'develop'
Make retry queue optional.

See merge request pleroma/pleroma!498
2018-12-04 19:00:18 +00:00
lain
925b05054f Make retry queue optional.
At the moment, it can use a lot of memory really fast.
2018-12-04 19:54:42 +01:00
kaniini
114b95cee2 Merge branch 'feature/integration_tesla' into 'develop'
[#354] Move all http interactions to Tesla

See merge request pleroma/pleroma!487
2018-12-04 18:41:00 +00:00
lambda
4a602230e4 Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'
bugfix: MRF simple media removal

See merge request pleroma/pleroma!497
2018-12-04 18:36:34 +00:00
William Pitcock
b57d83e3c9 MRF: simple policy: fix media removal 2018-12-04 18:30:01 +00:00
Maksim Pechnikov
a9e3e387c9 add test 2018-12-04 20:37:13 +03:00
Maksim Pechnikov
50e72f6c48 remove httpoison_mock 2018-12-04 18:09:22 +03:00
Maksim Pechnikov
dd8aee332c formatting the code 2018-12-04 17:48:55 +03:00
Maksim Pechnikov
5c6d47614d all tests passed 2018-12-04 17:44:15 +03:00
Maksim Pechnikov
a9e4a97586 update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
7ec64ac33f update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
80bfdb4e7d update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
6cfdc11e32 update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
c508d41c34 add http requests mock 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
87109482f3 status_code -> status 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
97252a27d9 fix http request in Salmon 2018-12-04 14:04:06 +03:00
Maksim Pechnikov
ec34de0c1f WebSub fix test 2018-12-04 14:03:32 +03:00
Maksim Pechnikov
3ce16e5a56 init tesla and updated the http requests in Pleroma.Web.Websub 2018-12-04 14:03:32 +03:00
lambda
88b05aeabb Merge branch 'fix/parse-user-bio' into 'develop'
Parse user's bio on register

See merge request pleroma/pleroma!492
2018-12-03 16:31:00 +00:00
lambda
42ef7cd227 Merge branch 'fix-media-proxy-defaults' into 'develop'
Fix media proxy config defaults

See merge request pleroma/pleroma!495
2018-12-03 16:14:58 +00:00
Maxim Filippov
4b70e5eae9 Parse bio for MastodonAPI 2018-12-03 18:59:50 +03:00
kaniini
a3f9cca78c Merge branch 'update-pleroma-frontend' into 'develop'
update-pleroma-frontend

See merge request pleroma/pleroma!494
2018-12-03 06:03:09 +00:00
hakabahitoyo
a7b1a66be3 update-pleroma-frontend 2018-12-03 13:24:25 +09:00
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
Maxim Filippov
8148943368 Format files 2018-12-02 22:08:53 +03:00
Maxim Filippov
ce98d5eb9b Parse user's bio on register 2018-12-02 22:03:53 +03:00
href
43d5e4f7fa
Fix media proxy config defaults 2018-12-02 11:24:02 +01: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