akkoma
6 years agoFix conflict
KANEKO Yoshitaka [Sun, 1 Apr 2018 07:58:35 +0000 (16:58 +0900)]
Fix conflict

6 years agorevert to modified pleroma fe
KANEKO Yoshitaka [Sun, 1 Apr 2018 07:28:17 +0000 (16:28 +0900)]
revert to modified pleroma fe

6 years agoMerge branch 'new-mastofe' into 'develop'
lambda [Sat, 31 Mar 2018 19:33:17 +0000 (19:33 +0000)]
Merge branch 'new-mastofe' into 'develop'

Bring Mastodon frontend up-to-date

See merge request pleroma/pleroma!87

6 years agoUse correct linefeed.
lain [Sat, 31 Mar 2018 19:14:33 +0000 (21:14 +0200)]
Use correct linefeed.

6 years agoSmall fix.
lain [Sat, 31 Mar 2018 19:11:46 +0000 (21:11 +0200)]
Small fix.

6 years agoFix typo.
lain [Sat, 31 Mar 2018 19:10:56 +0000 (21:10 +0200)]
Fix typo.

6 years agoModify newlines.
lain [Sat, 31 Mar 2018 19:09:58 +0000 (21:09 +0200)]
Modify newlines.

6 years agoRemove inspect.
lain [Sat, 31 Mar 2018 19:02:54 +0000 (21:02 +0200)]
Remove inspect.

6 years agoProper info.
lain [Sat, 31 Mar 2018 19:00:23 +0000 (21:00 +0200)]
Proper info.

6 years agoNo tabs.
lain [Sat, 31 Mar 2018 18:48:04 +0000 (20:48 +0200)]
No tabs.

6 years agoDon't fetch anything except ap_id for follower / following
lain [Sat, 31 Mar 2018 18:02:09 +0000 (20:02 +0200)]
Don't fetch anything except ap_id for follower / following
collections.

Should speed up the queries because ecto doesn't have to parse the json.

6 years agoGopher: Add like / repeat count.
lain [Sat, 31 Mar 2018 16:22:33 +0000 (18:22 +0200)]
Gopher: Add like / repeat count.

6 years agoRemove pl-dark-masto-fe, add preloading for common scripts
Morgan Bazalgette [Sat, 31 Mar 2018 17:14:47 +0000 (19:14 +0200)]
Remove pl-dark-masto-fe, add preloading for common scripts

6 years agoUpdate with mastofe repo
Morgan Bazalgette [Sat, 31 Mar 2018 17:14:05 +0000 (19:14 +0200)]
Update with mastofe repo

6 years agoBring Mastodon frontend up-to-date
Morgan Bazalgette [Sat, 31 Mar 2018 16:15:28 +0000 (18:15 +0200)]
Bring Mastodon frontend up-to-date

with my fork of it, @ https://git.pleroma.social/howl/mastofe .

6 years agoAdd gopher server.
lain [Sat, 31 Mar 2018 15:51:33 +0000 (17:51 +0200)]
Add gopher server.

6 years agoupdate frontend
lain [Sat, 31 Mar 2018 10:52:34 +0000 (12:52 +0200)]
update frontend

6 years agoRemove unused ActivityRepresenter module.
lain [Fri, 30 Mar 2018 14:50:30 +0000 (16:50 +0200)]
Remove unused ActivityRepresenter module.

6 years agoTwitterApiController: Use ActivityView.
lain [Fri, 30 Mar 2018 13:49:10 +0000 (15:49 +0200)]
TwitterApiController: Use ActivityView.

6 years agoTwApi ActivityView: Add delete activities.
lain [Fri, 30 Mar 2018 13:32:43 +0000 (15:32 +0200)]
TwApi ActivityView: Add delete activities.

6 years agoTwApi ActivityView: Add follows.
lain [Fri, 30 Mar 2018 13:17:13 +0000 (15:17 +0200)]
TwApi ActivityView: Add follows.

