akkoma
6 years agoFix delivery to CC.
lain [Sun, 18 Feb 2018 15:59:41 +0000 (16:59 +0100)]
Fix delivery to CC.

6 years agoSalmon is ok!
lain [Sun, 18 Feb 2018 15:15:04 +0000 (16:15 +0100)]
Salmon is ok!

6 years agoFederate non-public over ActivityPub only, do some better signing.
lain [Sun, 18 Feb 2018 15:05:25 +0000 (16:05 +0100)]
Federate non-public over ActivityPub only, do some better signing.

6 years agoDon't relay non-public messages.
lain [Sun, 18 Feb 2018 14:58:18 +0000 (15:58 +0100)]
Don't relay non-public messages.

6 years agoRespect visibility in API.
lain [Sun, 18 Feb 2018 14:50:34 +0000 (15:50 +0100)]
Respect visibility in API.

6 years agoDon't show unlisted in public.
lain [Sun, 18 Feb 2018 14:32:11 +0000 (15:32 +0100)]
Don't show unlisted in public.

6 years agoShow users their own posts in timeline.
lain [Sun, 18 Feb 2018 14:20:36 +0000 (15:20 +0100)]
Show users their own posts in timeline.

6 years agoActivityPub: Fallback for unhandled outgoing activities.
lain [Sun, 18 Feb 2018 14:20:03 +0000 (15:20 +0100)]
ActivityPub: Fallback for unhandled outgoing activities.

6 years agoCommonAPI: If no visibility is given, return parent visibility.
lain [Sun, 18 Feb 2018 14:04:26 +0000 (15:04 +0100)]
CommonAPI: If no visibility is given, return parent visibility.

6 years agoMastodonAPI: Post with visibility settings
lain [Sun, 18 Feb 2018 13:45:08 +0000 (14:45 +0100)]
MastodonAPI: Post with visibility settings

6 years agoHandle sensitive property.
lain [Sun, 18 Feb 2018 13:14:16 +0000 (14:14 +0100)]
Handle sensitive property.

6 years agoTransmogrify outgoing nsfw.
lain [Sun, 18 Feb 2018 13:07:13 +0000 (14:07 +0100)]
Transmogrify outgoing nsfw.

6 years agoActivityPub: Add conversation id.
lain [Sun, 18 Feb 2018 12:58:52 +0000 (13:58 +0100)]
ActivityPub: Add conversation id.

6 years agoMastodon StatusView: Return correct visibility.
lain [Sun, 18 Feb 2018 12:51:51 +0000 (13:51 +0100)]
Mastodon StatusView: Return correct visibility.

6 years agoTransmogrify outgoing hashtags.
lain [Sun, 18 Feb 2018 12:51:03 +0000 (13:51 +0100)]
Transmogrify outgoing hashtags.

6 years agoActually fix incoming attachments.
lain [Sun, 18 Feb 2018 12:03:40 +0000 (13:03 +0100)]
Actually fix incoming attachments.

6 years agoDrop unhandle activities.
lain [Sun, 18 Feb 2018 11:51:35 +0000 (12:51 +0100)]
Drop unhandle activities.

6 years agoTry to fetch AP user data first.
lain [Sun, 18 Feb 2018 11:27:05 +0000 (12:27 +0100)]
Try to fetch AP user data first.

6 years agoSwitch protocols to AP when post come in through AP.
lain [Sun, 18 Feb 2018 11:04:59 +0000 (12:04 +0100)]
Switch protocols to AP when post come in through AP.

6 years agoActivityPub: Make fake Create activities for objects without one.
lain [Sun, 18 Feb 2018 10:24:54 +0000 (11:24 +0100)]
ActivityPub: Make fake Create activities for objects without one.

6 years agoAdd mock.
lain [Sun, 18 Feb 2018 09:21:19 +0000 (10:21 +0100)]
Add mock.

