akkoma
5 years agotests: add regression test for bug #408
William Pitcock [Wed, 5 Dec 2018 03:41:32 +0000 (03:41 +0000)]
tests: add regression test for bug #408

5 years agouser: put default user info when registering a user
William Pitcock [Wed, 5 Dec 2018 03:35:41 +0000 (03:35 +0000)]
user: put default user info when registering a user

5 years agoMerge branch 'optional-retry-queue' into 'develop'
kaniini [Tue, 4 Dec 2018 19:00:18 +0000 (19:00 +0000)]
Merge branch 'optional-retry-queue' into 'develop'

Make retry queue optional.

See merge request pleroma/pleroma!498

5 years agoMake retry queue optional.
lain [Tue, 4 Dec 2018 18:54:42 +0000 (19:54 +0100)]
Make retry queue optional.

At the moment, it can use a lot of memory really fast.

5 years agoMerge branch 'feature/integration_tesla' into 'develop'
kaniini [Tue, 4 Dec 2018 18:41:00 +0000 (18:41 +0000)]
Merge branch 'feature/integration_tesla' into 'develop'

[#354] Move all http interactions to Tesla

See merge request pleroma/pleroma!487

5 years agoMerge branch 'bugfix/mrf-simple-media-removal' into 'develop'
lambda [Tue, 4 Dec 2018 18:36:34 +0000 (18:36 +0000)]
Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'

bugfix: MRF simple media removal

See merge request pleroma/pleroma!497

5 years agoMRF: simple policy: fix media removal
William Pitcock [Tue, 4 Dec 2018 18:28:38 +0000 (18:28 +0000)]
MRF: simple policy: fix media removal

5 years agoadd test
Maksim Pechnikov [Tue, 4 Dec 2018 16:43:00 +0000 (19:43 +0300)]
add test

5 years agoremove httpoison_mock
Maksim Pechnikov [Tue, 4 Dec 2018 14:51:49 +0000 (17:51 +0300)]
remove httpoison_mock

5 years agoformatting the code
Maksim Pechnikov [Tue, 4 Dec 2018 14:48:55 +0000 (17:48 +0300)]
formatting the code

5 years agoall tests passed
Maksim Pechnikov [Tue, 4 Dec 2018 13:39:08 +0000 (16:39 +0300)]
all tests passed

5 years agoupdate test
Maksim Pechnikov [Tue, 4 Dec 2018 11:01:39 +0000 (14:01 +0300)]
update test

5 years agoupdate test
Maksim Pechnikov [Mon, 3 Dec 2018 18:37:55 +0000 (21:37 +0300)]
update test

5 years agoupdate test
Maksim Pechnikov [Mon, 3 Dec 2018 15:53:22 +0000 (18:53 +0300)]
update test

5 years agoupdate test
Maksim Pechnikov [Sun, 2 Dec 2018 19:05:28 +0000 (22:05 +0300)]
update test

5 years agoadd http requests mock
Maksim Pechnikov [Sun, 2 Dec 2018 15:17:26 +0000 (18:17 +0300)]
add http requests mock

5 years agostatus_code -> status
Maksim Pechnikov [Sun, 2 Dec 2018 14:08:36 +0000 (17:08 +0300)]
status_code -> status

5 years agofix http request in Salmon
Maksim Pechnikov [Sun, 2 Dec 2018 14:00:33 +0000 (17:00 +0300)]
fix http request in Salmon

5 years agoWebSub fix test
Maksim Pechnikov [Sun, 2 Dec 2018 13:58:38 +0000 (16:58 +0300)]
WebSub fix test

5 years agoinit tesla and updated the http requests in Pleroma.Web.Websub
Maksim Pechnikov [Sat, 1 Dec 2018 05:26:59 +0000 (08:26 +0300)]
init tesla and updated the http requests in Pleroma.Web.Websub

5 years agoMerge branch 'fix/parse-user-bio' into 'develop'
lambda [Mon, 3 Dec 2018 16:31:00 +0000 (16:31 +0000)]
Merge branch 'fix/parse-user-bio' into 'develop'

Parse user's bio on register

See merge request pleroma/pleroma!492

5 years agoMerge branch 'fix-media-proxy-defaults' into 'develop'
lambda [Mon, 3 Dec 2018 16:14:58 +0000 (16:14 +0000)]
Merge branch 'fix-media-proxy-defaults' into 'develop'

Fix media proxy config defaults

See merge request pleroma/pleroma!495

5 years agoParse bio for MastodonAPI
Maxim Filippov [Mon, 3 Dec 2018 15:59:50 +0000 (18:59 +0300)]
Parse bio for MastodonAPI

5 years agoMerge branch 'update-pleroma-frontend' into 'develop'
kaniini [Mon, 3 Dec 2018 06:03:09 +0000 (06:03 +0000)]
Merge branch 'update-pleroma-frontend' into 'develop'

update-pleroma-frontend

See merge request pleroma/pleroma!494

5 years agoupdate-pleroma-frontend
hakabahitoyo [Mon, 3 Dec 2018 04:24:25 +0000 (13:24 +0900)]
update-pleroma-frontend

5 years agoMerge branch 'user_info_fixes_again' into 'develop'
Haelwenn [Sun, 2 Dec 2018 23:07:24 +0000 (23:07 +0000)]
Merge branch 'user_info_fixes_again' into 'develop'

User info fixes again

See merge request pleroma/pleroma!489

5 years agoFormat files
Maxim Filippov [Sun, 2 Dec 2018 19:08:53 +0000 (22:08 +0300)]
Format files

5 years agoParse user's bio on register
Maxim Filippov [Sun, 2 Dec 2018 19:03:53 +0000 (22:03 +0300)]
Parse user's bio on register

5 years agoFix media proxy config defaults
href [Sun, 2 Dec 2018 10:24:02 +0000 (11:24 +0100)]
Fix media proxy config defaults

5 years agoAdd uuid generation extension to sample_psql.eex.
lain [Sun, 2 Dec 2018 10:20:49 +0000 (11:20 +0100)]
Add uuid generation extension to sample_psql.eex.

5 years agoFix background updating / handling.
lain [Sun, 2 Dec 2018 10:20:38 +0000 (11:20 +0100)]
Fix background updating / handling.

5 years agoMerge branch 'validate-user-info' into 'develop'
kaniini [Sat, 1 Dec 2018 22:11:52 +0000 (22:11 +0000)]
Merge branch 'validate-user-info' into 'develop'

Validate user info

See merge request pleroma/pleroma!465

5 years agoMerge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'
lambda [Sat, 1 Dec 2018 15:17:41 +0000 (15:17 +0000)]
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

5 years agoreplace try/catch with File.Exists? in dev.exs
rinpatch [Sat, 1 Dec 2018 14:38:45 +0000 (17:38 +0300)]
replace try/catch with File.Exists? in dev.exs

5 years agoMore fixes for Info schema.
lain [Sat, 1 Dec 2018 11:46:08 +0000 (12:46 +0100)]
More fixes for Info schema.

5 years agoTwitterAPI: Fix banner and background update.
lain [Sat, 1 Dec 2018 11:00:53 +0000 (12:00 +0100)]
TwitterAPI: Fix banner and background update.

5 years agoGenereate uuids for existing info fields.
lain [Sat, 1 Dec 2018 11:00:33 +0000 (12:00 +0100)]
Genereate uuids for existing info fields.

5 years agoFix masto api user updating.
lain [Sat, 1 Dec 2018 09:40:01 +0000 (10:40 +0100)]
Fix masto api user updating.

5 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
lain [Sat, 1 Dec 2018 08:55:46 +0000 (09:55 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info

5 years agoFix admin api.
lain [Sat, 1 Dec 2018 08:03:16 +0000 (09:03 +0100)]
Fix admin api.

5 years agoMerge branch 'feature/anonymize-filenames' into 'develop'
kaniini [Sat, 1 Dec 2018 03:09:20 +0000 (03:09 +0000)]
Merge branch 'feature/anonymize-filenames' into 'develop'

Upload filter: anonymize filename

See merge request pleroma/pleroma!486

5 years agoUpload filter: anonymize filename
href [Fri, 30 Nov 2018 18:33:34 +0000 (19:33 +0100)]
Upload filter: anonymize filename

It replaces the original filename with a randomly generated string.

5 years agoMerge branch 'feature/reverse-proxy' into 'develop'
kaniini [Fri, 30 Nov 2018 18:15:44 +0000 (18:15 +0000)]
Merge branch 'feature/reverse-proxy' into 'develop'

reverse proxy / uploads

See merge request pleroma/pleroma!470

5 years agoReverse proxy: default max read duration at 30 secs.
href [Fri, 30 Nov 2018 18:12:03 +0000 (19:12 +0100)]
Reverse proxy: default max read duration at 30 secs.

5 years agoMerge branch 'config-delete' into 'develop'
lambda [Fri, 30 Nov 2018 17:57:06 +0000 (17:57 +0000)]
Merge branch 'config-delete' into 'develop'

Add Pleroma.Config.delete/1

See merge request pleroma/pleroma!484

5 years agoMerge branch 'supervisor-order' into 'develop'
lambda [Fri, 30 Nov 2018 17:56:05 +0000 (17:56 +0000)]
Merge branch 'supervisor-order' into 'develop'

Fix supervisor order

See merge request pleroma/pleroma!485

5 years agoFix supervisor order
href [Mon, 19 Nov 2018 19:58:12 +0000 (20:58 +0100)]
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.

5 years agoPleroma.Config.delete/1
href [Fri, 30 Nov 2018 17:19:22 +0000 (18:19 +0100)]
Pleroma.Config.delete/1

5 years agoMIME: video/audio ogg detection
href [Fri, 30 Nov 2018 16:56:28 +0000 (17:56 +0100)]
MIME: video/audio ogg detection

5 years agoConfig docs
href [Fri, 30 Nov 2018 16:44:42 +0000 (17:44 +0100)]
Config docs

5 years agoUpload: bring back base_url
href [Fri, 30 Nov 2018 16:44:12 +0000 (17:44 +0100)]
Upload: bring back base_url

5 years agoFix deprecation warnings
href [Fri, 30 Nov 2018 10:35:10 +0000 (11:35 +0100)]
Fix deprecation warnings

5 years agoremove eal
href [Thu, 29 Nov 2018 20:37:32 +0000 (21:37 +0100)]
remove eal

i like you eal don't take it personally<3

5 years agoUploads fun, part. 2
href [Thu, 29 Nov 2018 20:11:45 +0000 (21:11 +0100)]
Uploads fun, part. 2

5 years agoreverse_proxy: more headers
href [Fri, 23 Nov 2018 22:59:24 +0000 (23:59 +0100)]
reverse_proxy: more headers

5 years agoParse correctly content-type & do not forward content-length
href [Fri, 23 Nov 2018 17:57:27 +0000 (18:57 +0100)]
Parse correctly content-type & do not forward content-length

5 years agoreverse proxy / uploads
href [Fri, 23 Nov 2018 16:40:45 +0000 (17:40 +0100)]
reverse proxy / uploads

5 years agoMerge remote-tracking branch 'origin' into validate-user-info
lain [Fri, 30 Nov 2018 16:34:20 +0000 (17:34 +0100)]
Merge remote-tracking branch 'origin' into validate-user-info

5 years agoFix transmogrifier test.
lain [Fri, 30 Nov 2018 16:31:05 +0000 (17:31 +0100)]
Fix transmogrifier test.

5 years agoFix OStatus user updates.
lain [Fri, 30 Nov 2018 16:21:58 +0000 (17:21 +0100)]
Fix OStatus user updates.

Breaks banner updating.

5 years agoAssorted fixes.
lain [Fri, 30 Nov 2018 16:08:02 +0000 (17:08 +0100)]
Assorted fixes.

5 years agoFix TwitterApiController.
lain [Fri, 30 Nov 2018 16:07:37 +0000 (17:07 +0100)]
Fix TwitterApiController.

5 years agoRemove "most recent notification" endpoint.
lain [Fri, 30 Nov 2018 15:47:37 +0000 (16:47 +0100)]
Remove "most recent notification" endpoint.

5 years agoMerge branch 'bugfix/server-true-in-prod' into 'develop'
kaniini [Fri, 30 Nov 2018 04:36:20 +0000 (04:36 +0000)]
Merge branch 'bugfix/server-true-in-prod' into 'develop'

config/prod.exs: Remove server: true

See merge request pleroma/pleroma!483

5 years agoconfig/prod.exs: Remove server: true
Haelwenn (lanodan) Monnier [Fri, 30 Nov 2018 02:05:34 +0000 (03:05 +0100)]
config/prod.exs: Remove server: true

This breaks mix tasks in regular Elixir

5 years agoMerge branch 'enable-ci-cache' into 'develop'
lambda [Thu, 29 Nov 2018 09:34:46 +0000 (09:34 +0000)]
Merge branch 'enable-ci-cache' into 'develop'

[CI] Enable CI caching for _build and deps

See merge request pleroma/pleroma!482

5 years agoOnly jobs for one branch are allowed to use the same cache
rinpatch [Thu, 29 Nov 2018 09:20:47 +0000 (12:20 +0300)]
Only jobs for one branch are allowed to use the same cache

5 years agoCache _build
rinpatch [Thu, 29 Nov 2018 09:09:32 +0000 (12:09 +0300)]
Cache _build

5 years agoAdd dependency caching
rinpatch [Thu, 29 Nov 2018 08:45:14 +0000 (11:45 +0300)]
Add dependency caching

5 years agoMore fixes
lain [Wed, 28 Nov 2018 23:25:43 +0000 (00:25 +0100)]
More fixes

5 years agoMerge branch 'fix-list-stream-privacy' into 'develop'
lambda [Wed, 28 Nov 2018 21:10:20 +0000 (21:10 +0000)]
Merge branch 'fix-list-stream-privacy' into 'develop'

Streamer: Don't send unwanted DMs to list streams

See merge request pleroma/pleroma!478

5 years agoMerge branch 'revert-02e43d44' into 'develop'
kaniini [Tue, 27 Nov 2018 23:20:12 +0000 (23:20 +0000)]
Merge branch 'revert-02e43d44' into 'develop'

Revert "Merge branch 'chore/mix-lock-update' into 'develop'"

See merge request pleroma/pleroma!481

5 years agoRevert "Merge branch 'chore/mix-lock-update' into 'develop'"
kaniini [Tue, 27 Nov 2018 23:19:30 +0000 (23:19 +0000)]
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"

This reverts merge request !480

5 years agoMerge branch 'chore/mix-lock-update' into 'develop'
kaniini [Tue, 27 Nov 2018 22:59:01 +0000 (22:59 +0000)]
Merge branch 'chore/mix-lock-update' into 'develop'

Add ex_doc & makeup_elixir to mix.lock

See merge request pleroma/pleroma!480

5 years agoAdd ex_doc & makeup_elixir to mix.lock
Maxim Filippov [Tue, 27 Nov 2018 22:12:06 +0000 (01:12 +0300)]
Add ex_doc & makeup_elixir to mix.lock

5 years agoStreamer: Don't send unwanted DMs to list streams
KokaKiwi [Tue, 27 Nov 2018 00:14:43 +0000 (01:14 +0100)]
Streamer: Don't send unwanted DMs to list streams

5 years agoFix ostatus test.
lain [Tue, 27 Nov 2018 17:37:46 +0000 (18:37 +0100)]
Fix ostatus test.

5 years agoWebfinger fixes.
lain [Tue, 27 Nov 2018 17:31:44 +0000 (18:31 +0100)]
Webfinger fixes.

5 years agoMore and more fixes.
lain [Tue, 27 Nov 2018 17:21:05 +0000 (18:21 +0100)]
More and more fixes.

5 years agoMore fixes.
lain [Tue, 27 Nov 2018 17:12:03 +0000 (18:12 +0100)]
More fixes.

5 years agoMerge branch 'fix/version-string-force-git-abbrev-size' into 'develop'
kaniini [Tue, 27 Nov 2018 17:10:08 +0000 (17:10 +0000)]
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

5 years agoMerge branch 'ogg-theora-detection' into 'develop'
kaniini [Tue, 27 Nov 2018 16:55:56 +0000 (16:55 +0000)]
Merge branch 'ogg-theora-detection' into 'develop'

Add Theora detection to upload.ex

See merge request pleroma/pleroma!479

5 years agoHTTP sig fixes.
lain [Tue, 27 Nov 2018 16:42:45 +0000 (17:42 +0100)]
HTTP sig fixes.

5 years agoFix CommonApi tests.
lain [Tue, 27 Nov 2018 16:31:14 +0000 (17:31 +0100)]
Fix CommonApi tests.

5 years ago Fix lint error
rinpatch [Tue, 27 Nov 2018 16:07:58 +0000 (19:07 +0300)]
 Fix lint error

5 years agoAdd Theora detection to upload.ex
rinpatch [Tue, 27 Nov 2018 11:34:29 +0000 (14:34 +0300)]
Add Theora detection to upload.ex

6 years agoMerge branch 'feature/mrf-user-allowlist' into 'develop'
Haelwenn [Tue, 27 Nov 2018 00:12:03 +0000 (00:12 +0000)]
Merge branch 'feature/mrf-user-allowlist' into 'develop'

MRF: user allowlist module

See merge request pleroma/pleroma!477

6 years agoMerge branch 'fix/pleromafe-title' into 'develop'
kaniini [Mon, 26 Nov 2018 23:59:30 +0000 (23:59 +0000)]
Merge branch 'fix/pleromafe-title' into 'develop'

Replace hardcoded <title>

See merge request pleroma/pleroma!476

6 years agoconfig: document mrf_user_allowlist
William Pitcock [Mon, 26 Nov 2018 23:54:46 +0000 (23:54 +0000)]
config: document mrf_user_allowlist

6 years agonodeinfo: add mrf_user_allowlist data
William Pitcock [Mon, 26 Nov 2018 23:42:24 +0000 (23:42 +0000)]
nodeinfo: add mrf_user_allowlist data

6 years agoMRF: add user allowlist module
William Pitcock [Mon, 26 Nov 2018 23:23:43 +0000 (23:23 +0000)]
MRF: add user allowlist module

6 years agoReplace this hardcoded <title>
Mark Felder [Mon, 26 Nov 2018 22:51:25 +0000 (22:51 +0000)]
Replace this hardcoded <title>

6 years agoMerge branch 'bugfix/csp-no-https' into 'develop'
kaniini [Mon, 26 Nov 2018 22:24:21 +0000 (22:24 +0000)]
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

6 years agoPlugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
Haelwenn (lanodan) Monnier [Mon, 26 Nov 2018 20:40:29 +0000 (21:40 +0100)]
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https

This fixes running mastofe with MIX_ENV=dev

6 years agoMerge branch 'add-manifest-src-to-csp' into 'develop'
Haelwenn [Mon, 26 Nov 2018 19:56:49 +0000 (19:56 +0000)]
Merge branch 'add-manifest-src-to-csp' into 'develop'

Add manifest-src to CSP to allow manifest.json

See merge request pleroma/pleroma!474

6 years agoAdd manifest-src to allow manifest.json
shibayashi [Mon, 26 Nov 2018 19:48:24 +0000 (20:48 +0100)]
Add manifest-src to allow manifest.json

6 years agoMerge branch 'bugfix/public-mastoapi-websocket' into 'develop'
kaniini [Sun, 25 Nov 2018 02:54:54 +0000 (02:54 +0000)]
Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'

Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints

See merge request pleroma/pleroma!471

6 years agoversion string: force git abbrev size to 8 chars
href [Sat, 24 Nov 2018 13:38:34 +0000 (14:38 +0100)]
version string: force git abbrev size to 8 chars

Fixes #389

Older git versions defaults to 7 chars.

6 years agoWeb.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 07:47:35 +0000 (08:47 +0100)]
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket

6 years agoWeb.Streamer: Get unauthenticated statuses representation
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 07:45:45 +0000 (08:45 +0100)]
Web.Streamer: Get unauthenticated statuses representation