akkoma
5 years agodocs/Clients.md: Add Social (GNOME)
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:39:29 +0000 (18:39 +0100)]
docs/Clients.md: Add Social (GNOME)

[ci skip]

5 years agodocs/Clients.md: Add per-type sections
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:28:25 +0000 (18:28 +0100)]
docs/Clients.md: Add per-type sections

helps differenciate between Electrons and others like Brutaldon.
[ci skip]

5 years agodocs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:20:10 +0000 (18:20 +0100)]
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore

5 years agoWIP: docs/Clients.md: Add documentation about clients supporting pleroma
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 04:50:08 +0000 (05:50 +0100)]
WIP: docs/Clients.md: Add documentation about clients supporting pleroma

[ci skip]

5 years agoMerge branch 'object-creation' into 'develop'
rinpatch [Sun, 10 Feb 2019 07:39:27 +0000 (07:39 +0000)]
Merge branch 'object-creation' into 'develop'

Do object insertion through Cachex

See merge request pleroma/pleroma!802

5 years agoMerge branch 'follow-enhancements' into 'develop'
kaniini [Sat, 9 Feb 2019 21:03:42 +0000 (21:03 +0000)]
Merge branch 'follow-enhancements' into 'develop'

Respect blocks in mass follow.

See merge request pleroma/pleroma!797

5 years agoDo object insertion through Cachex
lain [Sat, 9 Feb 2019 21:01:08 +0000 (22:01 +0100)]
Do object insertion through Cachex

So we don't flood our postgres logs with errors. Should also make things
slightly faster.

5 years agoDo autofollow first.
lain [Sat, 9 Feb 2019 12:39:57 +0000 (13:39 +0100)]
Do autofollow first.

5 years agoRespect blocks in mass follow.
lain [Sat, 9 Feb 2019 12:24:23 +0000 (13:24 +0100)]
Respect blocks in mass follow.

5 years agoMerge branch 'add-media-path-to-caddy-cache' into 'develop'
lambda [Sat, 9 Feb 2019 11:39:01 +0000 (11:39 +0000)]
Merge branch 'add-media-path-to-caddy-cache' into 'develop'

Add /media to Caddy cache

See merge request pleroma/pleroma!791

5 years agoAdd /media to Caddy cache
shibayashi [Sat, 9 Feb 2019 11:39:01 +0000 (11:39 +0000)]
Add /media to Caddy cache

5 years agoMerge branch 'feature/keyword-policy' into 'develop'
lambda [Sat, 9 Feb 2019 11:38:37 +0000 (11:38 +0000)]
Merge branch 'feature/keyword-policy' into 'develop'

Add keyword policy

See merge request pleroma/pleroma!794

5 years agooof
rinpatch [Sat, 9 Feb 2019 05:12:30 +0000 (08:12 +0300)]
oof

5 years agoAdd tests and fix a typo in docs
rinpatch [Fri, 8 Feb 2019 17:23:26 +0000 (20:23 +0300)]
Add tests and fix a typo in docs

5 years agoMerge branch 'fix/do-split-migration-for-local-users-only' into 'develop'
lambda [Fri, 8 Feb 2019 12:18:05 +0000 (12:18 +0000)]
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'

Split hide_network only for local users

See merge request pleroma/pleroma!781

5 years agofix typo in config.md
rinpatch [Fri, 8 Feb 2019 12:12:44 +0000 (15:12 +0300)]
fix typo in config.md

5 years agowow
rinpatch [Fri, 8 Feb 2019 12:12:13 +0000 (15:12 +0300)]
wow

5 years agoMerge branch 'mark-streaming-feature-for-ios-apps' into 'develop'
lambda [Fri, 8 Feb 2019 12:10:35 +0000 (12:10 +0000)]
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'

Mark streaming feature for iOS apps in readme

See merge request pleroma/pleroma!790

5 years agoMerge branch 'oauth2_strengthening' into 'develop'
lambda [Fri, 8 Feb 2019 12:09:43 +0000 (12:09 +0000)]
Merge branch 'oauth2_strengthening' into 'develop'

OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix

See merge request pleroma/pleroma!793

5 years agoWhat idiot did that? (me)
rinpatch [Fri, 8 Feb 2019 10:16:50 +0000 (13:16 +0300)]
What idiot did that? (me)

5 years agoMerge branch 'develop' into feature/keyword-policy
rinpatch [Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)]
Merge branch 'develop' into feature/keyword-policy

5 years agorename ftl_removal to federated_timeline_removal to keep consistent naming with Simpl...
rinpatch [Fri, 8 Feb 2019 10:12:09 +0000 (13:12 +0300)]
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy

