Merge branch 'fix/credo-issues' into 'develop'
[akkoma] / lib / pleroma / web / twitter_api / views / activity_view.ex
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-01 HaelwennMerge branch 'hotfix/prismo-twitterapi' into 'develop'
2018-11-01 Haelwenn (lanodan... Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI...
2018-11-01 kaniiniMerge branch 'feature/as2-page-support' into 'develop'
2018-11-01 William Pitcocktwitter api: add support for rendering Page objects
2018-10-25 kaniiniMerge branch 'finmoji-optional' into 'develop'
2018-10-25 HaelwennMerge branch 'bugfix/233-handle-missing-StatusView...
2018-10-25 kaniiniMerge branch 'feature/add-in-reply-to-profileurl' into...
2018-10-25 William Pitcocktwitterapi: activity view: add the other in_reply_to...
2018-10-25 kaniiniMerge branch 'feature/in-reply-to-screen-name' into...
2018-10-25 William Pitcocktwitterapi: activity view: implement in_reply_to_screen...
2018-09-22 kaniiniMerge branch 'feature/rich-text-optout-backend' into...
2018-09-22 William Pitcocktwitter api: add support for user-specified html policy
2018-09-16 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-09-16 kaniiniMerge branch 'feature/html-scrub-policy' into 'develop'
2018-09-10 William Pitcockeverywhere: use Pleroma.HTML module instead of HtmlSani...
2018-09-07 kaniiniMerge branch 'add-secure-and-samesite-cookie-flags...
2018-09-07 kaniiniMerge branch 'improve-server-config-examples' into...
2018-09-05 HaelwennMerge branch 'fix/sign-in-with-toot' into 'develop'
2018-09-03 kaniiniMerge branch 'develop' into 'feature/staff-discovery...
2018-09-03 kaniiniMerge branch 'feature/mastodon_api_2.4.x' into 'develop'
2018-09-03 kaniiniMerge branch 'nil-bio-emojis' into 'develop'
2018-09-02 kaniiniMerge branch 'hotfix_broken_likes' into 'develop'
2018-08-27 Henry Jamesonbetter solution, added test.
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
2018-08-22 Henry Jamesonfixed notifications API completely breaking if there...
2018-08-16 kaniiniMerge branch 'mastofe/system-font' into 'develop'
2018-08-16 kaniiniMerge branch 'develop' into 'patch-2'
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-08-16 kaniiniMerge branch 'fix/normalize-file-extension' into 'develop'
2018-08-12 lambdaMerge branch 'feature/invites' into 'develop'
2018-07-13 Tristan MahéMerge remote-tracking branch 'upstream/develop' into...
2018-07-12 lambdaMerge branch 'feature/object-normalization' into 'develop'
2018-07-12 lambdaMerge branch 'feature/mediaproxy-nodeinfo' into 'develop'
2018-07-12 lambdaMerge branch 'bugfix/activitypub-object-actor' into...
2018-07-12 lambdaMerge branch 'feature/message-summary' into 'develop'
2018-07-12 William Pitcockformatting
2018-07-12 William Pitcocktwitter api: refactor activity html generation, add...
2018-07-12 William Pitcocktwitterapi: activity view: expose message summary text
2018-07-12 lambdaMerge branch 'feature/default-scope' into 'develop'
2018-07-12 lambdaMerge branch 'feature/article-support' into 'develop'
2018-06-27 William Pitcockactivity interpretation: formatting
2018-06-27 William Pitcocktwitter api: refactor activity html generation, add...
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-22 csaurusMerge branch 'develop' into feature/mstdn-direct-api
2018-05-20 Francis DinhMerge remote-tracking branch 'upstream/develop' into...
2018-05-20 lainReturn visilility in twitter api, too.
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-13 lambdaMerge branch 'patch-2' into 'develop'
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-05-06 lambdaMerge branch 'feld-warnings' into 'develop'
2018-05-04 Mark FelderMerge branch 'feld-test.secret' into feld-warnings
2018-05-04 Mark FelderMore unused variables
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-02 lainLoad all users at once in timelines.
2018-04-02 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-02 lainUse context_ids directly if we have them.
2018-04-02 lainGenerates contexts and ids on insertion time.
2018-04-02 lainPre-fetch conversation ids.
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainTwitterApiController: Use ActivityView.
2018-03-30 lainTwApi ActivityView: Add delete activities.
2018-03-30 lainTwApi ActivityView: Add follows.
2018-03-30 lainFormat the code.
2018-03-30 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-03-30 lainTwApi ActivityView: Add announces.
2018-03-30 lainTwApi ActivityView: Add Like rendering.
2018-03-28 lainDon't go through all available emoji.
2018-03-27 lainAdd basic activity view.