6 years agoActivityPub: Handle incoming announces.
lain [Sat, 17 Feb 2018 20:57:31 +0000 (21:57 +0100)]
ActivityPub: Handle incoming announces.

6 years agoAdd test fixtures.
lain [Sat, 17 Feb 2018 20:56:52 +0000 (21:56 +0100)]
Add test fixtures.

6 years agoActivityPub: Fetch an object from an id.
lain [Sat, 17 Feb 2018 20:56:33 +0000 (21:56 +0100)]
ActivityPub: Fetch an object from an id.

6 years agoAcitvityPub: Outgoing Announces.
lain [Sat, 17 Feb 2018 19:47:45 +0000 (20:47 +0100)]
AcitvityPub: Outgoing Announces.

6 years agoActivityPub: Implement outgoing likes.
lain [Sat, 17 Feb 2018 19:22:14 +0000 (20:22 +0100)]
ActivityPub: Implement outgoing likes.

6 years agoActivityPub: Handle incoming likes.
lain [Sat, 17 Feb 2018 19:13:12 +0000 (20:13 +0100)]
ActivityPub: Handle incoming likes.

6 years agoActivityPub: Use shared inbox.
lain [Sat, 17 Feb 2018 17:39:12 +0000 (18:39 +0100)]
ActivityPub: Use shared inbox.

6 years agoActivityPub: Handle attachments.
lain [Sat, 17 Feb 2018 17:38:58 +0000 (18:38 +0100)]
ActivityPub: Handle attachments.

6 years agoHandle black name fields on incoming users.
lain [Sat, 17 Feb 2018 17:15:48 +0000 (18:15 +0100)]
Handle black name fields on incoming users.

6 years agoActivtyPub Delivery: Use shared inbox if possible.
lain [Sat, 17 Feb 2018 15:18:10 +0000 (16:18 +0100)]
ActivtyPub Delivery: Use shared inbox if possible.

6 years agoActivityPub: Send out Accept after Follow.
lain [Sat, 17 Feb 2018 15:08:55 +0000 (16:08 +0100)]
ActivityPub: Send out Accept after Follow.

6 years agoActivityPub: Partly handle incoming follows.
lain [Sat, 17 Feb 2018 13:55:44 +0000 (14:55 +0100)]
ActivityPub: Partly handle incoming follows.

6 years agoActivityPub: tags -> tag.
lain [Sat, 17 Feb 2018 13:20:53 +0000 (14:20 +0100)]
ActivityPub: tags -> tag.

6 years agoDo some transmogrifying for the output.
lain [Sat, 17 Feb 2018 13:11:20 +0000 (14:11 +0100)]
Do some transmogrifying for the output.

6 years agoFix specs.
lain [Sat, 17 Feb 2018 09:26:44 +0000 (10:26 +0100)]
Fix specs.

6 years agoAdd post activity fixture.
lain [Sat, 17 Feb 2018 08:48:42 +0000 (09:48 +0100)]
Add post activity fixture.

6 years agoActivityPub: Use recipients fields.
lain [Thu, 15 Feb 2018 19:32:07 +0000 (20:32 +0100)]
ActivityPub: Use recipients fields.

6 years agoActivityPubController: Handle inbox data.
lain [Thu, 15 Feb 2018 19:00:43 +0000 (20:00 +0100)]
ActivityPubController: Handle inbox data.

6 years agoTransmogrifier: Handle basic notice creation.
lain [Thu, 15 Feb 2018 19:00:06 +0000 (20:00 +0100)]
Transmogrifier: Handle basic notice creation.

6 years agoOstatusTest: Remove insert_or_update test (moved to User).
lain [Thu, 15 Feb 2018 18:59:40 +0000 (19:59 +0100)]
OstatusTest: Remove insert_or_update test (moved to User).

6 years agoActivityPub: Refactor create function.
lain [Thu, 15 Feb 2018 18:59:03 +0000 (19:59 +0100)]
ActivityPub: Refactor create function.