5 years agoAdd default config for keyword policy
rinpatch [Fri, 8 Feb 2019 09:48:39 +0000 (12:48 +0300)]
Add default config for keyword policy

5 years agoAdd keyword policy
rinpatch [Fri, 8 Feb 2019 09:38:24 +0000 (12:38 +0300)]
Add keyword policy

5 years agoOAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach...
Ivan Tashkinov [Thu, 7 Feb 2019 19:14:06 +0000 (22:14 +0300)]
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.

(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).

5 years agomark streaming feature for ios apps in readme
hakabahitoyo [Thu, 7 Feb 2019 03:01:35 +0000 (12:01 +0900)]
mark streaming feature for ios apps in readme

5 years agoMerge branch 'remove-pawoo-apps-from-readme' into 'develop'
kaniini [Thu, 7 Feb 2019 02:19:52 +0000 (02:19 +0000)]
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'

Remove Pawoo apps from README.md

See merge request pleroma/pleroma!788

5 years agoMerge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'
kaniini [Thu, 7 Feb 2019 02:18:51 +0000 (02:18 +0000)]
Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'

Mark streaming feature for Apps in README.md

See merge request pleroma/pleroma!789

5 years agoMark streaming feature for Apps in README.md
hakabahitoyo [Thu, 7 Feb 2019 02:04:37 +0000 (11:04 +0900)]
Mark streaming feature for Apps in README.md

5 years agoUpdate README.md
Hakaba Hitoyo [Thu, 7 Feb 2019 01:15:27 +0000 (01:15 +0000)]
Update README.md

5 years agoMerge branch 'rename-followings' into 'develop'
kaniini [Wed, 6 Feb 2019 22:40:24 +0000 (22:40 +0000)]
Merge branch 'rename-followings' into 'develop'

hide_followings was renamed to hide_followers in the FE, but never synced up in the BE

See merge request pleroma/pleroma!787

5 years agohide_followings was renamed to hide_followers in the FE, but never synced up in the BE
Mark Felder [Wed, 6 Feb 2019 22:34:44 +0000 (22:34 +0000)]
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE

This was a dirty regex replace which worked on my server

5 years agoMerge branch 'bugfix/rich-media-card' into 'develop'
Haelwenn [Wed, 6 Feb 2019 18:39:13 +0000 (18:39 +0000)]
Merge branch 'bugfix/rich-media-card' into 'develop'

rich media cards: bugfixes and regression tests

See merge request pleroma/pleroma!785

5 years agotests: add a rich media card that contains all relevant fields
William Pitcock [Wed, 6 Feb 2019 18:27:55 +0000 (18:27 +0000)]
tests: add a rich media card that contains all relevant fields

5 years agoMerge branch 'add-admin-and-moderator-fields' into 'develop'
kaniini [Wed, 6 Feb 2019 18:19:47 +0000 (18:19 +0000)]
Merge branch 'add-admin-and-moderator-fields' into 'develop'

Add admin and moderator badges to user view and make their visibility configurable

See merge request pleroma/pleroma!767

5 years agotest: add some regression tests for the rich media card rendering
William Pitcock [Wed, 6 Feb 2019 18:12:26 +0000 (18:12 +0000)]
test: add some regression tests for the rich media card rendering

5 years agomastodon api: rich media: don't clobber %URI struct with a string
William Pitcock [Wed, 6 Feb 2019 18:02:15 +0000 (18:02 +0000)]
mastodon api: rich media: don't clobber %URI struct with a string

5 years agoMerge branch 'mr/exsyslogger-doc-and-format' into 'develop'
Haelwenn [Wed, 6 Feb 2019 18:02:10 +0000 (18:02 +0000)]
Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'

Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format.

See merge request pleroma/pleroma!784

5 years agoadds a couple of explicit examples for ExSyslogger
Michael Loftis [Wed, 6 Feb 2019 17:54:30 +0000 (17:54 +0000)]
adds a couple of explicit examples for ExSyslogger

5 years agoMerge branch 'fix/activitypub-user-view-badmap' into 'develop'
rinpatch [Wed, 6 Feb 2019 17:47:58 +0000 (17:47 +0000)]
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'

Fix if clause in activity_pub user_view

See merge request pleroma/pleroma!783

5 years agoFix if clause in activity_pub user_view
href [Wed, 6 Feb 2019 17:42:19 +0000 (18:42 +0100)]
Fix if clause in activity_pub user_view

5 years agorids the duplicate timestamp from default ExSyslogger config
Michael Loftis [Wed, 6 Feb 2019 17:34:09 +0000 (17:34 +0000)]
rids the duplicate timestamp from default ExSyslogger config

