akkoma
5 years agoUpdate instance.ex for web push
Rin Toshaka [Thu, 6 Dec 2018 17:16:51 +0000 (18:16 +0100)]
Update instance.ex for web push

5 years agoMerge develop
Rin Toshaka [Thu, 6 Dec 2018 17:11:22 +0000 (18:11 +0100)]
Merge develop

5 years agoRefactor common functions to common.ex
Rin Toshaka [Thu, 6 Dec 2018 17:01:28 +0000 (18:01 +0100)]
Refactor common functions to common.ex

5 years agoRefactor common functions to common.ex
Rin Toshaka [Thu, 6 Dec 2018 17:00:24 +0000 (18:00 +0100)]
Refactor common functions to common.ex

5 years agoremove migrate_local_uploads.ex
Rin Toshaka [Thu, 6 Dec 2018 16:35:33 +0000 (17:35 +0100)]
remove migrate_local_uploads.ex

5 years agoMerge branch 'fix/mastodon-api-settings' into 'develop'
kaniini [Thu, 6 Dec 2018 16:01:58 +0000 (16:01 +0000)]
Merge branch 'fix/mastodon-api-settings' into 'develop'

Fix put_settings and remove info_changeset

See merge request pleroma/pleroma!507

5 years agoMerge branch 'correct-and-improve-http-options' into 'develop'
kaniini [Thu, 6 Dec 2018 15:57:56 +0000 (15:57 +0000)]
Merge branch 'correct-and-improve-http-options' into 'develop'

Correct and improve http options

See merge request pleroma/pleroma!505

5 years agoMerge branch 're-mrf' into 'develop'
kaniini [Thu, 6 Dec 2018 15:36:41 +0000 (15:36 +0000)]
Merge branch 're-mrf' into 'develop'

Add a MRF Policy for appending re: to identical subjects in replies.

See merge request pleroma/pleroma!499

5 years agoMerge branch 'feature/compat/push-subscriptions' into 'develop'
kaniini [Thu, 6 Dec 2018 15:35:30 +0000 (15:35 +0000)]
Merge branch 'feature/compat/push-subscriptions' into 'develop'

Web Push Subscriptions

See merge request pleroma/pleroma!506

5 years agoMastoAPI: Fix put_settings
rinpatch [Thu, 6 Dec 2018 14:42:07 +0000 (17:42 +0300)]
MastoAPI: Fix put_settings

5 years agoRename regular expression 'have_re' to 'reply_prefix'.
scarlett [Thu, 6 Dec 2018 14:00:41 +0000 (14:00 +0000)]
Rename regular expression 'have_re' to 'reply_prefix'.

5 years agouse `User.avatar_url`
Egor Kislitsyn [Thu, 6 Dec 2018 13:55:46 +0000 (20:55 +0700)]
use `User.avatar_url`

5 years agocleanup
Egor Kislitsyn [Thu, 6 Dec 2018 13:50:20 +0000 (20:50 +0700)]
cleanup

5 years agoHarden re: detection.
scarlett [Thu, 6 Dec 2018 13:48:12 +0000 (13:48 +0000)]
Harden re: detection.

5 years agoclean up
Egor Kislitsyn [Thu, 6 Dec 2018 13:42:00 +0000 (20:42 +0700)]
clean up

5 years agoadd VAPID to test config
Egor Kislitsyn [Thu, 6 Dec 2018 13:17:00 +0000 (20:17 +0700)]
add VAPID to test config

5 years agoMerge branch 'develop' into feature/compat/push-subscriptions
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

5 years agoshow warning if VAPID is not set
Egor Kislitsyn [Thu, 6 Dec 2018 12:56:56 +0000 (19:56 +0700)]
show warning if VAPID is not set

5 years agoMerge branch 'develop' into feature/compat/push-subscriptions
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

5 years agoAdd web push support
Egor Kislitsyn [Thu, 6 Dec 2018 12:29:04 +0000 (19:29 +0700)]
Add web push support

5 years agoUse object.normalize.
scarlett [Thu, 6 Dec 2018 11:37:29 +0000 (11:37 +0000)]
Use object.normalize.

