akkoma
5 years agoupdate frontend
lain [Sat, 29 Dec 2018 13:30:44 +0000 (14:30 +0100)]
update frontend

5 years agoMerge branch 'carrot-bullying' into 'develop'
kaniini [Sat, 29 Dec 2018 11:46:06 +0000 (11:46 +0000)]
Merge branch 'carrot-bullying' into 'develop'

Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595

5 years agoChange 'name' to 'instance_name' so option is used when running non-interactive
spctrl [Sat, 29 Dec 2018 11:43:54 +0000 (12:43 +0100)]
Change 'name' to 'instance_name' so option is used when running non-interactive

5 years agoMerge branch '483_blocks_import_export' into 'develop'
kaniini [Sat, 29 Dec 2018 11:34:51 +0000 (11:34 +0000)]
Merge branch '483_blocks_import_export' into 'develop'

[#483] Blocked users list import & export

Closes #483

See merge request pleroma/pleroma!603

5 years agoMerge branch 'support/issue_480' into 'develop'
kaniini [Sat, 29 Dec 2018 11:32:24 +0000 (11:32 +0000)]
Merge branch 'support/issue_480' into 'develop'

[#480] Salmon# fixed publish an activity to remote accounts

See merge request pleroma/pleroma!605

5 years agoSalmon# fixed publish an activity to remote accounts
Maksim Pechnikov [Sat, 29 Dec 2018 09:48:54 +0000 (12:48 +0300)]
Salmon# fixed publish an activity to remote accounts

5 years ago[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added...
Ivan Tashkinov [Sat, 29 Dec 2018 09:26:23 +0000 (12:26 +0300)]
[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.

5 years ago[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added...
Ivan Tashkinov [Sat, 29 Dec 2018 09:26:23 +0000 (12:26 +0300)]
[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.

5 years ago[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
Ivan Tashkinov [Sat, 29 Dec 2018 09:15:46 +0000 (12:15 +0300)]
[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
(<nick>@<our_instance_host>).

5 years ago[#483] Refactored blocks and follows import, added tests.
Ivan Tashkinov [Sat, 29 Dec 2018 09:02:37 +0000 (12:02 +0300)]
[#483] Refactored blocks and follows import, added tests.

5 years agoMerge branch '471_invalid_accounts_rendering' into 'develop'
kaniini [Sat, 29 Dec 2018 03:03:18 +0000 (03:03 +0000)]
Merge branch '471_invalid_accounts_rendering' into 'develop'

[#471] Prevented rendering of inactive local accounts

Closes #471

See merge request pleroma/pleroma!599

5 years agoMerge branch 'systemd-drop-sysadmin-privilege' into 'develop'
kaniini [Fri, 28 Dec 2018 20:14:29 +0000 (20:14 +0000)]
Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'

Security/Drops the sysadmin privilege from the daemon

See merge request pleroma/pleroma!604

5 years agoSecurity/Drops the sysadmin privilege from the daemon
shibayashi [Fri, 28 Dec 2018 20:09:48 +0000 (21:09 +0100)]
Security/Drops the sysadmin privilege from the daemon

5 years ago[#483] Blocked users list import (TwitterAPI).
Ivan Tashkinov [Fri, 28 Dec 2018 20:01:03 +0000 (23:01 +0300)]
[#483] Blocked users list import (TwitterAPI).

5 years ago[#467] Refactored valid / invalid user rendering.
Ivan Tashkinov [Fri, 28 Dec 2018 19:47:42 +0000 (22:47 +0300)]
[#467] Refactored valid / invalid user rendering.

5 years agoRaise remote limit
lambda [Fri, 28 Dec 2018 18:57:50 +0000 (18:57 +0000)]
Raise remote limit

5 years agoMerge branch 'fix/no-attachment-links' into 'develop'
kaniini [Fri, 28 Dec 2018 18:33:14 +0000 (18:33 +0000)]
Merge branch 'fix/no-attachment-links' into 'develop'

Treat any present value in "no_attachment_links" as true

Closes pleroma-fe#175

See merge request pleroma/pleroma!597

5 years agoMerge branch 'fix/public-timeline-auth' into 'develop'
kaniini [Fri, 28 Dec 2018 18:30:36 +0000 (18:30 +0000)]
Merge branch 'fix/public-timeline-auth' into 'develop'

Fix Twitter timelines for private instances

See merge request pleroma/pleroma!602

5 years ago[#483] Blocked users export for TwitterAPI.
Ivan Tashkinov [Fri, 28 Dec 2018 18:08:07 +0000 (21:08 +0300)]
[#483] Blocked users export for TwitterAPI.

5 years agoWeb.TwitterAPI.UserView: Add rights.admin
Haelwenn (lanodan) Monnier [Sun, 23 Dec 2018 17:31:37 +0000 (18:31 +0100)]
Web.TwitterAPI.UserView: Add rights.admin

5 years ago[#471] Factored out User.visible_for?/2.
Ivan Tashkinov [Fri, 28 Dec 2018 11:35:25 +0000 (14:35 +0300)]
[#471] Factored out User.visible_for?/2.

5 years agoFix Twitter timelines for private instances
Vyr Cossont [Fri, 28 Dec 2018 06:43:40 +0000 (22:43 -0800)]
Fix Twitter timelines for private instances

5 years agoMerge branch '396_elixir_1.7' into 'develop'
Haelwenn [Thu, 27 Dec 2018 22:10:39 +0000 (22:10 +0000)]
Merge branch '396_elixir_1.7' into 'develop'

[#396] Required Elixir ~> 1.7.

Closes #396

See merge request pleroma/pleroma!600

5 years agoMerge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
kaniini [Thu, 27 Dec 2018 19:37:55 +0000 (19:37 +0000)]
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'

Create tombstone instead of object deletion

See merge request pleroma/pleroma!593

5 years agoMerge branch 'reserve-user-names' into 'develop'
kaniini [Thu, 27 Dec 2018 19:35:06 +0000 (19:35 +0000)]
Merge branch 'reserve-user-names' into 'develop'

Reserve a few user names

See merge request pleroma/pleroma!594

5 years agoMerge branch 'feature/exclude_reblogs' into 'develop'
kaniini [Thu, 27 Dec 2018 19:22:31 +0000 (19:22 +0000)]
Merge branch 'feature/exclude_reblogs' into 'develop'

Implement exclude_reblogs and include_rts

See merge request pleroma/pleroma!598

5 years ago[#396] Updated `ex_doc` version spec. Updated README to reflect Elixir version.
Ivan Tashkinov [Thu, 27 Dec 2018 13:32:47 +0000 (16:32 +0300)]
[#396] Updated `ex_doc` version spec. Updated README to reflect Elixir version.

5 years ago[Fixes #396] Required Elixir ~> 1.7.
Ivan Tashkinov [Thu, 27 Dec 2018 13:12:33 +0000 (16:12 +0300)]
[Fixes #396] Required Elixir ~> 1.7.

5 years ago[#471] Prevented rendering of inactive local accounts.
Ivan Tashkinov [Thu, 27 Dec 2018 12:46:18 +0000 (15:46 +0300)]
[#471] Prevented rendering of inactive local accounts.

5 years agoTreat only true and "true" as true
Maxim Filippov [Thu, 27 Dec 2018 10:21:04 +0000 (13:21 +0300)]
Treat only true and "true" as true

5 years agoSet ttl_interval to the seconds_valid time
vaartis [Thu, 27 Dec 2018 07:42:03 +0000 (07:42 +0000)]
Set ttl_interval to the seconds_valid time

5 years agoImplement exclude_reblogs and include_rts
Vyr Cossont [Thu, 27 Dec 2018 05:30:01 +0000 (21:30 -0800)]
Implement exclude_reblogs and include_rts

5 years agoTreat any present value in "no_attachment_links" as true
Maxim Filippov [Wed, 26 Dec 2018 23:39:41 +0000 (02:39 +0300)]
Treat any present value in "no_attachment_links" as true

5 years agoUp captcha timer to 60 secs again, save used captchas in cachex
Ekaterina Vaartis [Wed, 26 Dec 2018 21:12:20 +0000 (00:12 +0300)]
Up captcha timer to 60 secs again, save used captchas in cachex

5 years agoMerge branch 'fix/ci-set-mix-env-globally' into 'develop'
Haelwenn [Wed, 26 Dec 2018 20:11:07 +0000 (20:11 +0000)]
Merge branch 'fix/ci-set-mix-env-globally' into 'develop'

[CI] Set MIX_ENV to test in `variables` section instead of specifying it before the command. Fix `mix compile` compiling in dev env.

See merge request pleroma/pleroma!596

5 years ago[CI] Set MIX_ENV to test in `variables` section instead of specifying it before the...
Rin Toshaka [Wed, 26 Dec 2018 17:50:52 +0000 (18:50 +0100)]
[CI] Set MIX_ENV to test in `variables` section instead of specifying it before the command. Fix `mix compile` compiling in the dev env.

5 years agoAdd 'about' to restricted list.
lain [Wed, 26 Dec 2018 13:51:51 +0000 (14:51 +0100)]
Add 'about' to restricted list.

And correct pleromaFE config.

5 years agoAdd ~ to the list of restricted names.
lain [Wed, 26 Dec 2018 13:16:41 +0000 (14:16 +0100)]
Add ~ to the list of restricted names.

5 years agoExpose restricted names in nodeinfo.
lain [Wed, 26 Dec 2018 11:46:16 +0000 (12:46 +0100)]
Expose restricted names in nodeinfo.

5 years agoAdd some hard limits on inserted activities.
lain [Wed, 26 Dec 2018 11:39:35 +0000 (12:39 +0100)]
Add some hard limits on inserted activities.

5 years agoAdd test to check /object/:id does not leak the tombstone itself
Maxim Filippov [Tue, 25 Dec 2018 20:40:57 +0000 (23:40 +0300)]
Add test to check /object/:id does not leak the tombstone itself

5 years agoReserve a few user names
lain [Tue, 25 Dec 2018 19:09:27 +0000 (20:09 +0100)]
Reserve a few user names

These are all names that are used for domain.com/:route routes or projected to be.

5 years agoMerge branch 'legal-boilerplate' into 'develop'
lambda [Tue, 25 Dec 2018 17:53:48 +0000 (17:53 +0000)]
Merge branch 'legal-boilerplate' into 'develop'

Legal boilerplate

See merge request pleroma/pleroma!592

5 years agoFormat
Maxim Filippov [Tue, 25 Dec 2018 00:47:20 +0000 (03:47 +0300)]
Format

5 years agoRevert unneeded changes
Maxim Filippov [Tue, 25 Dec 2018 00:44:48 +0000 (03:44 +0300)]
Revert unneeded changes

5 years agoFix Activity test
Maxim Filippov [Tue, 25 Dec 2018 00:41:14 +0000 (03:41 +0300)]
Fix Activity test

5 years agoRemove unused test
Maxim Filippov [Tue, 25 Dec 2018 00:38:02 +0000 (03:38 +0300)]
Remove unused test

5 years agoRevert Activity tombstones, add ObjectTombstone struct
Maxim Filippov [Tue, 25 Dec 2018 00:00:06 +0000 (03:00 +0300)]
Revert Activity tombstones, add ObjectTombstone struct

5 years agoFix failing tests
Maxim Filippov [Mon, 24 Dec 2018 21:29:13 +0000 (00:29 +0300)]
Fix failing tests

5 years agoCapitalize "tombstone"
Maxim Filippov [Mon, 24 Dec 2018 17:09:18 +0000 (20:09 +0300)]
Capitalize "tombstone"

5 years agoCreate tombstone instead of object deletion
Maxim Filippov [Sun, 23 Dec 2018 23:25:36 +0000 (02:25 +0300)]
Create tombstone instead of object deletion

5 years agotests: add legal boilerplate
William Pitcock [Sun, 23 Dec 2018 20:11:29 +0000 (20:11 +0000)]
tests: add legal boilerplate

5 years agomix tasks: add legal boilerplate
William Pitcock [Sun, 23 Dec 2018 20:05:55 +0000 (20:05 +0000)]
mix tasks: add legal boilerplate

5 years agoadd license boilerplate to pleroma core
William Pitcock [Sun, 23 Dec 2018 20:04:54 +0000 (20:04 +0000)]
add license boilerplate to pleroma core

5 years agoMerge branch 'bugfix/trans_fix_url_videos' into 'develop'
lambda [Sun, 23 Dec 2018 14:46:58 +0000 (14:46 +0000)]
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'

Fix "url" of Videos in transmogrifier

Closes #367

See merge request pleroma/pleroma!459

5 years agotests: twitter api: add test proving that peertube videos are correctly handled
William Pitcock [Sun, 23 Dec 2018 13:59:06 +0000 (13:59 +0000)]
tests: twitter api: add test proving that peertube videos are correctly handled

5 years agotwitter api: add "Video" to supported activity types list
William Pitcock [Sun, 23 Dec 2018 13:58:45 +0000 (13:58 +0000)]
twitter api: add "Video" to supported activity types list

5 years agotests: twitter api: activity view test: enable tesla mock
William Pitcock [Sun, 23 Dec 2018 13:55:08 +0000 (13:55 +0000)]
tests: twitter api: activity view test: enable tesla mock

5 years agotwitter api: activity representer: remove peertube hack
William Pitcock [Sun, 23 Dec 2018 13:53:25 +0000 (13:53 +0000)]
twitter api: activity representer: remove peertube hack

5 years agotests: mastodon api: add test verifying that peertube videos are correctly rendered
William Pitcock [Sun, 23 Dec 2018 13:42:42 +0000 (13:42 +0000)]
tests: mastodon api: add test verifying that peertube videos are correctly rendered

5 years agomastodon api: status view: remove obsolete peertube hack
William Pitcock [Sun, 23 Dec 2018 13:40:33 +0000 (13:40 +0000)]
mastodon api: status view: remove obsolete peertube hack

5 years agotransmogrifier: significantly rework handling of peertube videos, add test
William Pitcock [Sun, 23 Dec 2018 13:28:17 +0000 (13:28 +0000)]
transmogrifier: significantly rework handling of peertube videos, add test

5 years agoMerge branch 'hotfix/activity-without-content' into 'develop'
lambda [Sun, 23 Dec 2018 13:17:25 +0000 (13:17 +0000)]
Merge branch 'hotfix/activity-without-content' into 'develop'

Twitter ActivityView: fix crash with activity without content

See merge request pleroma/pleroma!572

5 years agotransmogrifier: When it’s a Video move "url" to "attachment"
Haelwenn (lanodan) Monnier [Sat, 17 Nov 2018 17:34:45 +0000 (18:34 +0100)]
transmogrifier: When it’s a Video move "url" to "attachment"

5 years agoMerge branch 'feature/hellthread-mitigation' into 'develop'
kaniini [Sun, 23 Dec 2018 11:28:43 +0000 (11:28 +0000)]
Merge branch 'feature/hellthread-mitigation' into 'develop'

implement hellthread mitigation

Closes #474

See merge request pleroma/pleroma!588

5 years agoImplement kaniini's tweaks
Karen Konou [Sun, 23 Dec 2018 11:24:53 +0000 (12:24 +0100)]
Implement kaniini's tweaks

5 years agoRenamed the things
Karen Konou [Sun, 23 Dec 2018 10:14:29 +0000 (11:14 +0100)]
Renamed the things

5 years agoAdd documentation
Karen Konou [Sun, 23 Dec 2018 09:41:56 +0000 (10:41 +0100)]
Add documentation

5 years agoFix formatting
Karen Konou [Sat, 22 Dec 2018 22:32:38 +0000 (23:32 +0100)]
Fix formatting

5 years agoImplement large thread filter
Karen Konou [Sat, 22 Dec 2018 22:18:31 +0000 (23:18 +0100)]
Implement large thread filter

5 years agoSpecifically disable captcha for automatic tests, it makes them fail
Ekaterina Vaartis [Sat, 22 Dec 2018 20:07:44 +0000 (23:07 +0300)]
Specifically disable captcha for automatic tests, it makes them fail

5 years agoMove the encryption out of kocaptcha into general captcha module
Ekaterina Vaartis [Sat, 22 Dec 2018 19:39:08 +0000 (22:39 +0300)]
Move the encryption out of kocaptcha into general captcha module

That way there won't be a need to reimplement it for other captcha services

5 years agoMake captcha (kocaptcha) stateless
Ekaterina Vaartis [Thu, 20 Dec 2018 21:32:37 +0000 (00:32 +0300)]
Make captcha (kocaptcha) stateless

Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed

5 years agoMerge branch 'ci-test-fix' into 'develop'
lambda [Thu, 20 Dec 2018 16:31:08 +0000 (16:31 +0000)]
Merge branch 'ci-test-fix' into 'develop'

SetUserSessionIdPlugTest: try again to fix random ci failures

See merge request pleroma/pleroma!579

5 years agoMerge branch '114_email_confirmation' into 'develop'
kaniini [Thu, 20 Dec 2018 13:28:36 +0000 (13:28 +0000)]
Merge branch '114_email_confirmation' into 'develop'

[#114] Email confirmation

See merge request pleroma/pleroma!546

5 years ago[#114] Fixed test.
Ivan Tashkinov [Thu, 20 Dec 2018 12:23:16 +0000 (15:23 +0300)]
[#114] Fixed test.

5 years ago[#114] Allowed unconfirmed users to authenticate if :account_activation_required...
Ivan Tashkinov [Thu, 20 Dec 2018 11:48:48 +0000 (14:48 +0300)]
[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.

5 years ago[#114] Added :user_id component to email confirmation path to improve the security.
Ivan Tashkinov [Thu, 20 Dec 2018 10:41:30 +0000 (13:41 +0300)]
[#114] Added :user_id component to email confirmation path to improve the security.
Added tests for `confirm_email` action.

5 years ago[#114] Removed flash messages rendering on redirects.
Ivan Tashkinov [Thu, 20 Dec 2018 10:05:42 +0000 (13:05 +0300)]
[#114] Removed flash messages rendering on redirects.

5 years ago[#114] Stylistic adjustments.
Ivan Tashkinov [Thu, 20 Dec 2018 09:55:12 +0000 (12:55 +0300)]
[#114] Stylistic adjustments.

5 years agoMerge branch 'support/issue_413' into 'develop'
kaniini [Thu, 20 Dec 2018 09:35:01 +0000 (09:35 +0000)]
Merge branch 'support/issue_413' into 'develop'

[#413] fix parse mentions

See merge request pleroma/pleroma!577

5 years ago[#413] fix parse mentions
Maksim [Thu, 20 Dec 2018 09:35:01 +0000 (09:35 +0000)]
[#413] fix parse mentions

5 years agoMerge branch 'fix/readme-md-config-typo' into 'develop'
kaniini [Thu, 20 Dec 2018 09:06:48 +0000 (09:06 +0000)]
Merge branch 'fix/readme-md-config-typo' into 'develop'

Fix config.md path in README

See merge request pleroma/pleroma!581

5 years agoFix config.md path in README
rinpatch [Thu, 20 Dec 2018 08:29:08 +0000 (11:29 +0300)]
Fix config.md path in README

5 years agoFix config.md path in README
rinpatch [Thu, 20 Dec 2018 04:20:13 +0000 (07:20 +0300)]
Fix config.md path in README

5 years agoMerge branch 'readme' into 'develop'
kaniini [Thu, 20 Dec 2018 04:12:50 +0000 (04:12 +0000)]
Merge branch 'readme' into 'develop'

Improve systemd service documentation

See merge request pleroma/pleroma!580

5 years agoMerge branch 'documentation/copy-pleroma-api' into 'develop'
kaniini [Thu, 20 Dec 2018 04:01:54 +0000 (04:01 +0000)]
Merge branch 'documentation/copy-pleroma-api' into 'develop'

Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints

See merge request pleroma/pleroma!571

5 years agoImprove systemd service documentation
Francis Dinh [Wed, 19 Dec 2018 21:06:05 +0000 (16:06 -0500)]
Improve systemd service documentation

Use `systemctl` instead of `service` since it's not guaranteed the
latter will be on the system (e.g. Arch does not have it).

5 years agodaaa8cd6 take two
href [Wed, 19 Dec 2018 19:14:33 +0000 (20:14 +0100)]
daaa8cd6 take two

5 years ago[#114] `mix format`
Ivan Tashkinov [Wed, 19 Dec 2018 16:03:39 +0000 (19:03 +0300)]
[#114] `mix format`

5 years ago[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive...
Ivan Tashkinov [Wed, 19 Dec 2018 15:56:52 +0000 (18:56 +0300)]
[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
unless requested by admin or moderator.

5 years ago[#114] User.register/1 tweak.
Ivan Tashkinov [Wed, 19 Dec 2018 14:24:55 +0000 (17:24 +0300)]
[#114] User.register/1 tweak.

5 years ago[#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
Ivan Tashkinov [Wed, 19 Dec 2018 13:27:16 +0000 (16:27 +0300)]
[#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`.

5 years ago[#114] User.Info: renamed `confirmation_update` to `confirmation_change`.
Ivan Tashkinov [Wed, 19 Dec 2018 13:27:16 +0000 (16:27 +0300)]
[#114] User.Info: renamed `confirmation_update` to `confirmation_change`.

5 years agoMerge branch 'userless-admin' into 'develop'
kaniini [Wed, 19 Dec 2018 00:12:39 +0000 (00:12 +0000)]
Merge branch 'userless-admin' into 'develop'

Add a way to use the admin api without a user.

See merge request pleroma/pleroma!576

5 years agoMerge branch 'fix/ci-cache-improved' into 'develop'
lambda [Tue, 18 Dec 2018 21:11:40 +0000 (21:11 +0000)]
Merge branch 'fix/ci-cache-improved' into 'develop'

Per-branch CI cache with force-recompilation of Pleroma

See merge request pleroma/pleroma!574

5 years agoMerge branch 'fix/formatter-ignore-html-chars' into 'develop'
lambda [Tue, 18 Dec 2018 20:23:21 +0000 (20:23 +0000)]
Merge branch 'fix/formatter-ignore-html-chars' into 'develop'

[#441] Fix characters converted to HTML being picked up by hashtag parser

See merge request pleroma/pleroma!575

5 years agoCompile pleroma before ecto migrate
Rin Toshaka [Tue, 18 Dec 2018 20:20:49 +0000 (21:20 +0100)]
Compile pleroma before ecto migrate

5 years agoAdd a way to use the admin api without a user.
lain [Tue, 18 Dec 2018 20:08:52 +0000 (21:08 +0100)]
Add a way to use the admin api without a user.

5 years agoImprove CI cache
Rin Toshaka [Tue, 18 Dec 2018 20:06:53 +0000 (21:06 +0100)]
Improve CI cache