Maksim Pechnikov [Tue, 4 Dec 2018 11:01:39 +0000 (14:01 +0300)]
update test
Maksim Pechnikov [Mon, 3 Dec 2018 18:37:55 +0000 (21:37 +0300)]
update test
Maksim Pechnikov [Mon, 3 Dec 2018 15:53:22 +0000 (18:53 +0300)]
update test
Maksim Pechnikov [Sun, 2 Dec 2018 19:05:28 +0000 (22:05 +0300)]
update test
Maksim Pechnikov [Sun, 2 Dec 2018 15:17:26 +0000 (18:17 +0300)]
add http requests mock
Maksim Pechnikov [Sun, 2 Dec 2018 14:08:36 +0000 (17:08 +0300)]
status_code -> status
Maksim Pechnikov [Sun, 2 Dec 2018 14:00:33 +0000 (17:00 +0300)]
fix http request in Salmon
Maksim Pechnikov [Sun, 2 Dec 2018 13:58:38 +0000 (16:58 +0300)]
WebSub fix test
Maksim Pechnikov [Sat, 1 Dec 2018 05:26:59 +0000 (08:26 +0300)]
init tesla and updated the http requests in Pleroma.Web.Websub
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
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
Maxim Filippov [Mon, 3 Dec 2018 15:59:50 +0000 (18:59 +0300)]
Parse bio for MastodonAPI
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
hakabahitoyo [Mon, 3 Dec 2018 04:24:25 +0000 (13:24 +0900)]
update-pleroma-frontend
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
Rin Toshaka [Sun, 2 Dec 2018 19:27:49 +0000 (20:27 +0100)]
F O R M A T I N G
Rin Toshaka [Sun, 2 Dec 2018 19:26:15 +0000 (20:26 +0100)]
Move generate_invite to user.ex
Maxim Filippov [Sun, 2 Dec 2018 19:08:53 +0000 (22:08 +0300)]
Format files
Rin Toshaka [Sun, 2 Dec 2018 19:04:33 +0000 (20:04 +0100)]
Refactor copypasta to a private function in instance.ex
Maxim Filippov [Sun, 2 Dec 2018 19:03:53 +0000 (22:03 +0300)]
Parse user's bio on register
Rin Toshaka [Sun, 2 Dec 2018 18:20:50 +0000 (19:20 +0100)]
Lint fix
Rin Toshaka [Sun, 2 Dec 2018 18:18:06 +0000 (19:18 +0100)]
Move gen.instance to instance.ex
lain [Sun, 2 Dec 2018 17:14:13 +0000 (18:14 +0100)]
TwitterAPI: Implement hide_network.
Rin Toshaka [Sun, 2 Dec 2018 17:05:59 +0000 (18:05 +0100)]
Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users.
lain [Sun, 2 Dec 2018 16:48:00 +0000 (17:48 +0100)]
MastodonApi: Implement hide_network.
lain [Sun, 2 Dec 2018 16:35:32 +0000 (17:35 +0100)]
Hide network in ap.
href [Sun, 2 Dec 2018 10:24:02 +0000 (11:24 +0100)]
Fix media proxy config defaults
lain [Sun, 2 Dec 2018 10:20:49 +0000 (11:20 +0100)]
Add uuid generation extension to sample_psql.eex.
lain [Sun, 2 Dec 2018 10:20:38 +0000 (11:20 +0100)]
Fix background updating / handling.
Rin Toshaka [Sun, 2 Dec 2018 09:01:17 +0000 (10:01 +0100)]
Lint fix
Rin Toshaka [Sun, 2 Dec 2018 08:36:31 +0000 (09:36 +0100)]
Add admin option to pleroma.user new. Add user existence checking to toggle_activated
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
rinpatch [Sat, 1 Dec 2018 15:55:52 +0000 (18:55 +0300)]
Move set_admin task to lib/mix/tasks/pleroma/user.ex
rinpatch [Sat, 1 Dec 2018 15:34:26 +0000 (18:34 +0300)]
Delete reactivate user task
rinpatch [Sat, 1 Dec 2018 15:33:53 +0000 (18:33 +0300)]
Fix toggle_deactivated to reactivate a deactivated user
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
rinpatch [Sat, 1 Dec 2018 15:12:27 +0000 (18:12 +0300)]
Attempt to resolve merge conflict
rinpatch [Sat, 1 Dec 2018 14:38:45 +0000 (17:38 +0300)]
replace try/catch with File.Exists? in dev.exs
lain [Sat, 1 Dec 2018 11:46:08 +0000 (12:46 +0100)]
More fixes for Info schema.
lain [Sat, 1 Dec 2018 11:00:53 +0000 (12:00 +0100)]
TwitterAPI: Fix banner and background update.
lain [Sat, 1 Dec 2018 11:00:33 +0000 (12:00 +0100)]
Genereate uuids for existing info fields.
lain [Sat, 1 Dec 2018 09:40:01 +0000 (10:40 +0100)]
Fix masto api user updating.
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
lain [Sat, 1 Dec 2018 08:03:16 +0000 (09:03 +0100)]
Fix admin api.
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
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.
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
href [Fri, 30 Nov 2018 18:12:03 +0000 (19:12 +0100)]
Reverse proxy: default max read duration at 30 secs.
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
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
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.
href [Fri, 30 Nov 2018 17:19:22 +0000 (18:19 +0100)]
Pleroma.Config.delete/1
href [Fri, 30 Nov 2018 16:56:28 +0000 (17:56 +0100)]
MIME: video/audio ogg detection
href [Fri, 30 Nov 2018 16:44:42 +0000 (17:44 +0100)]
Config docs
href [Fri, 30 Nov 2018 16:44:12 +0000 (17:44 +0100)]
Upload: bring back base_url
href [Fri, 30 Nov 2018 10:35:10 +0000 (11:35 +0100)]
Fix deprecation warnings
href [Thu, 29 Nov 2018 20:37:32 +0000 (21:37 +0100)]
remove eal
i like you eal don't take it personally<3
href [Thu, 29 Nov 2018 20:11:45 +0000 (21:11 +0100)]
Uploads fun, part. 2
href [Fri, 23 Nov 2018 22:59:24 +0000 (23:59 +0100)]
reverse_proxy: more headers
href [Fri, 23 Nov 2018 17:57:27 +0000 (18:57 +0100)]
Parse correctly content-type & do not forward content-length
href [Fri, 23 Nov 2018 16:40:45 +0000 (17:40 +0100)]
reverse proxy / uploads
lain [Fri, 30 Nov 2018 16:34:20 +0000 (17:34 +0100)]
Merge remote-tracking branch 'origin' into validate-user-info
lain [Fri, 30 Nov 2018 16:31:05 +0000 (17:31 +0100)]
Fix transmogrifier test.
lain [Fri, 30 Nov 2018 16:21:58 +0000 (17:21 +0100)]
Fix OStatus user updates.
Breaks banner updating.
lain [Fri, 30 Nov 2018 16:08:02 +0000 (17:08 +0100)]
Assorted fixes.
lain [Fri, 30 Nov 2018 16:07:37 +0000 (17:07 +0100)]
Fix TwitterApiController.
lain [Fri, 30 Nov 2018 15:47:37 +0000 (16:47 +0100)]
Remove "most recent notification" endpoint.
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
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
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
rinpatch [Thu, 29 Nov 2018 09:20:47 +0000 (12:20 +0300)]
Only jobs for one branch are allowed to use the same cache
rinpatch [Thu, 29 Nov 2018 09:09:32 +0000 (12:09 +0300)]
Cache _build
rinpatch [Thu, 29 Nov 2018 08:45:14 +0000 (11:45 +0300)]
Add dependency caching
lain [Wed, 28 Nov 2018 23:25:43 +0000 (00:25 +0100)]
More fixes
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
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
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
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
Maxim Filippov [Tue, 27 Nov 2018 22:12:06 +0000 (01:12 +0300)]
Add ex_doc & makeup_elixir to mix.lock
KokaKiwi [Tue, 27 Nov 2018 00:14:43 +0000 (01:14 +0100)]
Streamer: Don't send unwanted DMs to list streams
lain [Tue, 27 Nov 2018 17:37:46 +0000 (18:37 +0100)]
Fix ostatus test.
lain [Tue, 27 Nov 2018 17:31:44 +0000 (18:31 +0100)]
Webfinger fixes.
lain [Tue, 27 Nov 2018 17:21:05 +0000 (18:21 +0100)]
More and more fixes.
lain [Tue, 27 Nov 2018 17:12:03 +0000 (18:12 +0100)]
More fixes.
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
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
lain [Tue, 27 Nov 2018 16:42:45 +0000 (17:42 +0100)]
HTTP sig fixes.
lain [Tue, 27 Nov 2018 16:31:14 +0000 (17:31 +0100)]
Fix CommonApi tests.
rinpatch [Tue, 27 Nov 2018 16:07:58 +0000 (19:07 +0300)]
Fix lint error
rinpatch [Tue, 27 Nov 2018 11:34:29 +0000 (14:34 +0300)]
Add Theora detection to upload.ex
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
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
William Pitcock [Mon, 26 Nov 2018 23:54:46 +0000 (23:54 +0000)]
config: document mrf_user_allowlist
William Pitcock [Mon, 26 Nov 2018 23:42:24 +0000 (23:42 +0000)]
nodeinfo: add mrf_user_allowlist data
William Pitcock [Mon, 26 Nov 2018 23:23:43 +0000 (23:23 +0000)]
MRF: add user allowlist module
Mark Felder [Mon, 26 Nov 2018 22:51:25 +0000 (22:51 +0000)]
Replace this hardcoded <title>
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
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
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
shibayashi [Mon, 26 Nov 2018 19:48:24 +0000 (20:48 +0100)]
Add manifest-src to allow manifest.json
projects / akkoma / log