5 years agoSplit hide_networ only for local users
Maxim Filippov [Wed, 6 Feb 2019 10:41:31 +0000 (13:41 +0300)]
Split hide_networ only for local users

5 years agoMerge branch '2019-02-06-update-frontend' into 'develop'
lambda [Wed, 6 Feb 2019 09:47:36 +0000 (09:47 +0000)]
Merge branch '2019-02-06-update-frontend' into 'develop'

update frontend

See merge request pleroma/pleroma!780

5 years agoupdate frontend
lain [Wed, 6 Feb 2019 09:40:01 +0000 (10:40 +0100)]
update frontend

5 years agoAllow to configure visibility for admin and moderator badges
eugenijm [Mon, 4 Feb 2019 12:28:35 +0000 (15:28 +0300)]
Allow to configure visibility for admin and moderator badges

5 years agoAdd is_admin and is_moderator boolean fields to the user view
eugenijm [Mon, 4 Feb 2019 02:03:57 +0000 (05:03 +0300)]
Add is_admin and is_moderator boolean fields to the user view

5 years agoMerge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'
rinpatch [Tue, 5 Feb 2019 21:01:20 +0000 (21:01 +0000)]
Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'

rich media: parser: reject any data which cannot be explicitly encoded into JSON

Closes #596

See merge request pleroma/pleroma!779

5 years agorich media: parser: reject any data which cannot be explicitly encoded into JSON
William Pitcock [Tue, 5 Feb 2019 20:50:57 +0000 (20:50 +0000)]
rich media: parser: reject any data which cannot be explicitly encoded into JSON

5 years agoMerge branch 'fix-dm-index' into 'develop'
kaniini [Tue, 5 Feb 2019 20:27:31 +0000 (20:27 +0000)]
Merge branch 'fix-dm-index' into 'develop'

Massage index until it actually does the stuff we want.

See merge request pleroma/pleroma!772

5 years agoMerge branch 'feature/ap-c2s-whoami' into 'develop'
kaniini [Tue, 5 Feb 2019 20:26:31 +0000 (20:26 +0000)]
Merge branch 'feature/ap-c2s-whoami' into 'develop'

activitypub: c2s: add /api/ap/whoami endpoint for andstatus

See merge request pleroma/pleroma!773

5 years agoMerge branch 'testfix/twitter-api' into 'develop'
kaniini [Tue, 5 Feb 2019 20:13:38 +0000 (20:13 +0000)]
Merge branch 'testfix/twitter-api' into 'develop'

test: twitterapi: fix another possible test failure case

See merge request pleroma/pleroma!778

5 years agotest: twitterapi: fix another possible test failure case
William Pitcock [Tue, 5 Feb 2019 20:04:39 +0000 (20:04 +0000)]
test: twitterapi: fix another possible test failure case

5 years agoMerge branch 'feature/split-hide-network-v2' into 'develop'
kaniini [Tue, 5 Feb 2019 18:56:59 +0000 (18:56 +0000)]
Merge branch 'feature/split-hide-network-v2' into 'develop'

Split hide_network into hide_followers & hide_followings (fixed)

See merge request pleroma/pleroma!765

5 years agoMerge branch 'bugfix/rich-media-image-nil' into 'develop'
kaniini [Tue, 5 Feb 2019 18:53:43 +0000 (18:53 +0000)]
Merge branch 'bugfix/rich-media-image-nil' into 'develop'