6 years agoHttpSignature Plug: Skip if already valid.
lain [Thu, 15 Feb 2018 18:58:26 +0000 (19:58 +0100)]
HttpSignature Plug: Skip if already valid.

6 years agoUserTest: Move insert_or_update test.
lain [Thu, 15 Feb 2018 18:58:12 +0000 (19:58 +0100)]
UserTest: Move insert_or_update test.

6 years agoMerge branch 'develop' into feature/activitypub
lain [Mon, 12 Feb 2018 09:24:15 +0000 (10:24 +0100)]
Merge branch 'develop' into feature/activitypub

6 years agoAdd missing support file.
lain [Mon, 12 Feb 2018 09:23:21 +0000 (10:23 +0100)]
Add missing support file.

6 years agoMake test output easier to read.
lain [Mon, 12 Feb 2018 09:13:54 +0000 (10:13 +0100)]
Make test output easier to read.

6 years agoFix some test warnings.
lain [Mon, 12 Feb 2018 08:33:01 +0000 (09:33 +0100)]
Fix some test warnings.

6 years agoMerge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop
lain [Mon, 12 Feb 2018 07:15:37 +0000 (08:15 +0100)]
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop

6 years agoFix spec.
lain [Mon, 12 Feb 2018 07:15:03 +0000 (08:15 +0100)]
Fix spec.

6 years agoupdate frontend
lain [Sun, 11 Feb 2018 19:58:08 +0000 (20:58 +0100)]
update frontend

6 years agoupdate frontend
lain [Sun, 11 Feb 2018 19:55:02 +0000 (20:55 +0100)]
update frontend

6 years agoActivityPub: Basic note federation with Mastodon.
lain [Sun, 11 Feb 2018 19:43:33 +0000 (20:43 +0100)]
ActivityPub: Basic note federation with Mastodon.

6 years agoTwitter Representers: Handle Mastodon attachments.
lain [Sun, 11 Feb 2018 16:21:06 +0000 (17:21 +0100)]
Twitter Representers: Handle Mastodon attachments.

6 years agoBasic AP user building.
Roger Braun [Sun, 11 Feb 2018 16:20:02 +0000 (17:20 +0100)]
Basic AP user building.

6 years agoMocks: Add mastodon user json example.
Roger Braun [Sun, 11 Feb 2018 16:19:06 +0000 (17:19 +0100)]
Mocks: Add mastodon user json example.

6 years agoMerge branch 'feature/instance-specific-panel' into 'develop'
lambda [Sun, 11 Feb 2018 09:32:48 +0000 (09:32 +0000)]
Merge branch 'feature/instance-specific-panel' into 'develop'

add instance specific panel

See merge request pleroma/pleroma!66

6 years agoMerge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into...
Hakaba Hitoyo [Sun, 11 Feb 2018 09:08:27 +0000 (18:08 +0900)]
Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into feature/instance-specific-panel

6 years agoMerge branch 'develop' into feature/activitypub
Roger Braun [Sun, 11 Feb 2018 08:50:55 +0000 (09:50 +0100)]
Merge branch 'develop' into feature/activitypub

6 years agoupdate frontend
Roger Braun [Fri, 9 Feb 2018 16:14:11 +0000 (17:14 +0100)]
update frontend

6 years agoprint <link rel="next"> element in atom.feed
hakabahitoyo [Fri, 9 Feb 2018 14:03:28 +0000 (23:03 +0900)]
print <link rel="next"> element in atom.feed

6 years agointroduce max_id parameter in feed.atom (debug)
Hakaba Hitoyo [Fri, 9 Feb 2018 12:46:05 +0000 (21:46 +0900)]
introduce max_id parameter in feed.atom (debug)

6 years agoUtilController: Fix statusnet config api compatibility.
Roger Braun [Fri, 9 Feb 2018 12:43:12 +0000 (13:43 +0100)]
UtilController: Fix statusnet config api compatibility.