6 years agoFormat the code.
lain [Fri, 30 Mar 2018 13:01:53 +0000 (15:01 +0200)]
Format the code.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Fri, 30 Mar 2018 12:48:08 +0000 (14:48 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoTwApi ActivityView: Add announces.
lain [Fri, 30 Mar 2018 12:46:36 +0000 (14:46 +0200)]
TwApi ActivityView: Add announces.

6 years agoTwApi ActivityView: Add Like rendering.
lain [Fri, 30 Mar 2018 11:49:09 +0000 (13:49 +0200)]
TwApi ActivityView: Add Like rendering.

6 years agoAdd ActivityViewTest.
lain [Fri, 30 Mar 2018 10:57:55 +0000 (12:57 +0200)]
Add ActivityViewTest.

6 years agoFix TwApi reply visibility.
lain [Fri, 30 Mar 2018 10:19:57 +0000 (12:19 +0200)]
Fix TwApi reply visibility.

6 years agoMerge branch 'char-limit-mastofe' into 'develop'
lambda [Fri, 30 Mar 2018 06:31:06 +0000 (06:31 +0000)]
Merge branch 'char-limit-mastofe' into 'develop'

Add char_limit to initial-state of mastofe

See merge request pleroma/pleroma!86

6 years agoAdd char_limit to initial-state of mastofe
Morgan Bazalgette [Thu, 29 Mar 2018 22:59:49 +0000 (00:59 +0200)]
Add char_limit to initial-state of mastofe

6 years agoClean up prod.exs a bit.
lain [Wed, 28 Mar 2018 14:03:42 +0000 (16:03 +0200)]
Clean up prod.exs a bit.

6 years agoUpdate pleroma.nginx
lambda [Wed, 28 Mar 2018 09:34:08 +0000 (09:34 +0000)]
Update pleroma.nginx

6 years agoDon't go through all available emoji.
lain [Wed, 28 Mar 2018 07:56:32 +0000 (09:56 +0200)]
Don't go through all available emoji.

object carry their emoji information.

6 years agoAdd basic activity view.
lain [Tue, 27 Mar 2018 20:24:19 +0000 (22:24 +0200)]
Add basic activity view.

6 years agoReturn version in instance endpoint, set version to 0.9.0.
lain [Tue, 27 Mar 2018 18:09:01 +0000 (20:09 +0200)]
Return version in instance endpoint, set version to 0.9.0.

6 years agoFix migration.
lain [Tue, 27 Mar 2018 17:59:54 +0000 (19:59 +0200)]
Fix migration.

6 years agoDrop index for 'local', it confuses the query planner.
lain [Tue, 27 Mar 2018 17:48:01 +0000 (19:48 +0200)]
Drop index for 'local', it confuses the query planner.

6 years agoReduce OP fetching queries.
lain [Tue, 27 Mar 2018 16:18:24 +0000 (18:18 +0200)]
Reduce OP fetching queries.

6 years agoDon't try to fetch OP if none is there.
lain [Tue, 27 Mar 2018 15:43:08 +0000 (17:43 +0200)]
Don't try to fetch OP if none is there.

6 years agoMore Jason changes.
lain [Tue, 27 Mar 2018 14:45:38 +0000 (16:45 +0200)]
More Jason changes.

6 years agoAdd missing types.
lain [Tue, 27 Mar 2018 14:10:41 +0000 (16:10 +0200)]
Add missing types.

6 years agoSwitch to Jason for json handling.
lain [Tue, 27 Mar 2018 14:09:08 +0000 (16:09 +0200)]
Switch to Jason for json handling.

It's twice as fast and will be the standard in the coming ecto.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Tue, 27 Mar 2018 13:22:54 +0000 (15:22 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoUpdate dependencies.
lain [Tue, 27 Mar 2018 13:22:09 +0000 (15:22 +0200)]
Update dependencies.

6 years agoMerge branch 'fix/hashtag-consistency' into 'develop'
lambda [Tue, 27 Mar 2018 06:27:12 +0000 (06:27 +0000)]
Merge branch 'fix/hashtag-consistency' into 'develop'

Include the '#' symbol into the hashtag link itself

See merge request pleroma/pleroma!85

6 years agoForgot to fix one of the links in a test
Francis Dinh [Tue, 27 Mar 2018 06:08:46 +0000 (02:08 -0400)]
Forgot to fix one of the links in a test

6 years agoUpdate tests to reflect hashtag link changes
Francis Dinh [Tue, 27 Mar 2018 06:07:07 +0000 (02:07 -0400)]
Update tests to reflect hashtag link changes

6 years agoInclude the '#' symbol into the link itself
Francis Dinh [Tue, 27 Mar 2018 06:00:04 +0000 (02:00 -0400)]
Include the '#' symbol into the link itself

6 years agoSpeed up follower query.
lain [Mon, 26 Mar 2018 08:31:22 +0000 (10:31 +0200)]
Speed up follower query.

6 years agoAdd index for user follower address.
lain [Mon, 26 Mar 2018 07:53:47 +0000 (09:53 +0200)]
Add index for user follower address.

6 years agoFix atom feed pagination.
lain [Mon, 26 Mar 2018 07:51:43 +0000 (09:51 +0200)]
Fix atom feed pagination.

6 years agoFix follower collection id.
lain [Sun, 25 Mar 2018 17:34:33 +0000 (19:34 +0200)]
Fix follower collection id.

6 years agoReturn "audio" info in mastodon api.
lain [Sun, 25 Mar 2018 15:08:54 +0000 (17:08 +0200)]
Return "audio" info in mastodon api.

6 years agoMerge branch 'feature/oauth-token-password' into 'develop'
lambda [Sun, 25 Mar 2018 13:40:06 +0000 (13:40 +0000)]
Merge branch 'feature/oauth-token-password' into 'develop'

oauth: implement grant_type=password for single-page apps

See merge request pleroma/pleroma!81

6 years agoFix favicon and add to index.html
KANEKO Yoshitaka [Sun, 25 Mar 2018 10:58:12 +0000 (19:58 +0900)]
Fix favicon and add to index.html

6 years agoMerge branch 'bugfix/activitypub-hashtags' into 'develop'
lambda [Sat, 24 Mar 2018 21:49:41 +0000 (21:49 +0000)]
Merge branch 'bugfix/activitypub-hashtags' into 'develop'

activitypub transmogrifier: rewrite incoming hashtags

See merge request pleroma/pleroma!83

6 years agoactivitypub transmogrifier: rewrite incoming hashtags
William Pitcock [Sat, 24 Mar 2018 21:39:37 +0000 (21:39 +0000)]
activitypub transmogrifier: rewrite incoming hashtags

6 years agoFix tests.
lain [Sat, 24 Mar 2018 14:09:09 +0000 (15:09 +0100)]
Fix tests.

6 years agoUnify user fetching.
lain [Sat, 24 Mar 2018 14:02:43 +0000 (15:02 +0100)]
Unify user fetching.

6 years agoFetch the same data from json webfinger as from xml webfinger.
lain [Sat, 24 Mar 2018 13:45:21 +0000 (14:45 +0100)]
Fetch the same data from json webfinger as from xml webfinger.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 24 Mar 2018 10:03:33 +0000 (11:03 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoFix hashtags.
lain [Sat, 24 Mar 2018 10:03:10 +0000 (11:03 +0100)]
Fix hashtags.

6 years agoMerge branch 'fix-star-colour' into 'develop'
lambda [Sat, 24 Mar 2018 08:23:21 +0000 (08:23 +0000)]
Merge branch 'fix-star-colour' into 'develop'

mastofe: remove excess accent colours; fix the always-starred bug

See merge request pleroma/pleroma!80

6 years agooauth: implement grant_type=password for single-page apps
William Pitcock [Fri, 23 Mar 2018 20:50:34 +0000 (20:50 +0000)]
oauth: implement grant_type=password for single-page apps

6 years agomastofe: remove excess accent colours; fix the always-starred bug
Morgan Bazalgette [Fri, 23 Mar 2018 20:33:25 +0000 (21:33 +0100)]
mastofe: remove excess accent colours; fix the always-starred bug

6 years agoStrip html from emoji stuff.
lain [Fri, 23 Mar 2018 18:52:08 +0000 (19:52 +0100)]
Strip html from emoji stuff.

6 years agoFor outgoing objects, fake mastodon style ap id for ostatus.
lain [Fri, 23 Mar 2018 15:07:02 +0000 (16:07 +0100)]
For outgoing objects, fake mastodon style ap id for ostatus.

6 years agoMerge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
lain [Thu, 22 Mar 2018 11:48:56 +0000 (12:48 +0100)]
Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints

6 years agoClear caches on test.
lain [Thu, 22 Mar 2018 11:44:32 +0000 (12:44 +0100)]
Clear caches on test.

6 years agoFix test.
lain [Thu, 22 Mar 2018 11:37:24 +0000 (12:37 +0100)]
Fix test.

6 years agotests: webfinger: test quering a JSON response for activitypub actor URI
William Pitcock [Wed, 21 Mar 2018 19:23:09 +0000 (19:23 +0000)]
tests: webfinger: test quering a JSON response for activitypub actor URI

6 years agowebfinger: implement json response parsing
William Pitcock [Wed, 21 Mar 2018 18:53:36 +0000 (18:53 +0000)]
webfinger: implement json response parsing

6 years agowebfinger: attempt to fall back if LRDD template cannot be found
William Pitcock [Wed, 21 Mar 2018 18:06:41 +0000 (18:06 +0000)]
webfinger: attempt to fall back if LRDD template cannot be found

6 years agowebfinger: support JSON output
William Pitcock [Wed, 21 Mar 2018 17:58:31 +0000 (17:58 +0000)]
webfinger: support JSON output

6 years agoactivitypub: add outbox endpoint
William Pitcock [Thu, 22 Mar 2018 05:23:05 +0000 (05:23 +0000)]
activitypub: add outbox endpoint

6 years agoactivitypub: add restrict_limit
William Pitcock [Thu, 22 Mar 2018 04:47:18 +0000 (04:47 +0000)]
activitypub: add restrict_limit

6 years agoactivitypub: implement following/followers endpoints
William Pitcock [Wed, 21 Mar 2018 17:23:27 +0000 (17:23 +0000)]
activitypub: implement following/followers endpoints

6 years agoFetch relayed messages from source while we don't have linked data sigs.
lain [Wed, 21 Mar 2018 06:12:14 +0000 (07:12 +0100)]
Fetch relayed messages from source while we don't have linked data sigs.

6 years agoMerge branch 'feld-varnish' into 'develop'
lambda [Tue, 20 Mar 2018 06:00:01 +0000 (06:00 +0000)]
Merge branch 'feld-varnish' into 'develop'

Add example Varnish VCL

See merge request pleroma/pleroma!77

6 years agoMerge branch 'patch-README' into 'develop'
lambda [Tue, 20 Mar 2018 05:58:31 +0000 (05:58 +0000)]
Merge branch 'patch-README' into 'develop'

Update README.md

See merge request pleroma/pleroma!72

6 years agoMerge branch 'feld-mastoweb5000' into 'develop'
lambda [Tue, 20 Mar 2018 05:58:13 +0000 (05:58 +0000)]
Merge branch 'feld-mastoweb5000' into 'develop'

Set max characters for mastoweb compose field to 5000 to match pleroma default

See merge request pleroma/pleroma!74

6 years agoMerge branch 'feld-Logger' into 'develop'
lambda [Tue, 20 Mar 2018 05:57:47 +0000 (05:57 +0000)]
Merge branch 'feld-Logger' into 'develop'

Logging cleanup

See merge request pleroma/pleroma!76

6 years agoClarify vcl_synth is for all 301s we generate
Mark Felder [Tue, 20 Mar 2018 01:28:50 +0000 (01:28 +0000)]
Clarify vcl_synth is for all 301s we generate

6 years agoAdd ability to PURGE the cache
Mark Felder [Tue, 20 Mar 2018 01:24:58 +0000 (01:24 +0000)]
Add ability to PURGE the cache

Someday Pleroma will learn this skill :-)

6 years agoAdd example Varnish VCL
Mark Felder [Tue, 20 Mar 2018 01:12:40 +0000 (01:12 +0000)]
Add example Varnish VCL

6 years agoClarify that this error is about a problem decoding the expected JSON
Mark Felder [Mon, 19 Mar 2018 18:18:52 +0000 (18:18 +0000)]
Clarify that this error is about a problem decoding the expected JSON
payload

6 years agoLRDD, you are special and we love you too
Mark Felder [Mon, 19 Mar 2018 18:05:53 +0000 (18:05 +0000)]
LRDD, you are special and we love you too

6 years agocap again
Mark Felder [Mon, 19 Mar 2018 18:00:02 +0000 (18:00 +0000)]
cap again

6 years agostart with a capital
Mark Felder [Mon, 19 Mar 2018 17:58:45 +0000 (17:58 +0000)]
start with a capital

6 years agoAP again
Mark Felder [Mon, 19 Mar 2018 17:57:58 +0000 (17:57 +0000)]
AP again

6 years agoAP and WebFinger need love here
Mark Felder [Mon, 19 Mar 2018 17:56:49 +0000 (17:56 +0000)]
AP and WebFinger need love here

6 years agoMake XML feel special too
Mark Felder [Mon, 19 Mar 2018 17:51:31 +0000 (17:51 +0000)]
Make XML feel special too

6 years agoThis log message was do do 💩
Mark Felder [Mon, 19 Mar 2018 17:47:51 +0000 (17:47 +0000)]
This log message was do do ðŸ’©

6 years agoAnother WebSub CamelCase
Mark Felder [Mon, 19 Mar 2018 17:46:53 +0000 (17:46 +0000)]
Another WebSub CamelCase

6 years agoCapitalize Atom
Mark Felder [Mon, 19 Mar 2018 17:44:25 +0000 (17:44 +0000)]
Capitalize Atom

6 years agoCamelCase WebSub in log messages
Mark Felder [Mon, 19 Mar 2018 17:41:04 +0000 (17:41 +0000)]
CamelCase WebSub in log messages

6 years agoCapitalize start of log message
Mark Felder [Mon, 19 Mar 2018 17:39:12 +0000 (17:39 +0000)]
Capitalize start of log message

6 years agocapitalize Salmon protocol name
Mark Felder [Mon, 19 Mar 2018 17:38:54 +0000 (17:38 +0000)]
capitalize Salmon protocol name

6 years agoGrammar consistency
Mark Felder [Mon, 19 Mar 2018 17:31:58 +0000 (17:31 +0000)]
Grammar consistency

Most log messages are sentence fragments so make them consistent by
removing periods. Log messages that are expressing urgency with ! or
pending more work with "..." are OK.

6 years agoap -> AP for consistency
Mark Felder [Mon, 19 Mar 2018 17:28:06 +0000 (17:28 +0000)]
ap -> AP for consistency

6 years agoUse connection pools.
lain [Mon, 19 Mar 2018 16:42:09 +0000 (17:42 +0100)]
Use connection pools.