Commit Graph

1566 Commits

Author SHA1 Message Date
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
lambda 83d4a1495c Merge branch 'feld-varnish' into 'develop'
Add example Varnish VCL

See merge request pleroma/pleroma!77
2018-03-20 06:00:01 +00:00
lambda 2fab3c44f5 Merge branch 'patch-README' into 'develop'
Update README.md

See merge request pleroma/pleroma!72
2018-03-20 05:58:31 +00:00
lambda 0300bc5569 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
2018-03-20 05:58:13 +00:00
lambda 9b97b023c5 Merge branch 'feld-Logger' into 'develop'
Logging cleanup

See merge request pleroma/pleroma!76
2018-03-20 05:57:47 +00:00
Mark Felder c8c0519f52 Clarify vcl_synth is for all 301s we generate 2018-03-20 01:28:50 +00:00
Mark Felder bdc522da1b Add ability to PURGE the cache
Someday Pleroma will learn this skill :-)
2018-03-20 01:24:58 +00:00
Mark Felder 1d06f5037d Add example Varnish VCL 2018-03-20 01:12:40 +00:00
Mark Felder 16d102c153 Clarify that this error is about a problem decoding the expected JSON
payload
2018-03-19 18:18:52 +00:00
Mark Felder 96cfc67e05 LRDD, you are special and we love you too 2018-03-19 18:05:53 +00:00
Mark Felder 2702df489f cap again 2018-03-19 18:00:02 +00:00
Mark Felder 2549a73d6d start with a capital 2018-03-19 17:58:45 +00:00
Mark Felder 185c030258 AP again 2018-03-19 17:57:58 +00:00
Mark Felder 9a858621d6 AP and WebFinger need love here 2018-03-19 17:56:49 +00:00
Mark Felder 8d561f952f Make XML feel special too 2018-03-19 17:51:31 +00:00
Mark Felder 032ed2b945 This log message was do do 💩 2018-03-19 17:47:51 +00:00