Commit graph

1331 commits

Author SHA1 Message Date
lambda b9ee17a853 Merge branch 'char-limit-mastofe' into 'develop'
Add char_limit to initial-state of mastofe

See merge request pleroma/pleroma!86
2018-03-30 06:31:06 +00:00
Morgan Bazalgette 457e040473
Add char_limit to initial-state of mastofe 2018-03-30 00:59:49 +02:00
lain 6dc98aaf89 Clean up prod.exs a bit. 2018-03-28 16:03:42 +02:00
lambda f8f3abe1be Update pleroma.nginx 2018-03-28 09:34:08 +00:00
lain df8fc72491 Don't go through all available emoji.
object carry their emoji information.
2018-03-28 09:56:32 +02:00
lain e30752bc79 Add basic activity view. 2018-03-27 22:24:19 +02:00
lain 86058c9a88 Return version in instance endpoint, set version to 0.9.0. 2018-03-27 20:09:01 +02:00
lain 0abd8a6bad Fix migration. 2018-03-27 19:59:54 +02:00
lain b56bb88c02 Drop index for 'local', it confuses the query planner. 2018-03-27 19:48:01 +02:00
lain 37e5014d3e Reduce OP fetching queries. 2018-03-27 18:18:24 +02:00
lain ff7afe46b9 Don't try to fetch OP if none is there. 2018-03-27 17:43:08 +02:00
lain d2099c849d More Jason changes. 2018-03-27 16:45:38 +02:00
lain 527e803758 Add missing types. 2018-03-27 16:10:41 +02:00
lain fbc187ac15 Switch to Jason for json handling.
It's twice as fast and will be the standard in the coming ecto.
2018-03-27 16:09:08 +02:00
lain c6cd1a56f0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-03-27 15:22:54 +02:00
lain 20982ab4d0 Update dependencies. 2018-03-27 15:22:09 +02:00
lambda 2e683b10d5 Merge branch 'fix/hashtag-consistency' into 'develop'
Include the '#' symbol into the hashtag link itself

See merge request pleroma/pleroma!85
2018-03-27 06:27:12 +00:00
Francis Dinh 9556c8f6e7 Forgot to fix one of the links in a test 2018-03-27 02:08:46 -04:00
Francis Dinh 5ba2f4b6d8 Update tests to reflect hashtag link changes 2018-03-27 02:07:07 -04:00
Francis Dinh 61692c7efa Include the '#' symbol into the link itself 2018-03-27 02:00:04 -04:00
lain bd4926288e Speed up follower query. 2018-03-26 10:31:22 +02:00
lain 1d1271ca1e Add index for user follower address. 2018-03-26 09:53:47 +02:00
lain 46f63ea8af Fix atom feed pagination. 2018-03-26 09:51:43 +02:00
lain 2c1c221301 Fix follower collection id. 2018-03-25 19:34:33 +02:00
lain 09de76ad5a Return "audio" info in mastodon api. 2018-03-25 17:08:54 +02:00
lambda 809bffbb21 Merge branch 'feature/oauth-token-password' into 'develop'
oauth: implement grant_type=password for single-page apps

See merge request pleroma/pleroma!81
2018-03-25 13:40:06 +00:00
KANEKO Yoshitaka aa19fdef00 Fix favicon and add to index.html 2018-03-25 19:58:12 +09:00
lambda 47a5cc0dd9 Merge branch 'bugfix/activitypub-hashtags' into 'develop'
activitypub transmogrifier: rewrite incoming hashtags

See merge request pleroma/pleroma!83
2018-03-24 21:49:41 +00:00
William Pitcock 2aea3bc632 activitypub transmogrifier: rewrite incoming hashtags 2018-03-24 16:42:17 -05:00
lain 847cb15626 Fix tests. 2018-03-24 15:09:09 +01:00
lain c7be7a9454 Unify user fetching. 2018-03-24 15:02:43 +01:00
lain e3a81fe58f Fetch the same data from json webfinger as from xml webfinger. 2018-03-24 14:45:54 +01:00
lain d1ee3edd3c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-03-24 11:03:33 +01:00
lain eb7ce61ca5 Fix hashtags. 2018-03-24 11:03:10 +01:00
lambda c32058b3e2 Merge branch 'fix-star-colour' into 'develop'
mastofe: remove excess accent colours; fix the always-starred bug

See merge request pleroma/pleroma!80
2018-03-24 08:23:21 +00:00
William Pitcock dd21137f38 oauth: implement grant_type=password for single-page apps 2018-03-23 15:53:58 -05:00
Morgan Bazalgette ed22105e72
mastofe: remove excess accent colours; fix the always-starred bug 2018-03-23 21:33:25 +01:00
lain fbe9aa3506 Strip html from emoji stuff. 2018-03-23 19:52:08 +01:00
lain 5da2355e71 For outgoing objects, fake mastodon style ap id for ostatus. 2018-03-23 16:07:02 +01:00
lain b72a25f5b1 Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints 2018-03-22 12:48:56 +01:00
lain 32ae918843 Clear caches on test. 2018-03-22 12:44:32 +01:00
lain f9ab38a443 Fix test. 2018-03-22 12:37:24 +01:00
William Pitcock ff7afc0465 tests: webfinger: test quering a JSON response for activitypub actor URI 2018-03-22 00:36:13 -05:00
William Pitcock 4d3af2af71 webfinger: implement json response parsing 2018-03-22 00:36:12 -05:00
William Pitcock 1decd2ecb2 webfinger: attempt to fall back if LRDD template cannot be found 2018-03-22 00:36:01 -05:00
William Pitcock 8aa639a450 webfinger: support JSON output 2018-03-22 00:35:51 -05:00
William Pitcock 3fcdfb75d0 activitypub: add outbox endpoint 2018-03-22 00:26:54 -05:00
William Pitcock 381ba256bf activitypub: add restrict_limit 2018-03-22 00:26:47 -05:00
William Pitcock 1a94704230 activitypub: implement following/followers endpoints 2018-03-22 00:26:39 -05:00
lain c50c7745bc Fetch relayed messages from source while we don't have linked data sigs. 2018-03-21 07:12:14 +01:00