6 years agointroduce max_id parameter in feed.atom
Hakaba Hitoyo [Fri, 9 Feb 2018 12:41:30 +0000 (21:41 +0900)]
introduce max_id parameter in feed.atom

6 years agoMerge branch 'develop' into 'develop'
lambda [Fri, 9 Feb 2018 08:57:54 +0000 (08:57 +0000)]
Merge branch 'develop' into 'develop'

action_fallback for OAuth Controller

See merge request pleroma/pleroma!63

6 years agoMerge branch 'fix/config-disable-chat' into 'develop'
lambda [Thu, 8 Feb 2018 18:18:28 +0000 (18:18 +0000)]
Merge branch 'fix/config-disable-chat' into 'develop'

Add config option for enabling/disabling chat.

See merge request pleroma/pleroma!58

6 years agoChanged fallback controller to handle all cases from OAuthController
Calv Collins [Thu, 8 Feb 2018 18:15:59 +0000 (18:15 +0000)]
Changed fallback controller to handle all cases from OAuthController

6 years agoMerge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
Calv Collins [Thu, 8 Feb 2018 16:58:31 +0000 (16:58 +0000)]
Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop

6 years agoCreate action_fallback for username/password incorrect input
Calv Collins [Thu, 8 Feb 2018 16:57:30 +0000 (16:57 +0000)]
Create action_fallback for username/password incorrect input

6 years agoFix compile errors on 1.4.5
Roger Braun [Thu, 8 Feb 2018 15:03:30 +0000 (16:03 +0100)]
Fix compile errors on 1.4.5

6 years agoupdate frontend
Roger Braun [Wed, 7 Feb 2018 12:44:52 +0000 (13:44 +0100)]
update frontend

6 years agoUpdate required Elixir version in README
eal [Mon, 5 Feb 2018 22:06:29 +0000 (00:06 +0200)]
Update required Elixir version in README

Also remove the erlang packages, they're specified in the Debian guide.

6 years agoMerge branch 'fix/no-image-upload-filetype' into 'develop'
eal [Mon, 5 Feb 2018 21:57:17 +0000 (21:57 +0000)]
Merge branch 'fix/no-image-upload-filetype' into 'develop'

Detect file type if none given.

See merge request pleroma/pleroma!62

6 years agoDetect file type if none given.
eal [Sun, 4 Feb 2018 13:14:08 +0000 (15:14 +0200)]
Detect file type if none given.

6 years agoadjust panel.html
Hakaba Hitoyo [Sat, 3 Feb 2018 15:31:46 +0000 (00:31 +0900)]
adjust panel.html

6 years agoadd backend default for instance specific panel
Hakaba Hitoyo [Sat, 3 Feb 2018 14:09:26 +0000 (23:09 +0900)]
add backend default for instance specific panel

6 years agoMerge branch 'move-backend-images' into 'develop'
lambda [Sat, 3 Feb 2018 13:05:20 +0000 (13:05 +0000)]
Merge branch 'move-backend-images' into 'develop'

Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60

6 years agoadd backend endpoint /images
Hakaba Hitoyo [Sat, 3 Feb 2018 11:52:01 +0000 (20:52 +0900)]
add backend endpoint /images

6 years agomove avi.png & banner.png from /priv/static/static to /priv/static/images
Hakaba Hitoyo [Sat, 3 Feb 2018 11:43:14 +0000 (20:43 +0900)]
move avi.png & banner.png from /priv/static/static to /priv/static/images

