Merge branch 'develop' into feature/database-compaction
[akkoma] / lib / pleroma / web / ostatus / activity_representer.ex
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.AliasOrder
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-09 Haelwenn (lanodan... de-group alias/es
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider'
2019-01-25 kaniiniMerge branch 'classic-flakeids' into 'develop'
2019-01-23 kaniiniMerge branch 's3-namespace' into 'develop'
2019-01-23 lambdaMerge branch 'rename/pleroma_activity_consistency'...
2019-01-23 lainMerge branch 'develop' into rename/pleroma_activity_con...
2019-01-21 Haelwenn (lanodan... Activity: get_create_activity_by_object_ap_id/1 → get_c...
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-12-04 William Pitcockostatus: fix representing external objects
2018-12-04 William Pitcockostatus: use Object.normalize() where appropriate when...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-09-02 kaniiniMerge branch 'hotfix_broken_likes' into 'develop'
2018-08-27 lambdaMerge branch 'feature/relay' into 'develop'
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
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-06-27 William Pitcockostatus: use Activity.normalize() instead of directly...
2018-06-18 William Pitcockostatus: we need to include the original author of...
2018-05-26 lainMerge branch 'develop' into csaurus/pleroma-feature...
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-24 lambdaMerge branch 'feature/incoming-remote-unfollow' into...
2018-05-22 csaurusMerge branch 'develop' into feature/mstdn-direct-api
2018-05-21 Francis DinhAdd tests for incoming unfollow over OStatus
2018-05-21 Francis DinhHandle unfollows from OStatus
2018-05-13 lainMerge branch 'develop' of git.pleroma.social:pleroma...
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-11 Francis DinhProbably better way of handling non-follow undos in...
2018-05-11 Francis DinhRevert "Do not send non-follow undos over ostatus for...
2018-05-11 Francis DinhRevert "Use [] instead of nil"
2018-05-11 Francis DinhUse [] instead of nil
2018-05-11 Francis DinhDo not send non-follow undos over ostatus for now
2018-05-09 Francis DinhFederate correct activity
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 FelderClean up unused aliases and imports
2018-04-28 lambdaMerge branch 'fix/blocked-user-boosts' into 'develop'
2018-04-25 Francis DinhMerge branch 'feature/unrepeats' of git.pleroma.social...
2018-04-25 Francis DinhMerge branch 'develop' of https://git.pleroma.social...
2018-04-24 lambdaMerge branch 'feature/message-rewrite-facility' into...
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-21 lambdaMerge branch '146-enable-custom-panel-by-default-and...
2018-04-21 lambdaMerge branch 'readme-update' into 'develop'
2018-04-21 lambdaMerge branch 'nginx-certbot-doc' into 'develop'
2018-04-21 lainFormatting fixes.
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-03-08 lambdaMerge branch 'feature/activitypub' into 'develop'
2018-03-08 lainMerge branch 'develop' into feature/activitypub
2018-02-24 lainHotfix for tag problems.
2018-02-21 lainMerge branch 'develop' into feature/activitypub
2018-02-19 lainOstatus: Use all recipients as mentions.
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-22 lambdaMerge branch 'develop' into 'develop'
2017-11-21 ealMerge branch 'fix/self-follow' into 'develop'
2017-11-20 Roger BraunTreat internal emoji like external.
2017-11-19 lambdaMerge branch 'feature/fix-warnings' into 'develop'
2017-11-19 ThogFix all compilation warnings
2017-10-31 Roger BraunFederate out content warnings.
next