Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / ostatus / ostatus.ex
2019-04-29 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-22 kaniiniMerge branch 'get-cached-everywhere' into 'develop'
2019-04-22 EgorUse `User.get_cached*` everywhere
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-30 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-03-29 lambdaMerge branch 'feature/deploy-docs' into 'develop'
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-24 rinpatchMerge branch 'features/mrf-keyword-nil-summary' into...
2019-03-24 rinpatchMerge branch 'fix/eldap-warnings' into 'develop'
2019-03-24 kaniiniMerge branch 'feature/object-normalize-preload' into...
2019-03-23 William Pitcockostatus: use preload objects with Object.normalize...
2019-03-18 SadposterMerge branch 'develop' of https://git.pleroma.social...
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-02-09 Haelwenn (lanodan... Credo fixes: alias grouping/ordering
2019-02-04 rinpatchMerge branch 'fix/rich-media-relative-path' into 'develop'
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-01 hrefMerge branch 'develop' into 'develop'
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-29 Ivan Tashkinov[#534] Made federation push sender be determined basing...
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-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-13 raenoRemove oembed for now, will submit it in another MR...
2018-12-13 raenoExtract opengraph/oembed into separate module
2018-12-13 raenoAdd opengraph/twitter_card:summary support. Add config...
2018-12-13 raenoWIP. Implement oembed route and handle both json/xml...
2018-12-13 raenoInsert meta tags into static index.html on the fly...
2018-12-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-10 lambdaMerge branch 'anonymize-filter-text' into 'develop'
2018-12-10 lambdaMerge branch 'develop' into 'fix/mix-task-uploads-modul...
2018-12-10 lambdaMerge branch 'parallel588/pleroma-support/compile_warni...
2018-12-10 Maksim Pechnikovupdates
2018-12-09 Maksim Pechnikovfix compile warnings
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop'
2018-12-06 Rin ToshakaMerge develop
2018-12-06 kaniiniMerge branch 'fix/mastodon-api-settings' into 'develop'
2018-12-06 kaniiniMerge branch 'correct-and-improve-http-options' into...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Hakaba Hitoyoavoid mix format bug
2018-12-06 kaniiniMerge branch '210_twitter_api_uploads_alt_text' into...
2018-12-06 Hakaba Hitoyoremove follow_redirect options
2018-12-06 Hakaba Hitoyoremove pool and timeout options which duplicate with...
2018-12-05 lainMerge remote-tracking branch 'origin' into follower...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-04 kaniiniMerge branch 'optional-retry-queue' into 'develop'
2018-12-04 kaniiniMerge branch 'feature/integration_tesla' into 'develop'
2018-12-04 Maksim Pechnikovstatus_code -> status
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop'
2018-12-02 rinpatchMerge branch 'develop' into fix/theora-detection-read...
2018-12-01 kaniiniMerge branch 'validate-user-info' into 'develop'
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-11-30 lainMerge remote-tracking branch 'origin' into validate...
2018-11-30 lainFix OStatus user updates.
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
next