Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / nodeinfo / nodeinfo_controller.ex
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-06 Roman ChvanikovResolve conflicts
2019-06-06 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-06-05 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-06-05 kaniiniMerge branch 'explicit-addressing' into 'develop'
2019-06-05 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-06-04 Roman ChvanikovFix conflict
2019-06-04 lainNodeInfo: Add explicit addressing to nodeinfo.
2019-06-04 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-06-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-06-04 Maksim PechnikovMerge branch 'develop' into issue/941
2019-06-04 kaniiniMerge branch 'feature/nodeinfo-polls' into 'develop'
2019-06-04 William Pitcocknodeinfo: add pollLimits to metadata
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-03 lambdaMerge branch 'align-mastodon-conversations' into 'develop'
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'...
2019-06-01 rinpatchResolve merge conflicts
2019-06-01 Sachin JoshiMerge remote-tracking branch 'upstream/develop' into...
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm...
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-31 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop'
2019-05-30 lambdaMerge branch 'use-pleroma-config' into 'develop'
2019-05-30 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-05-30 Egor KislitsynUse Pleroma.Config everywhere
2019-05-29 Roman ChvanikovMerge develop
2019-05-25 kaniiniMerge branch 'fix/nodeinfo-unavailable-when-not-federat...
2019-05-25 Aaron TinioKeep nodeinfo available when not federating
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-16 sadposterMerge branch 'develop' of https://git.pleroma.social...
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 Pitcocknodeinfo: gather supported protocol names from federati...
2019-05-01 Alex SMerging with develop
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-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-30 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-25 lainMerge remote-tracking branch 'origin/develop' into...
2019-03-24 rinpatchMerge branch 'fix/eldap-warnings' into 'develop'
2019-03-22 lambdaMerge branch 'safe-mentions' into 'develop'
2019-03-22 lainNodeInfo: Return safe_dm_mentions feature flag.
2019-03-18 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-08 kaniiniMerge branch 'fix-tlsv1.3' into 'develop'
2019-03-07 rinpatchMerge branch 'bugfix/delete-activity-audience' into...
2019-03-06 kaniiniMerge branch 'chore/merge-search-into-list-users' into...
2019-03-06 kaniiniMerge branch 'bugfix/connect-src-https' into 'develop'
2019-03-06 kaniiniMerge branch 'bugfix/rel-me_list' into 'develop'
2019-03-06 HaelwennMerge branch 'fix/escape-reserved-chars-in-filenames...
2019-03-05 rinpatchMerge branch 'add-admin-to-node-info' into 'develop'
2019-03-05 eugenijmInclude admins in nodeinfo
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 kaniiniMerge branch 'follow-enhancements' into 'develop'
2019-02-09 Haelwenn (lanodan... de-group alias/es
2019-02-09 Haelwenn (lanodan... Make credo happy
2019-02-09 lambdaMerge branch 'feature/keyword-policy' into 'develop'
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy
2019-02-08 rinpatchAdd default config for keyword policy
2019-02-08 rinpatchAdd keyword policy
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 'streaming-api-url-fix' into 'develop'
2019-02-01 hrefMerge branch 'develop' into 'develop'
2019-02-01 Lunaupdate nodeinfo version when requesting 2.1
2019-02-01 Lunamix format pass
2019-02-01 Lunadowncase software name in nodeinfo
2019-02-01 Lunakeep compatibility with nodeinfo 2.0
2019-02-01 Lunamix format pass
2019-02-01 Lunause nodeinfo 2.1, add repository field
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-30 Rin ToshakaResolve merge conflict
2018-12-29 kaniiniMerge branch 'carrot-bullying' into 'develop'
2018-12-29 kaniiniMerge branch '471_invalid_accounts_rendering' into...
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-28 kaniiniMerge branch 'fix/no-attachment-links' into 'develop'
2018-12-27 HaelwennMerge branch '396_elixir_1.7' into 'develop'
next