6 years agoAdd config option for enabling/disabling chat.
eal [Thu, 1 Feb 2018 17:23:26 +0000 (19:23 +0200)]
Add config option for enabling/disabling chat.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Fri, 2 Feb 2018 16:14:58 +0000 (17:14 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoUpdate frontend.
Roger Braun [Fri, 2 Feb 2018 16:14:23 +0000 (17:14 +0100)]
Update frontend.

6 years agoMerge branch 'feature/remote-follow' into 'develop'
lambda [Fri, 2 Feb 2018 07:33:09 +0000 (07:33 +0000)]
Merge branch 'feature/remote-follow' into 'develop'

Add remote following of local profiles.

See merge request pleroma/pleroma!59

6 years agoAdd remote following of local profiles.
eal [Thu, 1 Feb 2018 22:00:48 +0000 (00:00 +0200)]
Add remote following of local profiles.

6 years agoTwitterAPI: Add is_local to user view.
eal [Thu, 1 Feb 2018 19:41:19 +0000 (21:41 +0200)]
TwitterAPI: Add is_local to user view.

6 years agoRevert renaming emoji.txt
eal [Wed, 31 Jan 2018 21:47:42 +0000 (23:47 +0200)]
Revert renaming emoji.txt

6 years agoMerge branch 'feature/instance-thumbnail-api' into 'develop'
eal [Wed, 31 Jan 2018 18:34:52 +0000 (18:34 +0000)]
Merge branch 'feature/instance-thumbnail-api' into 'develop'

Provide instance thumbnail in /api/v1/instance

See merge request pleroma/pleroma!55

6 years agoMerge branch 'fix/split-custom-emoji' into 'develop'
lambda [Wed, 31 Jan 2018 15:24:36 +0000 (15:24 +0000)]
Merge branch 'fix/split-custom-emoji' into 'develop'

Split emoji to default and custom.

See merge request pleroma/pleroma!56

6 years agoSplit emoji to default and custom.
eal [Wed, 31 Jan 2018 14:23:31 +0000 (16:23 +0200)]
Split emoji to default and custom.

6 years agoprovide instance thumbnail at /api/v1/instance (debug)
Hakaba Hitoyo [Wed, 31 Jan 2018 14:09:47 +0000 (23:09 +0900)]
provide instance thumbnail at /api/v1/instance (debug)

6 years agoprovide instance thumbnail at /api/v1/instance (debug)
Hakaba Hitoyo [Wed, 31 Jan 2018 14:04:34 +0000 (23:04 +0900)]
provide instance thumbnail at /api/v1/instance (debug)

6 years agoprovide instance thumbnail at /api/v1/instance (debug)
Hakaba Hitoyo [Wed, 31 Jan 2018 13:57:43 +0000 (22:57 +0900)]
provide instance thumbnail at /api/v1/instance (debug)

6 years agoprovide instance thumbnail at /api/v1/instance
Hakaba Hitoyo [Wed, 31 Jan 2018 13:51:25 +0000 (22:51 +0900)]
provide instance thumbnail at /api/v1/instance

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Tue, 30 Jan 2018 11:21:05 +0000 (12:21 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoMerge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
Roger Braun [Tue, 30 Jan 2018 11:20:39 +0000 (12:20 +0100)]
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop

6 years agoMake specs less breaky.
Roger Braun [Tue, 30 Jan 2018 11:20:14 +0000 (12:20 +0100)]
Make specs less breaky.

6 years agoFix specs.
Roger Braun [Tue, 30 Jan 2018 11:17:01 +0000 (12:17 +0100)]
Fix specs.

6 years agoprovide logo at feed.atom (debug)
Hakaba Hitoyo [Tue, 30 Jan 2018 10:37:04 +0000 (19:37 +0900)]
provide logo at feed.atom (debug)

6 years agoprovide logo at feed.atom
Hakaba Hitoyo [Tue, 30 Jan 2018 10:26:07 +0000 (19:26 +0900)]
provide logo at feed.atom

6 years agoMerge branch 'pr-upstream-http-proxy' into 'develop'
lambda [Tue, 30 Jan 2018 08:16:31 +0000 (08:16 +0000)]
Merge branch 'pr-upstream-http-proxy' into 'develop'

Pr upstream http proxy

See merge request pleroma/pleroma!43