mastodon api: fix rendering of cards without image URLs (closes #597)

Closes #597

See merge request pleroma/pleroma!777

5 years agotest: twitterapi: fix the test breakage for real
William Pitcock [Tue, 5 Feb 2019 18:49:02 +0000 (18:49 +0000)]
test: twitterapi: fix the test breakage for real

5 years agomastodon api: fix rendering of cards without image URLs (closes #597)
William Pitcock [Tue, 5 Feb 2019 18:30:27 +0000 (18:30 +0000)]
mastodon api: fix rendering of cards without image URLs (closes #597)

5 years agoMerge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
lambda [Tue, 5 Feb 2019 11:30:18 +0000 (11:30 +0000)]
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'

activitypub: transmogrifier: fix bare tags

See merge request pleroma/pleroma!774

5 years agoMerge branch 'patch-2' into 'develop'
lambda [Tue, 5 Feb 2019 11:29:20 +0000 (11:29 +0000)]
Merge branch 'patch-2' into 'develop'

ARGLE GARBLE

See merge request pleroma/pleroma!776

5 years agoMerge branch 'bugfix/rich-media-nil' into 'develop'
lambda [Tue, 5 Feb 2019 11:28:48 +0000 (11:28 +0000)]
Merge branch 'bugfix/rich-media-nil' into 'develop'

html: don't attempt to parse nil content

See merge request pleroma/pleroma!775

5 years agoFix SQL
Maxim Filippov [Tue, 5 Feb 2019 07:22:31 +0000 (10:22 +0300)]
Fix SQL

5 years agoARGLE GARBLE
witches.live [Tue, 5 Feb 2019 07:03:54 +0000 (07:03 +0000)]
ARGLE GARBLE

Update .gitignore

5 years agohtml: don't attempt to parse nil content
William Pitcock [Tue, 5 Feb 2019 05:06:17 +0000 (05:06 +0000)]
html: don't attempt to parse nil content

5 years agoactivitypub: transmogrifier: fix bare tags
William Pitcock [Tue, 5 Feb 2019 00:32:49 +0000 (00:32 +0000)]
activitypub: transmogrifier: fix bare tags

5 years agoactivitypub: c2s: add /api/ap/whoami endpoint for andstatus
William Pitcock [Mon, 4 Feb 2019 22:58:29 +0000 (22:58 +0000)]
activitypub: c2s: add /api/ap/whoami endpoint for andstatus

5 years agoMassage index until it actually does the stuff we want.
lain [Mon, 4 Feb 2019 22:47:29 +0000 (23:47 +0100)]
Massage index until it actually does the stuff we want.

Also makes the index a lot smoler.

5 years agoInitialize hide_network with false
Maxim Filippov [Mon, 4 Feb 2019 19:23:09 +0000 (22:23 +0300)]
Initialize hide_network with false

5 years agoMerge branch 'feature/mrf-tag' into 'develop'
Haelwenn [Mon, 4 Feb 2019 19:20:11 +0000 (19:20 +0000)]
Merge branch 'feature/mrf-tag' into 'develop'

MRF TagPolicy engine

See merge request pleroma/pleroma!768

5 years agoactivitypub: mrf: tag policy: fix force-unlisted and sandbox actions
William Pitcock [Mon, 4 Feb 2019 19:03:25 +0000 (19:03 +0000)]
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions

5 years agoactivitypub: mrf: tag policy: add support for subscription control
William Pitcock [Mon, 4 Feb 2019 17:48:48 +0000 (17:48 +0000)]
activitypub: mrf: tag policy: add support for subscription control

5 years agoMerge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
rinpatch [Mon, 4 Feb 2019 17:32:12 +0000 (17:32 +0000)]
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'

fix hellthread threshold deprecation warning

See merge request pleroma/pleroma!770

5 years agofix hellthread threshold deprecation warning
Karen Konou [Mon, 4 Feb 2019 17:26:56 +0000 (18:26 +0100)]
fix hellthread threshold deprecation warning

5 years agoactivitypub: mrf: tag policy: refactor the filtering hook a bit
William Pitcock [Mon, 4 Feb 2019 17:06:37 +0000 (17:06 +0000)]
activitypub: mrf: tag policy: refactor the filtering hook a bit

5 years agoactivitypub: mrf: tag policy: add support for processing follow requests
William Pitcock [Mon, 4 Feb 2019 17:03:34 +0000 (17:03 +0000)]
activitypub: mrf: tag policy: add support for processing follow requests

5 years agoactivitypub: mrf: tag policy: implement force-unlisted and sandbox
William Pitcock [Mon, 4 Feb 2019 15:55:20 +0000 (15:55 +0000)]
activitypub: mrf: tag policy: implement force-unlisted and sandbox

5 years agomrf: add initial MRF.TagPolicy engine
William Pitcock [Mon, 4 Feb 2019 02:35:46 +0000 (02:35 +0000)]
mrf: add initial MRF.TagPolicy engine

5 years agomix: add user tag/untag task
William Pitcock [Mon, 4 Feb 2019 02:33:11 +0000 (02:33 +0000)]
mix: add user tag/untag task

5 years agoMerge branch 'mime-riff' into 'develop'
kaniini [Mon, 4 Feb 2019 16:52:41 +0000 (16:52 +0000)]
Merge branch 'mime-riff' into 'develop'

Mime: detect RIFF formats (wave, webp, avi)

See merge request pleroma/pleroma!769

5 years agoMime: detect RIFF formats (wave, webp, avi)
href [Mon, 4 Feb 2019 16:44:41 +0000 (17:44 +0100)]
Mime: detect RIFF formats (wave, webp, avi)

5 years agoMerge branch 'fix/rich-media-relative-path' into 'develop'
rinpatch [Mon, 4 Feb 2019 16:01:34 +0000 (16:01 +0000)]
Merge branch 'fix/rich-media-relative-path' into 'develop'

Fix rich media relative path

Closes #588

See merge request pleroma/pleroma!759

5 years agoMerge branch 'feature/hellthread-filter-improvements' into 'develop'
rinpatch [Mon, 4 Feb 2019 12:36:50 +0000 (12:36 +0000)]
Merge branch 'feature/hellthread-filter-improvements' into 'develop'

Improve hellthread filter

Closes #584

See merge request pleroma/pleroma!766

5 years agoremoved a debug thingy
Karen Konou [Mon, 4 Feb 2019 11:22:25 +0000 (11:22 +0000)]
removed a debug thingy

5 years agosquished a bug
Karen Konou [Mon, 4 Feb 2019 11:09:00 +0000 (12:09 +0100)]
squished a bug

5 years agoactually commited the changes
Karen Konou [Mon, 4 Feb 2019 09:23:43 +0000 (10:23 +0100)]
actually commited the changes

5 years agofixed Map,put arguments, updated nomenclature
Karen Konou [Mon, 4 Feb 2019 09:23:07 +0000 (10:23 +0100)]
fixed Map,put arguments, updated nomenclature

5 years agomore tweaks, fixed silly mistakes...
Karen Konou [Sun, 3 Feb 2019 22:56:20 +0000 (23:56 +0100)]
more tweaks, fixed silly mistakes...

5 years agoimplemented tweaks
Karen Konou [Sun, 3 Feb 2019 21:46:06 +0000 (22:46 +0100)]
implemented tweaks

5 years agoMerge branch 'mogrify-orient' into 'develop'
kaniini [Sun, 3 Feb 2019 21:06:15 +0000 (21:06 +0000)]
Merge branch 'mogrify-orient' into 'develop'

Update Mogrify docs and warning for deprecated syntax

See merge request pleroma/pleroma!763

5 years agofixed things
Karen Konou [Sun, 3 Feb 2019 19:45:32 +0000 (20:45 +0100)]
fixed things

5 years agomade toggleable, added docs
Karen Konou [Sun, 3 Feb 2019 19:27:28 +0000 (20:27 +0100)]
made toggleable, added docs

5 years agoadded optional delist feature
Karen Konou [Sun, 3 Feb 2019 19:12:23 +0000 (20:12 +0100)]
added optional delist feature

5 years agoSplit hide_network into hide_followers & hide_followings (fixed)
Maxim Filippov [Sun, 3 Feb 2019 18:24:09 +0000 (21:24 +0300)]
Split hide_network into hide_followers & hide_followings (fixed)

5 years agoMerge branch '589-fix-cache' into 'develop'
lambda [Sun, 3 Feb 2019 18:19:40 +0000 (18:19 +0000)]
Merge branch '589-fix-cache' into 'develop'

Resolve "Update object cache on favs/boosts"

Closes #589

See merge request pleroma/pleroma!764

5 years agoUnbreak all the tests.
lain [Sun, 3 Feb 2019 17:54:39 +0000 (18:54 +0100)]
Unbreak all the tests.

5 years agoStill do caching in tests.
lain [Sun, 3 Feb 2019 17:28:14 +0000 (18:28 +0100)]
Still do caching in tests.

5 years agoUpdate Mogrify docs and warning for deprecated syntax to encourage
Mark Felder [Sun, 3 Feb 2019 16:39:42 +0000 (16:39 +0000)]
Update Mogrify docs and warning for deprecated syntax to encourage
users to enable both strip and auto-orient

5 years agoMerge branch '582_federation_retirement_optimization' into 'develop'
kaniini [Sun, 3 Feb 2019 15:47:55 +0000 (15:47 +0000)]
Merge branch '582_federation_retirement_optimization' into 'develop'

[#582] Optimized federation retirement by reducing the number of SQL calls

Closes #582

See merge request pleroma/pleroma!762

5 years ago[#582] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not...
Ivan Tashkinov [Sun, 3 Feb 2019 10:28:13 +0000 (13:28 +0300)]
[#582] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
Added tests.

5 years ago[#582] Optimized federation retirement by reducing the number of SQL calls
Ivan Tashkinov [Sun, 3 Feb 2019 09:41:27 +0000 (12:41 +0300)]
[#582] Optimized federation retirement by reducing the number of SQL calls
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).

5 years agoMerge branch 'fix/oauth-page-responsiveness' into 'develop'
rinpatch [Sat, 2 Feb 2019 10:48:35 +0000 (10:48 +0000)]
Merge branch 'fix/oauth-page-responsiveness' into 'develop'

Add responsive features to layout

Closes #564

See merge request pleroma/pleroma!760