Egor Kislitsyn [Thu, 6 Dec 2018 13:55:46 +0000 (20:55 +0700)]
use `User.avatar_url`
Egor Kislitsyn [Thu, 6 Dec 2018 13:50:20 +0000 (20:50 +0700)]
cleanup
Egor Kislitsyn [Thu, 6 Dec 2018 13:42:00 +0000 (20:42 +0700)]
clean up
Egor Kislitsyn [Thu, 6 Dec 2018 13:17:00 +0000 (20:17 +0700)]
add VAPID to test config
Egor Kislitsyn [Thu, 6 Dec 2018 13:15:16 +0000 (20:15 +0700)]
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
Egor Kislitsyn [Thu, 6 Dec 2018 12:56:56 +0000 (19:56 +0700)]
show warning if VAPID is not set
Egor Kislitsyn [Thu, 6 Dec 2018 12:55:58 +0000 (19:55 +0700)]
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
Egor Kislitsyn [Thu, 6 Dec 2018 12:29:04 +0000 (19:29 +0700)]
Add web push support
kaniini [Thu, 6 Dec 2018 07:36:21 +0000 (07:36 +0000)]
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
Ivan Tashkinov [Thu, 6 Dec 2018 07:26:17 +0000 (10:26 +0300)]
[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
Refactoring.
kaniini [Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)]
Merge branch 'follower-hiding' into 'develop'
Network hiding
Closes #356
See merge request pleroma/pleroma!490
kaniini [Wed, 5 Dec 2018 20:47:44 +0000 (20:47 +0000)]
Merge branch 'dev_vald_fe/data_tag' into 'develop'
added data-user and data-tag attributes
Closes #410
See merge request pleroma/pleroma!504
Vald [Wed, 5 Dec 2018 20:44:56 +0000 (02:14 +0530)]
added data attrs to twitter scrubber
lain [Wed, 5 Dec 2018 20:31:02 +0000 (21:31 +0100)]
Fix merge.
lain [Wed, 5 Dec 2018 20:27:56 +0000 (21:27 +0100)]
Merge remote-tracking branch 'origin' into follower-hiding
lain [Wed, 5 Dec 2018 20:25:06 +0000 (21:25 +0100)]
MastodonAPI: Show users their own network.
Vald [Wed, 5 Dec 2018 20:24:04 +0000 (01:54 +0530)]
resolved activity view test
Vald [Wed, 5 Dec 2018 20:16:53 +0000 (01:46 +0530)]
lint
Vald [Wed, 5 Dec 2018 20:16:30 +0000 (01:46 +0530)]
resolved api and controller test failures
lain [Wed, 5 Dec 2018 20:14:06 +0000 (21:14 +0100)]
TwitterAPI: Show users their own network.
Vald [Wed, 5 Dec 2018 19:58:52 +0000 (01:28 +0530)]
linting
Vald [Wed, 5 Dec 2018 19:57:08 +0000 (01:27 +0530)]
resolved formatter_test failures
Vald [Wed, 5 Dec 2018 19:35:41 +0000 (01:05 +0530)]
added data attrs for user and tag
Ivan Tashkinov [Wed, 5 Dec 2018 18:48:21 +0000 (21:48 +0300)]
[#210] Stylistic change.
lain [Wed, 5 Dec 2018 18:22:40 +0000 (19:22 +0100)]
TwitterAPI: Add network hiding.
lambda [Wed, 5 Dec 2018 17:55:51 +0000 (17:55 +0000)]
Merge branch 'support/oauth_fetch_token' into 'develop'
[#273] bugfix/273
See merge request pleroma/pleroma!502
lambda [Wed, 5 Dec 2018 17:53:35 +0000 (17:53 +0000)]
Merge branch 'fix/mix-tasks-userinfo' into 'develop'
Update mix tasks that use User.info.info_changeset since it is deprecated
See merge request pleroma/pleroma!503
Ivan Tashkinov [Wed, 5 Dec 2018 17:23:28 +0000 (20:23 +0300)]
[#210] Stylistic change.
Rin Toshaka [Wed, 5 Dec 2018 15:44:15 +0000 (16:44 +0100)]
Sorry
Rin Toshaka [Wed, 5 Dec 2018 15:41:50 +0000 (16:41 +0100)]
Update mix tasks since User.info.info_changeset is deprecated
Maksim Pechnikov [Wed, 5 Dec 2018 14:29:49 +0000 (17:29 +0300)]
fix/273
Ivan Tashkinov [Wed, 5 Dec 2018 10:43:00 +0000 (13:43 +0300)]
[#210] Formatting fix.
Ivan Tashkinov [Wed, 5 Dec 2018 10:37:06 +0000 (13:37 +0300)]
[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
Ivan Tashkinov [Wed, 5 Dec 2018 08:56:31 +0000 (11:56 +0300)]
[#210] Test update (replaced bang- with non-bang method).
Ivan Tashkinov [Wed, 5 Dec 2018 08:48:50 +0000 (11:48 +0300)]
[#210] Further refactoring.
lambda [Wed, 5 Dec 2018 08:28:14 +0000 (08:28 +0000)]
Merge branch 'bugfix/408' into 'develop'
ensure user info is populated when registering users
See merge request pleroma/pleroma!500
William Pitcock [Wed, 5 Dec 2018 03:41:32 +0000 (03:41 +0000)]
tests: add regression test for bug #408
William Pitcock [Wed, 5 Dec 2018 03:35:41 +0000 (03:35 +0000)]
user: put default user info when registering a user
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
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.
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
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
William Pitcock [Tue, 4 Dec 2018 18:28:38 +0000 (18:28 +0000)]
MRF: simple policy: fix media removal
Maksim Pechnikov [Tue, 4 Dec 2018 16:43:00 +0000 (19:43 +0300)]
add test
Ivan Tashkinov [Tue, 4 Dec 2018 16:45:09 +0000 (19:45 +0300)]
[#210] Refactoring.
Ivan Tashkinov [Tue, 4 Dec 2018 16:24:41 +0000 (19:24 +0300)]
[#210] Refactoring.
Ivan Tashkinov [Tue, 4 Dec 2018 15:35:57 +0000 (18:35 +0300)]
[#210] TwitterAPI: implemented /api/media/metadata/create
to allow uploads description (alt text) setting.
Maksim Pechnikov [Tue, 4 Dec 2018 14:51:49 +0000 (17:51 +0300)]
remove httpoison_mock
Maksim Pechnikov [Tue, 4 Dec 2018 14:48:55 +0000 (17:48 +0300)]
formatting the code
Maksim Pechnikov [Tue, 4 Dec 2018 13:39:08 +0000 (16:39 +0300)]
all tests passed
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
Maxim Filippov [Sun, 2 Dec 2018 19:08:53 +0000 (22:08 +0300)]
Format files
Maxim Filippov [Sun, 2 Dec 2018 19:03:53 +0000 (22:03 +0300)]
Parse user's bio on register
lain [Sun, 2 Dec 2018 17:14:13 +0000 (18:14 +0100)]
TwitterAPI: Implement hide_network.
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.
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
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 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
projects / akkoma / log