summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-08-25Merge branch 'feature/twitterapi-object-description' into 'develop'kaniini
2018-08-25twitter api: provide object descriptions as attachment description fieldWilliam Pitcock
2018-08-24Merge branch 'update/pleroma-fe-20180824' into 'develop'kaniini
2018-08-24update pleroma frontendWilliam Pitcock
2018-08-24Merge branch 'feature/tls-sni-support' into 'develop'kaniini
2018-08-24http: fix TLS server name indicationWilliam Pitcock
2018-08-24Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'kaniini
2018-08-24tests: formattingWilliam Pitcock
2018-08-24Merge branch 'config/fe-collapse-subject' into 'develop'kaniini
2018-08-24formatter: adjust regexp captures to match local users with single character ...William Pitcock
2018-08-24test: add testcase for formatter issue #163William Pitcock
2018-08-24fe config: add collapse_message_with_subject fe optionWilliam Pitcock
2018-08-24Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'd...kaniini
2018-08-24Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'kaniini
2018-08-24add collapseMessageWithSubject in confighakabahitoyo
2018-08-23Merge branch 'fix/suggestions-api-error-handling' into 'develop'kaniini
2018-08-23Merge branch 'develop' into 'develop'Haelwenn
2018-08-23Add an OpenRC servicevaartis
2018-08-23debughakabahitoyo
2018-08-23Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'kaniini
2018-08-23formattingWilliam Pitcock
2018-08-23tests: add a testcase for verifying that objects without a valid ID are alway...William Pitcock
2018-08-23transmogrifier: reject activities lacking a valid IDWilliam Pitcock
2018-08-22fixed notifications API completely breaking if there's a like forHenry Jameson
2018-08-22Run mix formatHaelwenn (lanodan) Monnier
2018-08-22[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nilHaelwenn (lanodan) Monnier
2018-08-22[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videosHaelwenn (lanodan) Monnier
2018-08-21Merge branch 'feature/peertube_2' into 'develop'kaniini
2018-08-21Merge branch 'sanitize-bio' into 'develop'kaniini
2018-08-21Merge branch 'twitter-api-bios' into 'develop'kaniini
2018-08-21[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titlesHaelwenn (lanodan) Monnier
2018-08-21[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likesHaelwenn (lanodan) Monnier
2018-08-21Fix attachement renderingHaelwenn (lanodan) Monnier
2018-08-21Render peertube videos in mastodon.lain
2018-08-21Use activitypub to fetch posts.lain
2018-08-21Basic peertube support.Haelwenn (lanodan) Monnier
2018-08-21Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Pe...Haelwenn (lanodan) Monnier
2018-08-21attempt to add html validation to mastodon api test caseensra
2018-08-21this should be looking at the follower's bio, not the user's bio.ensra
2018-08-21sync bio sanitization code in testsensra
2018-08-21fix test for converting bio \r\n to <br>.ensra
2018-08-21Formatensra
2018-08-21Twitter API: Support Mastodon-style biosensra
2018-08-21mastodon api: sanitize the bio HTMLensra
2018-08-20Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'kaniini
2018-08-20formattingWilliam Pitcock
2018-08-20common api: format hashtags in the same way as we format mentionsWilliam Pitcock
2018-08-20Merge branch 'update/pleroma-fe-20180821' into 'develop'kaniini
2018-08-20update pleroma frontendWilliam Pitcock
2018-08-20Merge branch 'fix/redirect-on-user-fetch' into 'develop'eal