fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 23:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1975 commits 26 branches 107 tags 316 MiB
Commit graph

1270 commits

Author SHA1 Message Date
kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay' 
# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex
 2018-08-26 21:06:15 +00:00
hakabahitoyo 946a0769c4 remove unused settings from /api/statusnet/config 2018-08-26 17:40:15 +09:00
William Pitcock aab2bdddf4 twitter api: provide object descriptions as attachment description field 2018-08-25 00:12:58 +00:00
kaniini 9ded0ee1a5 Merge branch 'config/fe-collapse-subject' into 'develop' 
fe config: add collapse_message_with_subject fe option

See merge request pleroma/pleroma!289
 2018-08-24 18:27:43 +00:00
William Pitcock 09cb402203 fe config: add collapse_message_with_subject fe option 2018-08-24 18:21:42 +00:00
hakabahitoyo bf9f68b681 debug 2018-08-23 11:52:18 +09:00
William Pitcock a909fe45a6 formatting 2018-08-23 01:34:36 +00:00
William Pitcock 52b44184b4 transmogrifier: reject activities lacking a valid ID 2018-08-23 01:25:26 +00:00
Haelwenn (lanodan) Monnier d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil 2018-08-22 01:47:25 +02:00
Haelwenn (lanodan) Monnier 5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos 2018-08-22 01:46:26 +02:00
kaniini f6b06d2ac8 Merge branch 'feature/peertube_2' into 'develop' 
rebase/update of feature/peertube

See merge request pleroma/pleroma!217
 2018-08-21 16:58:44 +00:00
kaniini a6d4cc8917 Merge branch 'sanitize-bio' into 'develop' 
mastodon api: sanitize the bio HTML

See merge request pleroma/pleroma!282
 2018-08-21 16:56:24 +00:00
Haelwenn (lanodan) Monnier 046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles 2018-08-21 18:34:56 +02:00
Haelwenn (lanodan) Monnier f5b056e3ce
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes 2018-08-21 18:26:12 +02:00
Haelwenn (lanodan) Monnier 3b8ef24532
Fix attachement rendering 2018-08-21 18:24:10 +02:00
lain a6b021a52b
Render peertube videos in mastodon. 2018-08-21 18:24:10 +02:00
lain c381d0b577
Use activitypub to fetch posts. 
This falls back to ostatus.
 2018-08-21 18:24:09 +02:00
Haelwenn (lanodan) Monnier 74c74decf5
Basic peertube support. 2018-08-21 18:24:09 +02:00
Haelwenn (lanodan) Monnier ef4f982e2c
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube) 2018-08-21 18:24:06 +02:00
ensra 1495d04789 fix test for converting bio \r\n to <br>. 2018-08-21 14:51:27 +01:00
ensra cdb3dd48ab Format 2018-08-21 14:12:55 +01:00
ensra 5debd7b5cc Twitter API: Support Mastodon-style bios 
(multi-line, with links, and user mentions)
 2018-08-21 14:03:36 +01:00
ensra 175f0bebbc mastodon api: sanitize the bio HTML 2018-08-21 10:53:53 +01:00
kaniini c1b8a6a73b Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop' 
formatter: consistent presentation of hashtags and mentions

See merge request pleroma/pleroma!280
 2018-08-20 18:44:52 +00:00
William Pitcock c033d2004b formatting 2018-08-20 18:40:05 +00:00
William Pitcock 145546e52a common api: format hashtags in the same way as we format mentions 2018-08-20 18:39:47 +00:00
eal f1c407e777 Merge branch 'fix/redirect-on-user-fetch' into 'develop' 
ActivityPub: follow redirects when fetching user

See merge request pleroma/pleroma!278
 2018-08-20 12:13:07 +00:00
eal 51a21284c6 ActivityPub: follow redirects when fetching user 2018-08-20 15:03:25 +03:00
shadowfacts 6698749073 Fix typo in app creation response 
Mastodon sends redirect_uri (singular), so should Pleroma.
 2018-08-17 12:48:24 +00:00
William Pitcock a3ef2ebb35 mastodon api controller: client_name, not name 2018-08-16 23:50:49 +00:00
William Pitcock b5a92b1199 mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does 2018-08-16 23:40:42 +00:00
kaniini c004b6ea0a Merge branch 'mastofe/system-font' into 'develop' 
Mastodon frontend: Use system font

See merge request pleroma/pleroma!247
 2018-08-16 15:38:59 +00:00
kaniini 5fbb14f5ec Merge branch 'bugfix/federation-kroeg' into 'develop' 
fix federation with kroeg

See merge request pleroma/pleroma!272
 2018-08-16 15:20:15 +00:00
kaniini 38361e7b5e Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop' 
Fix: Output repeats at ActivityPub outbox

Closes #191

See merge request pleroma/pleroma!175
 2018-08-16 15:19:46 +00:00
lambda 9908cf8fda Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop' 
Feature / Suggestions API with third party recommendation engine

See merge request pleroma/pleroma!254
 2018-08-15 07:47:33 +00:00
William Pitcock f446e75577 activitypub: transmogrifier: add necessary translations for kroeg 2018-08-14 17:09:11 +00:00
lain 8c0c930041 formatting 2018-08-12 19:42:21 +02:00
lain ffd9ad1f0c Fix for elixir 1.7. 2018-08-12 18:41:33 +02:00
lambda 13440a80e1 Merge branch 'feature/invites' into 'develop' 
Invites

Closes #108

See merge request pleroma/pleroma!208
 2018-08-12 12:04:15 +00:00
lambda 9de6145737 Merge branch 'fix/remote-follow-errormessage' into 'develop' 
Remote follow: don't show confusing error if already following

See merge request pleroma/pleroma!267
 2018-08-12 10:55:53 +00:00
eal db5cdfa333 Remote follow: don't show confusing error if already following 2018-08-09 20:47:29 +03:00
eal 37b802682c HTML-sanitize usernames before emojifying. 2018-08-09 13:07:03 +03:00
eal ed9738e031 Add tests for emoji in user profiles 
Also use the correct field in TwitterAPI...
 2018-08-08 09:24:50 +03:00
eal cee63ad3f7 TwitterAPI user view: add screen_name_html and description_html. 2018-08-08 08:38:25 +03:00
eal c2d1a5e9c4 MastoAPI AccountView: render profile emoji. 2018-08-07 21:56:50 +03:00
William Pitcock de6be63b1b activitypub: do not show observable effects of non-public boosts 2018-08-06 11:28:57 +00:00
William Pitcock 5202d4ce10 relay: do not relay in test mode 2018-08-06 08:35:56 +00:00
William Pitcock 0ca9b9ff96 run mix format 2018-08-06 08:26:36 +00:00
William Pitcock 5abf9ad602 relay: reintroduce @allow_relay 2018-08-06 08:22:18 +00:00
William Pitcock 1e1a29f084 activitypub: relay: fix up AS2 actor object 2018-08-06 08:22:17 +00:00