Merge branch 'develop' into feature/addressable-lists
[akkoma] / lib / pleroma / web / web_finger /
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-04 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'...
2019-06-01 rinpatchResolve merge conflicts
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-26 lambdaMerge branch 'refactor/die-httpoison-die' into 'develop'
2019-05-25 William Pitcockkill @httpoison
2019-05-24 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-23 Sachin Joshifix merge conflict
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop'
2019-05-22 lambdaMerge branch 'refactor/keys' into 'develop'
2019-05-22 William Pitcockmove key generation functions into Pleroma.Keys module
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-17 lambdaMerge branch 'bugfix/903-mastoapi-relationship-requeste...
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-17 rinpatchMerge branch 'fix/902-random-compile-failing' into...
2019-05-17 Alexander StrizhakovFix/902 random compile failing
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'feature/federator-behaviours' into 'develop'
2019-05-12 William Pitcockwebfinger: build the response based on enabled federati...
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-25 Egor KislitsynMerge branch 'develop' into feature/disable-account
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-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
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-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 rinpatchMerge branch 'develop' into fix/formatter-ignore-html...
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-17 lambdaMerge branch 'captcha' into 'develop'
2018-12-17 lambdaMerge branch 'test-mix-tasks' into 'develop'
2018-12-17 lambdaMerge branch 'phoenix14' into 'develop'
2018-12-17 lambdaMerge branch 'testfix/webfinger-jrd' into 'develop'
2018-12-15 Haelwenn (lanodan... WebFinger: Sends a 400 when resource param is missing...
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-12 kaniiniMerge branch 'support/issue_442' into 'develop'
2018-12-12 Maksim Pechnikovfix warnings
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
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 kaniiniMerge branch '210_twitter_api_uploads_alt_text' into...
2018-12-06 Hakaba Hitoyoremove follow_redirect options
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-27 lainWebfinger fixes.
next