5 years agoavoid mix format bug
Hakaba Hitoyo [Thu, 6 Dec 2018 09:41:29 +0000 (18:41 +0900)]
avoid mix format bug

5 years agoMerge branch '210_twitter_api_uploads_alt_text' into 'develop'
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

5 years ago[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
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.

5 years agoremove follow_redirect options
Hakaba Hitoyo [Thu, 6 Dec 2018 02:38:33 +0000 (11:38 +0900)]
remove follow_redirect options

5 years agoremove pool and timeout options which duplicate with the default
Hakaba Hitoyo [Thu, 6 Dec 2018 02:23:15 +0000 (11:23 +0900)]
remove pool and timeout options which duplicate with the default

5 years agoMerge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve...
Hakaba Hitoyo [Thu, 6 Dec 2018 01:48:05 +0000 (10:48 +0900)]
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options

5 years agoMerge branch 'follower-hiding' into 'develop'
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

5 years agoMerge branch 'dev_vald_fe/data_tag' into 'develop'
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

5 years agoadded data attrs to twitter scrubber
Vald [Wed, 5 Dec 2018 20:44:56 +0000 (02:14 +0530)]
added data attrs to twitter scrubber

5 years agoFix merge.
lain [Wed, 5 Dec 2018 20:31:02 +0000 (21:31 +0100)]
Fix merge.

5 years agoMerge remote-tracking branch 'origin' into follower-hiding
lain [Wed, 5 Dec 2018 20:27:56 +0000 (21:27 +0100)]
Merge remote-tracking branch 'origin' into follower-hiding

5 years agoMastodonAPI: Show users their own network.
lain [Wed, 5 Dec 2018 20:25:06 +0000 (21:25 +0100)]
MastodonAPI: Show users their own network.

5 years agoresolved activity view test
Vald [Wed, 5 Dec 2018 20:24:04 +0000 (01:54 +0530)]
resolved activity view test

5 years agolint
Vald [Wed, 5 Dec 2018 20:16:53 +0000 (01:46 +0530)]
lint

5 years agoresolved api and controller test failures
Vald [Wed, 5 Dec 2018 20:16:30 +0000 (01:46 +0530)]
resolved api and controller test failures

5 years agoTwitterAPI: Show users their own network.
lain [Wed, 5 Dec 2018 20:14:06 +0000 (21:14 +0100)]
TwitterAPI: Show users their own network.

5 years agolinting
Vald [Wed, 5 Dec 2018 19:58:52 +0000 (01:28 +0530)]
linting

5 years agoresolved formatter_test failures
Vald [Wed, 5 Dec 2018 19:57:08 +0000 (01:27 +0530)]
resolved formatter_test failures

5 years agoadded data attrs for user and tag
Vald [Wed, 5 Dec 2018 19:35:41 +0000 (01:05 +0530)]
added data attrs for user and tag

5 years ago[#210] Stylistic change.
Ivan Tashkinov [Wed, 5 Dec 2018 18:48:21 +0000 (21:48 +0300)]
[#210] Stylistic change.

5 years agoTwitterAPI: Add network hiding.
lain [Wed, 5 Dec 2018 18:22:40 +0000 (19:22 +0100)]
TwitterAPI: Add network hiding.

5 years agoformating
Rin Toshaka [Wed, 5 Dec 2018 18:12:23 +0000 (19:12 +0100)]
formating

5 years agoEverything should use Mix.Task.Run
Rin Toshaka [Wed, 5 Dec 2018 18:05:37 +0000 (19:05 +0100)]
Everything should use Mix.Task.Run

5 years agoMerge branch 'support/oauth_fetch_token' into 'develop'
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

5 years agoMerge branch 'fix/mix-tasks-userinfo' into 'develop'
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

5 years ago[#210] Stylistic change.
Ivan Tashkinov [Wed, 5 Dec 2018 17:23:28 +0000 (20:23 +0300)]
[#210] Stylistic change.

5 years agoMove relay tasks to relay.ex
Rin Toshaka [Wed, 5 Dec 2018 17:11:59 +0000 (18:11 +0100)]
Move relay tasks to relay.ex

5 years agoSwitch from User.info_changeset because it is deprecated
Rin Toshaka [Wed, 5 Dec 2018 16:58:26 +0000 (17:58 +0100)]
Switch from User.info_changeset because it is deprecated

5 years agoSorry
Rin Toshaka [Wed, 5 Dec 2018 15:44:15 +0000 (16:44 +0100)]
Sorry

5 years agoUpdate mix tasks since User.info.info_changeset is deprecated
Rin Toshaka [Wed, 5 Dec 2018 15:41:50 +0000 (16:41 +0100)]
Update mix tasks since User.info.info_changeset is deprecated

5 years agofix/273
Maksim Pechnikov [Wed, 5 Dec 2018 14:29:49 +0000 (17:29 +0300)]
fix/273

5 years agoMerge develop to refactor/mix-tasks
Rin Toshaka [Wed, 5 Dec 2018 13:16:55 +0000 (14:16 +0100)]
Merge develop to refactor/mix-tasks

5 years ago[#210] Formatting fix.
Ivan Tashkinov [Wed, 5 Dec 2018 10:43:00 +0000 (13:43 +0300)]
[#210] Formatting fix.

5 years ago[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check
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.

5 years ago[#210] Test update (replaced bang- with non-bang method).
Ivan Tashkinov [Wed, 5 Dec 2018 08:56:31 +0000 (11:56 +0300)]
[#210] Test update (replaced bang- with non-bang method).

5 years ago[#210] Further refactoring.
Ivan Tashkinov [Wed, 5 Dec 2018 08:48:50 +0000 (11:48 +0300)]
[#210] Further refactoring.

5 years agoMerge branch 'bugfix/408' into 'develop'
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

5 years agodebug /api/v1/suggestions
hakabahitoyo [Wed, 5 Dec 2018 07:08:34 +0000 (16:08 +0900)]
debug /api/v1/suggestions

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 agoAdd a MRF Policy for appending re: to identical subjects in replies.
scarlett [Tue, 4 Dec 2018 21:39:18 +0000 (21:39 +0000)]
Add a MRF Policy for appending re: to identical subjects in replies.

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 agochange new to gen in instance.ex . Refactor user.ex
Rin Toshaka [Tue, 4 Dec 2018 18:00:45 +0000 (19:00 +0100)]
change new to gen in instance.ex . Refactor user.ex

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

5 years ago[#210] Refactoring.
Ivan Tashkinov [Tue, 4 Dec 2018 16:45:09 +0000 (19:45 +0300)]
[#210] Refactoring.

5 years ago[#210] Refactoring.
Ivan Tashkinov [Tue, 4 Dec 2018 16:24:41 +0000 (19:24 +0300)]
[#210] Refactoring.

5 years ago[#210] TwitterAPI: implemented /api/media/metadata/create
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.

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 agoF O R M A T I N G
Rin Toshaka [Sun, 2 Dec 2018 19:27:49 +0000 (20:27 +0100)]
F O R M A T I N G

5 years agoMove generate_invite to user.ex
Rin Toshaka [Sun, 2 Dec 2018 19:26:15 +0000 (20:26 +0100)]
Move generate_invite to user.ex

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

5 years agoRefactor copypasta to a private function in instance.ex
Rin Toshaka [Sun, 2 Dec 2018 19:04:33 +0000 (20:04 +0100)]
Refactor copypasta to a private function in instance.ex

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 agoLint fix
Rin Toshaka [Sun, 2 Dec 2018 18:20:50 +0000 (19:20 +0100)]
Lint fix

5 years agoMove gen.instance to instance.ex
Rin Toshaka [Sun, 2 Dec 2018 18:18:06 +0000 (19:18 +0100)]
Move gen.instance to instance.ex

5 years agoTwitterAPI: Implement hide_network.
lain [Sun, 2 Dec 2018 17:14:13 +0000 (18:14 +0100)]
TwitterAPI: Implement hide_network.

5 years agoMove unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix plerom...
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.

5 years agoMastodonApi: Implement hide_network.
lain [Sun, 2 Dec 2018 16:48:00 +0000 (17:48 +0100)]
MastodonApi: Implement hide_network.